summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-debug-rhel.config4
-rw-r--r--kernel-armv7hl-debug-fedora.config4
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config4
-rw-r--r--kernel-i686-debug-fedora.config4
-rw-r--r--kernel-ppc64le-debug-fedora.config4
-rw-r--r--kernel-ppc64le-debug-rhel.config4
-rw-r--r--kernel-s390x-debug-fedora.config4
-rw-r--r--kernel-s390x-debug-rhel.config4
-rw-r--r--kernel-x86_64-debug-fedora.config4
-rw-r--r--kernel-x86_64-debug-rhel.config4
-rwxr-xr-xkernel.spec19
-rw-r--r--patch-5.17-redhat.patch2
-rw-r--r--sources6
16 files changed, 40 insertions, 37 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index f714ad1ce..df5b6a088 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 125
+RHEL_RELEASE = 128
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 731df8f3d..253aac660 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/66cfe6e6431fe582aebf6beb00fc57f156616bad
- 66cfe6e6431fe582aebf6beb00fc57f156616bad mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/4661faf189d4082dab0bac5a5d01b1fa817a8275
+ 4661faf189d4082dab0bac5a5d01b1fa817a8275 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning
"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b
4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index f262bffc5..9810918d5 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -4344,7 +4344,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -4501,7 +4501,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 8568b048a..1d0c070ab 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3438,7 +3438,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+CONFIG_NET_DEV_REFCNT_TRACKER=y
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA is not set
@@ -3555,7 +3555,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=y
# CONFIG_NET_NCSI is not set
CONFIG_NET_NSH=y
-# CONFIG_NET_NS_REFCNT_TRACKER is not set
+CONFIG_NET_NS_REFCNT_TRACKER=y
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 4d1882f87..1b87b7528 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -4414,7 +4414,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -4571,7 +4571,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index a3fa54fb2..36755743a 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -4317,7 +4317,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -4474,7 +4474,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index c02513901..c3dfbd98a 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -3916,7 +3916,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -4073,7 +4073,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 61f8c6ece..0dc926f3a 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -3665,7 +3665,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -3822,7 +3822,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 9bc56a1d0..545fa1356 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -3253,7 +3253,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+CONFIG_NET_DEV_REFCNT_TRACKER=y
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA is not set
@@ -3370,7 +3370,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=y
# CONFIG_NET_NCSI is not set
CONFIG_NET_NSH=y
-# CONFIG_NET_NS_REFCNT_TRACKER is not set
+CONFIG_NET_NS_REFCNT_TRACKER=y
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 6e7abc3a1..de2e0e5bb 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -3644,7 +3644,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -3802,7 +3802,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2be014f2f..d44fe39e3 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -3234,7 +3234,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+CONFIG_NET_DEV_REFCNT_TRACKER=y
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA is not set
@@ -3352,7 +3352,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=y
# CONFIG_NET_NCSI is not set
CONFIG_NET_NSH=y
-# CONFIG_NET_NS_REFCNT_TRACKER is not set
+CONFIG_NET_NS_REFCNT_TRACKER=y
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 78be1db77..bbb8e5d24 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -3961,7 +3961,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-CONFIG_NET_DEV_REFCNT_TRACKER=y
+# CONFIG_NET_DEV_REFCNT_TRACKER is not set
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA_AR9331 is not set
@@ -4118,7 +4118,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=m
CONFIG_NET_NCSI=y
CONFIG_NET_NSH=m
-CONFIG_NET_NS_REFCNT_TRACKER=y
+# CONFIG_NET_NS_REFCNT_TRACKER is not set
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 503038358..9ef737ef6 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -3432,7 +3432,7 @@ CONFIG_NET_CORE=y
CONFIG_NETDEV_ADDR_LIST_TEST=m
CONFIG_NETDEVICES=y
CONFIG_NET_DEVLINK=y
-# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+CONFIG_NET_DEV_REFCNT_TRACKER=y
CONFIG_NETDEVSIM=m
CONFIG_NET_DROP_MONITOR=y
# CONFIG_NET_DSA is not set
@@ -3549,7 +3549,7 @@ CONFIG_NETLINK_DIAG=y
CONFIG_NET_MPLS_GSO=y
# CONFIG_NET_NCSI is not set
CONFIG_NET_NSH=y
-# CONFIG_NET_NS_REFCNT_TRACKER is not set
+CONFIG_NET_NS_REFCNT_TRACKER=y
CONFIG_NET_NS=y
CONFIG_NET_PKTGEN=m
CONFIG_NET_POLL_CONTROLLER=y
diff --git a/kernel.spec b/kernel.spec
index 7c8480a0a..50ce0c644 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc8.20220318git551acdc3c3d2.125
+%global distro_build 128
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc8.20220318git551acdc3c3d2.125
+%define pkgrelease 128
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc8.20220318git551acdc3c3d2.125%{?buildid}%{?dist}
+%define specrelease 128%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -697,7 +697,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc8-45-g551acdc3c3d2.tar.xz
+Source0: linux-5.17.tar.xz
Source1: Makefile.rhelver
@@ -1393,8 +1393,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17-rc8-45-g551acdc3c3d2 -c
-mv linux-5.17-rc8-45-g551acdc3c3d2 linux-%{KVERREL}
+%setup -q -n kernel-5.17 -c
+mv linux-5.17 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -3025,7 +3025,11 @@ fi
#
#
%changelog
-* Fri Mar 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.551acdc3c3d2.124]
+* Mon Mar 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-127]
+- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
+
+* Sat Mar 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.34e047aa16c0.124]
+- Enable net reference count trackers in all debug kernels (Jiri Benc)
- redhat/Makefile: Reorganize variables (Prarit Bhargava)
- redhat/Makefile: Add some descriptions (Prarit Bhargava)
- redhat/Makefile: Move SNAPSHOT check (Prarit Bhargava)
@@ -3050,7 +3054,6 @@ fi
- redhat/Makefile: Move HEAD to Makefile.variables. (Prarit Bhargava)
- redhat: Combine Makefile and Makefile.common (Prarit Bhargava)
- redhat/koji/Makefile: Decouple koji Makefile from Makefile.common (Prarit Bhargava)
-- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long)
* Fri Mar 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.551acdc3c3d2.124]
- Set CONFIG_SND_SOC_SOF_MT8195 for Fedora and turn on VDPA_SIM_BLOCK (Justin M. Forbes)
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index f4590fd89..c894e3507 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -130,7 +130,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 55a30ca69350..099a81cc56fd 100644
+index 7214f075e1f0..6ecb3acb605c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 1cda6e970..ec97fe7d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc8-45-g551acdc3c3d2.tar.xz) = f58b06f1ce92ecd57381e14df3df5448df7b4e344fa42605b407ed1df0a164318f3130235445c0fb1947498b6eef120075e01c285d79ed549c56840ad2d1e5ac
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc8.20220318git551acdc3c3d2.125.tar.bz2) = 1d0b9c5a4241e620f85788b08e443a0db56aff517a848fa51178eeb0c7e2b03db8c72ac97fca04a220296b83db4a1b53c4fae074bd6c14f61e409f16bc5a65ea
-SHA512 (kernel-kabi-dw-5.17.0-0.rc8.20220318git551acdc3c3d2.125.tar.bz2) = dd7e6ee3e33ec59620bfcdf00d932d6c1953cd5add9926e6f932c8ad200f12912e12ef16fedd3a199dd3b8c8e00371e44c6aaa3c90686080c3c1acfb1e9d4320
+SHA512 (linux-5.17.tar.xz) = f1f61baf70e17bff176ea1d60113a54c475baa1fe28087269c256c3de48498a1d89648139d4174abbc98c39ad823acdf6dc78e5d80f00152b730c4f1966e9189
+SHA512 (kernel-abi-stablelists-5.17.0-128.tar.bz2) = 6fc4041c97b445316c183879b33a737a598539c97dbad37749a7067e461c86d964a7ffa15210abae8ff284b5287d65cceb3a93b71ecaf6fe9f6a9709c8675844
+SHA512 (kernel-kabi-dw-5.17.0-128.tar.bz2) = 23399a012a1691446a4823eb22e245710d239714514f956a5d7ad8305e27ee87bd643d0ea040ad6ca8940f5adb60333dfeb7dfe81b265d840e174a4cbc7ad2f0