Somehow, patch-6.9-rc4.patch was generated against kernel 6.7. This obviously makes for quite a mess when applied to linux-6.8.tar.xz. Weirdly the patch applies without the emerge failing out, but unsurprisingly, the resulting tree won't build. Dies trying make oldconfig: HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o HOSTCC scripts/kconfig/confdata.o scripts/kconfig/confdata.c:168:6: error: redefinition of ‘conf_errors’ 168 | bool conf_errors(void) | ^~~~~~~~~~~ scripts/kconfig/confdata.c:161:6: note: previous definition of ‘conf_errors’ with type ‘_Bool(void)’ 161 | bool conf_errors(void) | ^~~~~~~~~~~ scripts/kconfig/confdata.c: In function ‘conf_read_simple’: scripts/kconfig/confdata.c:384:13: warning: unused variable ‘i’ [-Wunused-variable] 384 | int i, def_flags; | ^ make[2]: *** [scripts/Makefile.host:133: scripts/kconfig/confdata.o] Error 1 make[1]: *** [/usr/src/linux-6.9-rc4/Makefile:697: oldconfig] Error 2 make: *** [Makefile:249: __sub-make] Error 2 (The mis-patched confdata.c has two identical definitions of conf_errors() consecutively.) These are patchset sizes for the correct patchset, a simulation of the bad patchset, and the actual bad patchset: -rw-r--r-- 1 douzzer users 53932718 Apr 18 18:20 /tmp/patch-6.9-rc4.patch -rw-r--r-- 1 douzzer users 91681868 Apr 18 18:24 /tmp/patch-6.9-rc4.patch.whoops -rw-rw-r-- 1 portage portage 97385879 Apr 14 17:53 /var/cache/distfiles/patch-6.9-rc4.patch And here's the giveaway in the distributed bad patchset: diff --git a/Makefile b/Makefile index c6f549f6a4aeb..59d8a7f95d0a8 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 -PATCHLEVEL = 7 +PATCHLEVEL = 9 SUBLEVEL = 0 -EXTRAVERSION = +EXTRAVERSION = -rc4 NAME = Hurr durr I'ma ninja sloth # *DOCUMENTATION*
More info: from git-sources-6.9_rc3.ebuild to git-sources-6.9_rc4.ebuild this changed: 10c10 < K_BASE_VER="6.7" --- > K_BASE_VER="6.8" That's why the patchset for rc3, also generated against v6.7, had a good result, but the rc4 patchset blows up.
see https://bugs.gentoo.org/930034
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72b0288c94eafe1f807e0f257a8fd18013ccd978 It is now back to K_BASE_VER="6.7"
(In reply to jospezial from comment #3) > https://gitweb.gentoo.org/repo/gentoo.git/commit/ > ?id=72b0288c94eafe1f807e0f257a8fd18013ccd978 > > It is now back to K_BASE_VER="6.7" I'm not sure what the issue is. When the patch was generated against 6.7.
I think this can now be closed.
