diff --git a/Makefile.rhelver b/Makefile.rhelver index ebfb13839..1dc269639 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 = 119 +RHEL_RELEASE = 120 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index e7aec0159..08a9e1412 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/1fdee68a166dcb5de165b6b27a6648c31d2ecd49 - 1fdee68a166dcb5de165b6b27a6648c31d2ecd49 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +"https://gitlab.com/cki-project/kernel-ark/-/commit"/07f7640ff2971c37cc11796d99b8bbb4799e3a27 + 07f7640ff2971c37cc11796d99b8bbb4799e3a27 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 4268adf88..b596455ea 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2736,6 +2736,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m CONFIG_I2C_SYNQUACER=m # CONFIG_I2C_TAOS_EVM is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1b3328214..e0d116cb3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2720,6 +2720,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m CONFIG_I2C_SYNQUACER=m # CONFIG_I2C_TAOS_EVM is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 59d7eb518..953c0371a 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2754,6 +2754,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_ST=m # CONFIG_I2C_STM32F4 is not set CONFIG_I2C_STM32F7=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5d39756ec..a0d69a5eb 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2739,6 +2739,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_ST=m # CONFIG_I2C_STM32F4 is not set CONFIG_I2C_STM32F7=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 34585a383..45fab1024 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2700,6 +2700,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m # CONFIG_I2C_STM32F4 is not set CONFIG_I2C_STM32F7=m CONFIG_I2C_STUB=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index bfcc35a66..b40bcfe85 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2685,6 +2685,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m # CONFIG_I2C_STM32F4 is not set CONFIG_I2C_STM32F7=m CONFIG_I2C_STUB=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index bc30b561d..bf67b26cb 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2380,6 +2380,7 @@ CONFIG_I2C_SIS96X=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index d7101df4b..4750fb45c 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2363,6 +2363,7 @@ CONFIG_I2C_SIS96X=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 4fe6acb82..4b28a82c2 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2235,6 +2235,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 3d6e2c6a0..9bc56a1d0 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1967,6 +1967,7 @@ CONFIG_I2C_SIMTEC=m # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set # CONFIG_I2C_SLAVE is not set +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 09fa7342b..0749c49ba 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2218,6 +2218,7 @@ CONFIG_I2C_SIMTEC=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 34945245f..9ee8da397 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1951,6 +1951,7 @@ CONFIG_I2C_SIMTEC=m # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set # CONFIG_I2C_SLAVE is not set +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ed0dcb4fd..0d850a4d7 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2420,6 +2420,7 @@ CONFIG_I2C_SIS96X=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 6e7c6d48a..503038358 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2092,6 +2092,7 @@ CONFIG_I2C_SIMTEC=m # CONFIG_I2C_SIS630 is not set CONFIG_I2C_SIS96X=m # CONFIG_I2C_SLAVE is not set +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index c68ec9914..7ee5674b6 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2403,6 +2403,7 @@ CONFIG_I2C_SIS96X=m CONFIG_I2C_SLAVE_EEPROM=m # CONFIG_I2C_SLAVE_TESTUNIT is not set CONFIG_I2C_SLAVE=y +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7177e1136..92bb51451 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2076,6 +2076,7 @@ CONFIG_I2C_SIMTEC=m # CONFIG_I2C_SIS630 is not set CONFIG_I2C_SIS96X=m # CONFIG_I2C_SLAVE is not set +CONFIG_I2C_SMBUS=m CONFIG_I2C_STUB=m # CONFIG_I2C_TAOS_EVM is not set CONFIG_I2C_TINY_USB=m diff --git a/kernel.spec b/kernel.spec index a21f54c28..53967bba9 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc7.20220310git3bf7edc84a9e.119 +%global distro_build 0.rc7.20220311git79b00034e9dc.120 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc7.20220310git3bf7edc84a9e.119 +%define pkgrelease 0.rc7.20220311git79b00034e9dc.120 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20220310git3bf7edc84a9e.119%{?buildid}%{?dist} +%define specrelease 0.rc7.20220311git79b00034e9dc.120%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc7-78-g3bf7edc84a9e.tar.xz +Source0: linux-5.17-rc7-205-g79b00034e9dc.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc7-78-g3bf7edc84a9e -c -mv linux-5.17-rc7-78-g3bf7edc84a9e linux-%{KVERREL} +%setup -q -n kernel-5.17-rc7-205-g79b00034e9dc -c +mv linux-5.17-rc7-205-g79b00034e9dc linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,9 +3005,14 @@ fi # # %changelog -* Thu Mar 10 2022 Fedora Kernel Team [5.17-0.rc7.3bf7edc84a9e.119] +* Fri Mar 11 2022 Fedora Kernel Team [5.17-0.rc7.79b00034e9dc.120] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Fri Mar 11 2022 Fedora Kernel Team [5.17-0.rc7.79b00034e9dc.119] +- Setting CONFIG_I2C_SMBUS to "m" for ark (Gopal Tiwari) +- Print arch with process_configs errors (Justin M. Forbes) +- Pass RHJOBS to process_configs for dist-configs-check as well (Justin M. Forbes) + * Thu Mar 10 2022 Fedora Kernel Team [5.17-0.rc7.3bf7edc84a9e.118] - redhat/configs/process_configs.sh: Fix issue with old error files (Prarit Bhargava) - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) diff --git a/process_configs.sh b/process_configs.sh index a946ce4c8..376f79584 100755 --- a/process_configs.sh +++ b/process_configs.sh @@ -104,7 +104,7 @@ checkoptions() ! $checkoptions_error && return - sed -i "1s/^/Error: Mismatches found in configuration files for ${variant}\n/" .mismatches${count} + sed -i "1s/^/Error: Mismatches found in configuration files for ${arch} ${variant}\n/" .mismatches${count} [ "$CONTINUEONERROR" ] || exit 1 else rm -f .mismatches${count} @@ -253,7 +253,7 @@ function process_config() grep -E 'CONFIG_' .listnewconfig${count} > .newoptions${count} if test -n "$NEWOPTIONS" && test -s .newoptions${count} then - echo "Found unset config items in ${variant}, please set them to an appropriate value" >> .errors${count} + echo "Found unset config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count} cat .newoptions${count} >> .errors${count} rm .newoptions${count} RETURNCODE=1 @@ -264,7 +264,7 @@ function process_config() grep -E 'config.*warning' .listnewconfig${count} > .warnings${count} if test -n "$CHECKWARNINGS" && test -s .warnings${count} then - echo "Found misconfigured config items in ${variant}, please set them to an appropriate value" >> .errors${count} + echo "Found misconfigured config items in ${arch} ${variant}, please set them to an appropriate value" >> .errors${count} cat .warnings${count} >> .errors${count} rm .warnings${count} [ "$CONTINUEONERROR" ] || exit 1 diff --git a/sources b/sources index f357663c8..c48eef538 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc7-78-g3bf7edc84a9e.tar.xz) = bd8879825b0edbbd8a35569434ec1097807a39a36d9a81be539e17e6535fd8403d469003eb30b1c094e43e126a9289236eac4bd0f7d9e09604bdad61c382f688 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.tar.bz2) = f021a4f01f267de807876b465e9017083dda2f6d8ae4fe3a3ed0c29221798bc2d935ec08bfb0455cce9872182cf69328c04306668d9d45d3a42b02368784cfcf -SHA512 (kernel-kabi-dw-5.17.0-0.rc7.20220310git3bf7edc84a9e.119.tar.bz2) = 0dd08a55fe7b9fcc06647e8885c62ec1cd8615926a2e7827582d0b7644e6834318467d7cf4c5c7c25e69e1d85e35877d20e0e655e0f5fe7be40ffaf8d2fa61ac +SHA512 (linux-5.17-rc7-205-g79b00034e9dc.tar.xz) = 1035bd9b19cd42ea7ef1b14387102bfd55e01f99ef86053864eb66a919f0e3727ce3b20a489b2ab8be30dddb64b6984e3d85495315f352b18331c0b368d5bc96 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.20220311git79b00034e9dc.120.tar.bz2) = 61041c9e82639236b9d4184b23faeff52aa03680e54a6650a184ea4fbbf20b94fb3aed15ffac4d00e0a592ddaba7cd392607ca6451783ff4d2bb54328f445698 +SHA512 (kernel-kabi-dw-5.17.0-0.rc7.20220311git79b00034e9dc.120.tar.bz2) = 245d0d86650b8ce04f0987d97e576fe42878894d2ab5e0eeeeba3c5cbe8ceb5407584aba5cf31405962a67c4c51cfc2f904423f16a200898114fc451fff0f18c