Changes representative of linux-4.18.0-305.10.2.el8_4.tar.xz

kernelim · Jul 12, 2021 · f47cb6e · f47cb6e
1 parent df12eda
commit f47cb6e
Show file tree

Hide file tree

Showing 32 changed files with 179 additions and 71 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,53 +1,74 @@
+---
 # This CI will only work for trusted contributors. CI for public contributors
 # runs via a webhook on the merge requests. There's nothing you have to do if
 # you want your changes tested -- created pipelines will be automatically
 # linked in the merge request and appropriate labels will be added to it.
 # Changes to this file will NOT be reflected in the testing.
 
-workflow:
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-
-variables:
-  git_url: ${CI_MERGE_REQUEST_PROJECT_URL}
-  branch: ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
-  commit_hash: ${CI_COMMIT_SHA}
-  mr_id: ${CI_MERGE_REQUEST_IID}
-  mr_url: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}
-  title: ${CI_COMMIT_TITLE}
-  kernel_type: internal
-  make_target: rpm
-  builder_image: quay.io/cki/builder-rhel8.4
-  build_kabi_stablelist: 'true'
-  tree_yaml_name: rhel
-  publish_elsewhere: 'true'
-  disttag_override: '.el8_4'
-
-realtime_check:
-  variables:
-    name: kernel-rt-rhel8
-    merge_tree: ${CI_MERGE_REQUEST_PROJECT_URL}
-    merge_branch: 8.4-rt
-    architectures: 'x86_64'
-    package_name: kernel-rt
-    skip_test: 'true'
-    skip_results: 'true'
+include:
+  - project: cki-project/pipeline-definition
+    ref: main
+    file: kernel_templates.yml
+
+workflow: !reference [.workflow]
+
+# Basic bridge job
+.trigger:
   trigger:
-    project: redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki-internal-contributors
     branch: rhel8
-    strategy: depend
-  allow_failure: true
-
-trigger_pipeline:
   variables:
+    kernel_type: internal
+    make_target: rpm
+    builder_image: quay.io/cki/builder-rhel8.4
+    build_kabi_stablelist: 'true'
+    tree_yaml_name: rhel
+    publish_elsewhere: 'true'
     name: kernel-rhel8
-    send_ready_for_test_pre: 'True'
-    send_ready_for_test_post: 'True'
     architectures: 'x86_64 ppc64le aarch64 s390x'
     kpet_tree_family: rhel8
     native_tools: 'true'
+    disttag_override: '.el8_4'
+
+# Realtime specific configuration
+.realtime_check:
+  # best-effort, shouldn't block MRs
+  allow_failure: true
   trigger:
-    project: redhat/red-hat-ci-tools/kernel/cki-internal-pipelines/cki-internal-contributors
-    branch: rhel8
-    strategy: depend
+    branch: rhel8-rt
+  variables:
+    # adjust configuration above slightly for -rt
+    name: kernel-rt-rhel8
+    package_name: kernel-rt
+    merge_tree: ${CI_MERGE_REQUEST_PROJECT_URL}
+    merge_branch: 8.4-rt
+    # realtime is x86-only
+    architectures: 'x86_64'
+    # no testing
+    skip_test: 'true'
+    skip_results: 'true'
+
+# regular pipelines
+
+merge_request_regular:
+  extends: [.internal, .merge_request, .with_notifications,
+            .trigger]
+
+realtime_check_regular:
+  extends: [.internal, .merge_request,
+            .trigger, .realtime_check]
+
+baseline_regular:
+  extends: [.internal, .baseline, .with_notifications,
+            .trigger]
+
+# private pipelines
+
+merge_request_private:
+  extends: [.scratch, .merge_request,
+            .trigger]
+
+realtime_check_private:
+  extends: [.scratch, .merge_request,
+            .trigger, .realtime_check]
 
+# no private baselines as repos are mirrored
diff --git a/Makefile.rhelver b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 4
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 305.7.1
+RHEL_RELEASE = 305.10.2
 
 #
 # Early y+1 numbering

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -53,6 +53,7 @@
 MODULE_AUTHOR("Amazon.com, Inc. or its affiliates");
 MODULE_DESCRIPTION(DEVICE_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_GENERATION);
 
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (5 * HZ)

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.h b/drivers/net/ethernet/amazon/ena/ena_netdev.h
@@ -50,6 +50,12 @@
 #define DRV_MODULE_GEN_SUBMINOR 0
 
 #define DRV_MODULE_NAME		"ena"
