diff --git a/Makefile.rhelver b/Makefile.rhelver index 1fe30daf7..1234679db 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 103 +RHEL_RELEASE = 104 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4eb2a2bb1..0e5c184dd 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3307,7 +3307,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8f96a30c2..b9e1799a2 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3286,7 +3286,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 7393f748a..565b9a7c1 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3027,7 +3027,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a32126ae5..f81c3f1b1 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3007,7 +3007,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 5a34694a0..6b77fab65 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3014,7 +3014,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 4b8ee4544..ad22296b0 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2994,7 +2994,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d222a95df..9bd8263ba 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3007,7 +3007,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3c4a43278..b375059ad 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3214,7 +3214,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index be45bf0f9..4d88e4913 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3194,7 +3194,7 @@ CONFIG_ND_PFN=m CONFIG_NET_ACT_BPF=m # CONFIG_NET_ACT_CONNMARK is not set CONFIG_NET_ACT_CSUM=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_CT=m CONFIG_NET_ACT_GACT=m # CONFIG_NET_ACT_GATE is not set diff --git a/kernel.spec b/kernel.spec index 008858053..a4e0ea734 100755 --- a/kernel.spec +++ b/kernel.spec @@ -121,13 +121,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 103.el9 +%define pkgrelease 104.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 103%{?buildid}%{?dist} +%define specrelease 104%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -679,7 +679,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-103.el9.tar.xz +Source0: linux-5.14.0-104.el9.tar.xz Source1: Makefile.rhelver @@ -1349,8 +1349,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-103.el9 -c -mv linux-5.14.0-103.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-104.el9 -c +mv linux-5.14.0-104.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2983,6 +2983,39 @@ fi # # %changelog +* Thu Jun 02 2022 Patrick Talbert [5.14.0-104.el9] +- bonding: fix missed rcu protection (Jonathan Toppins) [2089774] +- bonding: do not discard lowest hash bit for non layer3+4 hashing (Jonathan Toppins) [2089774] +- bonding: helper macro __ATTR_RO to make code more clear (Jonathan Toppins) [2089774] +- bonding: add new option ns_ip6_target (Jonathan Toppins) [1951971] +- bonding: add new parameter ns_targets (Jonathan Toppins) [1951971] +- bonding: add extra field for bond_opt_value (Jonathan Toppins) [1951971] +- Bonding: split bond_handle_vlan from bond_arp_send (Jonathan Toppins) [1951971] +- bonding: force carrier update when releasing slave (Jonathan Toppins) [2089774] +- bonding: fix data-races around agg_select_timer (Jonathan Toppins) [2089774] +- bonding: switch bond_net_exit() to batch mode (Jonathan Toppins) [2089774] +- bonding: pair enable_port with slave_arr_updates (Jonathan Toppins) [2089774] +- net: bonding: Add support for IPV6 ns/na to balance-alb/balance-tlb mode (Jonathan Toppins) [2089774] +- bonding: use rcu_dereference_rtnl when get bonding active slave (Jonathan Toppins) [2089774] +- net: bonding: fix bond_xmit_broadcast return value error bug (Jonathan Toppins) [2089774] +- Bonding: return HWTSTAMP_FLAG_BONDED_PHC_INDEX to notify user space (Jonathan Toppins) [2019670] +- Bonding: force user to add HWTSTAMP_FLAG_BONDED_PHC_INDEX when get/set HWTSTAMP (Jonathan Toppins) [2019670] +- bond: pass get_ts_info and SIOC[SG]HWTSTAMP ioctl to active device (Jonathan Toppins) [2019670] +- net: bonding: debug: avoid printing debug logs when bond is not notifying peers (Jonathan Toppins) [2089774] +- net: remove bond_slave_has_mac_rcu() (Jonathan Toppins) [2089774] +- Bonding: add arp_missed_max option (Jonathan Toppins) [1952053] +- net: bonding: constify and use dev_addr_set() (Jonathan Toppins) [2089774] +- bonding: remove extraneous definitions from bonding.h (Jonathan Toppins) [2089774] +- redhat: enable CONFIG_NET_ACT_CTINFO (as a module) (Davide Caratti) [2027894] +- selftests: mptcp: add subflow limits test-cases (Paolo Abeni) [2076832] +- mptcp: fix subflow accounting on close (Paolo Abeni) [2076832] +- scsi: qedi: Remove redundant flush_workqueue() calls (Nilesh Javali) [2046624] +- scsi: qedi: Fix SYSFS_FLAG_FW_SEL_BOOT formatting (Nilesh Javali) [2046624] +- scsi: qedi: Fix cmd_cleanup_cmpl counter mismatch issue (Nilesh Javali) [2046624] +- scsi: qedi: Remove set but unused 'page' variable (Nilesh Javali) [2046624] +- scsi: qedi: Fix error codes in qedi_alloc_global_queues() (Nilesh Javali) [2046624] +- scsi: qedi: Add support for fastpath doorbell recovery (Nilesh Javali) [2046624] + * Wed Jun 01 2022 Patrick Talbert [5.14.0-103.el9] - ipc/mqueue: use get_tree_nodev() in mqueue_get_tree() (Waiman Long) [1924181] - selftests/powerpc/pmu: Add interface test for mmcra register fields (Desnes A. Nunes do Rosario) [2071110] diff --git a/sources b/sources index d6864a424..a901d12b8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-103.el9.tar.xz) = e473d997f5fd9e84cfabf2a249d122cc5934e4d9bff8961a12d74a47f351ab2bb551e00c8b04f8c25144889ef3788406bc997e7c094a1f852a26eb403358fdab -SHA512 (kernel-abi-stablelists-5.14.0-103.el9.tar.bz2) = a6e3882cd3038e9630cd4335bed31e2ac3f9b47f69d7a7a3db93a1dd37632ec465e272dc06a24b65b9413edc991aae3775a26d6f28e48e1c755aebff66dc593f -SHA512 (kernel-kabi-dw-5.14.0-103.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674 +SHA512 (linux-5.14.0-104.el9.tar.xz) = 591f7d6d88f6f9240066b371af9127c1149cec9c3843737a153dedac6a304d677fc2c1bb7dce05fc19fe3ac9635c1f36c51b5f953e960fc8dd3958da216b88ea +SHA512 (kernel-abi-stablelists-5.14.0-104.el9.tar.bz2) = 545c50faa2ec5e7e3469e7e5928413910a0ab53ee52c3484ea3cc5a6fcb15bff26edcef6ee2c15a742f5647fefdfbcc48e8f74f7e74721408d3db4904ce16bf4 +SHA512 (kernel-kabi-dw-5.14.0-104.el9.tar.bz2) = b07e3d6617cc434bf03eb165691b8b64418260e0a97bf3da3959aa03d142ff345c94b4a0f0856246d2b2c6a6a713fd6495e9f2cb73244cf4cfc5a4b7525e7674