+#ifndef DRV_MODULE_GENERATION
+#define DRV_MODULE_GENERATION \
+	__stringify(DRV_MODULE_GEN_MAJOR) "."	\
+	__stringify(DRV_MODULE_GEN_MINOR) "."	\
+	__stringify(DRV_MODULE_GEN_SUBMINOR) "K"
+#endif
 
 #define DEVICE_NAME	"Elastic Network Adapter (ENA)"
 

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
@@ -40,6 +40,7 @@
 #include "b44.h"
 
 #define DRV_MODULE_NAME		"b44"
+#define DRV_MODULE_VERSION	"2.0"
 #define DRV_DESCRIPTION		"Broadcom 44xx/47xx 10/100 PCI ethernet driver"
 
 #define B44_DEF_MSG_ENABLE	  \
@@ -96,6 +97,7 @@
 MODULE_AUTHOR("Felix Fietkau, Florian Schirmer, Pekka Pietikainen, David S. Miller");
 MODULE_DESCRIPTION(DRV_DESCRIPTION);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_VERSION);
 
 static int b44_debug = -1;	/* -1 == use B44_DEF_MSG_ENABLE as value */
 module_param(b44_debug, int, 0);

diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
@@ -59,6 +59,7 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME		"bnx2"
+#define DRV_MODULE_VERSION	"2.2.6"
 #define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.3.fw"
 #define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-6.0.15.fw"
 #define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1b.fw"
@@ -73,6 +74,7 @@
 MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
 MODULE_DESCRIPTION("QLogic BCM5706/5708/5709/5716 Driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_VERSION);
 MODULE_FIRMWARE(FW_MIPS_FILE_06);
 MODULE_FIRMWARE(FW_RV2P_FILE_06);
 MODULE_FIRMWARE(FW_MIPS_FILE_09);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -72,6 +72,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Broadcom BCM573xx network driver");
+MODULE_VERSION(DRV_MODULE_VERSION);
 
 #define BNXT_RX_OFFSET (NET_SKB_PAD + NET_IP_ALIGN)
 #define BNXT_RX_DMA_OFFSET NET_SKB_PAD

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -12,10 +12,8 @@
 #define BNXT_H
 
 #define DRV_MODULE_NAME		"bnxt_en"
+#define DRV_MODULE_VERSION	"1.10.1"
 
-/* DO NOT CHANGE DRV_VER_* defines
- * FIXME: Delete them
- */
 #define DRV_VER_MAJ	1
 #define DRV_VER_MIN	10
 #define DRV_VER_UPD	1

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
@@ -98,6 +98,8 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 /* DO NOT UPDATE TG3_*_NUM defines */
 #define TG3_MAJ_NUM			3
 #define TG3_MIN_NUM			137
+#define DRV_MODULE_VERSION	\
+	__stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
 
 #define RESET_KIND_SHUTDOWN	0
 #define RESET_KIND_INIT		1
@@ -222,6 +224,7 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 MODULE_AUTHOR("David S. Miller (davem@redhat.com) and Jeff Garzik (jgarzik@pobox.com)");
 MODULE_DESCRIPTION("Broadcom Tigon3 ethernet driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_MODULE_VERSION);
 MODULE_FIRMWARE(FIRMWARE_TG3);
 MODULE_FIRMWARE(FIRMWARE_TG3TSO);
 MODULE_FIRMWARE(FIRMWARE_TG3TSO5);

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -25,6 +25,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/aer.h>
 #include <linux/prefetch.h>
+#include <generated/utsrelease.h>
 
 #include "e1000.h"
 
@@ -7903,5 +7904,5 @@ module_exit(e1000_exit_module);
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
 MODULE_LICENSE("GPL v2");
-
+MODULE_VERSION(UTS_RELEASE);
 /* netdev.c */
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
@@ -8,6 +8,7 @@
 #include <net/tcp.h>
 #include <linux/if_macvlan.h>
 #include <linux/prefetch.h>
+#include <generated/utsrelease.h>
 
 #include "fm10k.h"
 
@@ -20,6 +21,7 @@ static const char fm10k_copyright[] =
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION(DRV_SUMMARY);
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 /* single workqueue for entire fm10k driver */
 struct workqueue_struct *fm10k_workqueue;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -5242,7 +5242,7 @@ static int i40e_get_module_eeprom(struct net_device *netdev,
 
 		status = i40e_aq_get_phy_register(hw,
 				I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE,
-				true, addr, offset, &value, NULL);
+				addr, true, offset, &value, NULL);
 		if (status)
 			return -EIO;
 		data[i] = value;

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -95,6 +95,7 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all), Debug mask (0x8XXXXXXX
 MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
 MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 static struct workqueue_struct *i40e_wq;
 

diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -4,6 +4,7 @@
 #include "iavf.h"
 #include "iavf_prototype.h"
 #include "iavf_client.h"
+#include <generated/utsrelease.h>
 /* All iavf tracepoints are defined by the include below, which must
  * be included exactly once across the whole kernel with
  * CREATE_TRACE_POINTS defined
@@ -47,6 +48,7 @@ MODULE_ALIAS("i40evf");
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) Ethernet Adaptive Virtual Function Network Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 static const struct net_device_ops iavf_netdev_ops;
 struct workqueue_struct *iavf_wq;

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -14,6 +14,13 @@
 #include "ice_dcb_nl.h"
 #include "ice_devlink.h"
 
+#define DRV_VERSION_MAJOR 0
+#define DRV_VERSION_MINOR 8
+#define DRV_VERSION_BUILD 2
+
+#define DRV_VERSION	__stringify(DRV_VERSION_MAJOR) "." \
+			__stringify(DRV_VERSION_MINOR) "." \
+			__stringify(DRV_VERSION_BUILD) "-k"
 #define DRV_SUMMARY	"Intel(R) Ethernet Connection E800 Series Linux Driver"
 static const char ice_driver_string[] = DRV_SUMMARY;
 static const char ice_copyright[] = "Copyright (c) 2018, Intel Corporation.";
@@ -25,6 +32,7 @@ static const char ice_copyright[] = "Copyright (c) 2018, Intel Corporation.";
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION(DRV_SUMMARY);
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(DRV_VERSION);
 MODULE_FIRMWARE(ICE_DDP_PKG_FILE);
 
 static int debug = -1;

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -37,6 +37,7 @@
 #endif
 #include <linux/i2c.h>
 #include "igb.h"
+#include <generated/utsrelease.h>
 
 enum queue_mode {
 	QUEUE_MODE_STRICT_PRIORITY,
@@ -233,6 +234,7 @@ static struct pci_driver igb_driver = {
 MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
 MODULE_DESCRIPTION("Intel(R) Gigabit Ethernet Network Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
 static int debug = -1;

diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -23,6 +23,7 @@
 #include <linux/sctp.h>
 
 #include "igbvf.h"
+#include <generated/utsrelease.h>
 
 char igbvf_driver_name[] = "igbvf";
 static const char igbvf_driver_string[] =
@@ -2995,5 +2996,6 @@ module_exit(igbvf_exit_module);
 MODULE_AUTHOR("Intel Corporation, <e1000-devel@lists.sourceforge.net>");
 MODULE_DESCRIPTION("Intel(R) Gigabit Virtual Function Network Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 /* netdev.c */
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -16,6 +16,7 @@
 #include "igc.h"
 #include "igc_hw.h"
 #include "igc_tsn.h"
+#include <generated/utsrelease.h>
 
 #define DRV_SUMMARY	"Intel(R) 2.5G Ethernet Linux Driver"
 
@@ -26,6 +27,7 @@ static int debug = -1;
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION(DRV_SUMMARY);
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -164,6 +164,7 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) 10 Gigabit PCI Express Network Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 static struct workqueue_struct *ixgbe_wq;
 

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -31,6 +31,7 @@
 #include <linux/bpf_trace.h>
 #include <linux/atomic.h>
 #include <net/xfrm.h>
+#include <generated/utsrelease.h>
 
 #include "ixgbevf.h"
 
@@ -79,6 +80,7 @@ MODULE_DEVICE_TABLE(pci, ixgbevf_pci_tbl);
 MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
 MODULE_DESCRIPTION("Intel(R) 10 Gigabit Virtual Function Network Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_VERSION(UTS_RELEASE);
 
 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK)
 static int debug = -1;

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -5782,6 +5782,8 @@ static void ibmvfc_free_mem(struct ibmvfc_host *vhost)
 			  vhost->disc_buf_dma);
 	dma_free_coherent(vhost->dev, sizeof(*vhost->login_buf),
 			  vhost->login_buf, vhost->login_buf_dma);
+	dma_free_coherent(vhost->dev, sizeof(*vhost->channel_setup_buf),
+			  vhost->channel_setup_buf, vhost->channel_setup_dma);
 	dma_pool_destroy(vhost->sg_pool);
 	ibmvfc_free_queue(vhost, async_q);
 	LEAVE;