diff --git a/config/i386/pae b/config/i386/pae index ee133a1..3827a6c 100644 --- a/config/i386/pae +++ b/config/i386/pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.3.0-rc1 Kernel Configuration +# Linux/i386 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -3353,6 +3353,7 @@ CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m +CONFIG_FEALNX=m CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -8670,7 +8671,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_RTL8723BS=m CONFIG_R8712U=m -CONFIG_R8188EU=m CONFIG_RTS5208=m CONFIG_VT6655=m CONFIG_VT6656=m diff --git a/config/ppc64/default b/config/ppc64/default index f02b488..b169033 100644 --- a/config/ppc64/default +++ b/config/ppc64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.3.0-rc1 Kernel Configuration +# Linux/powerpc 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -3061,6 +3061,7 @@ CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m +# CONFIG_FEALNX is not set CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -7279,7 +7280,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_R8188EU=m CONFIG_RTS5208=m CONFIG_VT6655=m CONFIG_VT6656=m diff --git a/config/ppc64le/default b/config/ppc64le/default index 4327f05..a9e8900 100644 --- a/config/ppc64le/default +++ b/config/ppc64le/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 6.3.0-rc1 Kernel Configuration +# Linux/powerpc 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -2964,6 +2964,7 @@ CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m +# CONFIG_FEALNX is not set CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -7161,7 +7162,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_R8188EU=m CONFIG_RTS5208=m CONFIG_VT6655=m CONFIG_VT6656=m diff --git a/config/riscv64/default b/config/riscv64/default index fb2e479..fd383e6 100644 --- a/config/riscv64/default +++ b/config/riscv64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/riscv 6.3.0-rc1 Kernel Configuration +# Linux/riscv 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -3021,6 +3021,7 @@ CONFIG_MSCC_OCELOT_SWITCH=m CONFIG_NET_VENDOR_MICROSOFT=y CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m +CONFIG_FEALNX=m CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -7786,7 +7787,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_RTL8723BS=m CONFIG_R8712U=m -CONFIG_R8188EU=m CONFIG_RTS5208=m CONFIG_VT6655=m CONFIG_VT6656=m diff --git a/config/s390x/default b/config/s390x/default index bf8f9b3..d61c448 100644 --- a/config/s390x/default +++ b/config/s390x/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 6.3.0-rc1 Kernel Configuration +# Linux/s390 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -2200,6 +2200,7 @@ CONFIG_VCAP=y CONFIG_NET_VENDOR_MICROSEMI=y CONFIG_NET_VENDOR_MICROSOFT=y # CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_FEALNX is not set CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump index cf79103..99b99d8 100644 --- a/config/s390x/zfcpdump +++ b/config/s390x/zfcpdump @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 6.3.0-rc1 Kernel Configuration +# Linux/s390 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y diff --git a/config/x86_64/default b/config/x86_64/default index 74cf54c..8c5a492 100644 --- a/config/x86_64/default +++ b/config/x86_64/default @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 6.3.0-rc1 Kernel Configuration +# Linux/x86_64 6.3.0-rc2 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (scripts/dummy-tools/gcc)" CONFIG_CC_IS_GCC=y @@ -3454,6 +3454,7 @@ CONFIG_MICROSOFT_MANA=m CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m CONFIG_NET_VENDOR_NI=y CONFIG_NI_XGE_MANAGEMENT_ENET=m CONFIG_NET_VENDOR_NATSEMI=y @@ -8619,7 +8620,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_RTL8723BS=m CONFIG_R8712U=m -CONFIG_R8188EU=m CONFIG_RTS5208=m CONFIG_VT6655=m CONFIG_VT6656=m diff --git a/patches.suse/cpumask-fix-incorrect-cpumask-scanning-result-checks.patch b/patches.suse/cpumask-fix-incorrect-cpumask-scanning-result-checks.patch deleted file mode 100644 index d161bc9..0000000 --- a/patches.suse/cpumask-fix-incorrect-cpumask-scanning-result-checks.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 8ca09d5fa3549d142c2080a72a4c70ce389163cd Mon Sep 17 00:00:00 2001 -From: Linus Torvalds -Date: Mon, 6 Mar 2023 12:15:13 -0800 -Subject: cpumask: fix incorrect cpumask scanning result checks -Patch-mainline: v6.3-rc2 -Git-commit: 8ca09d5fa3549d142c2080a72a4c70ce389163cd -References: https://lkml.iu.edu/hypermail/linux/kernel/2303.0/05801.html - -It turns out that commit 596ff4a09b89 ("cpumask: re-introduce -constant-sized cpumask optimizations") exposed a number of cases of -drivers not checking the result of "cpumask_next()" and friends -correctly. - -The documented correct check for "no more cpus in the cpumask" is to -check for the result being equal or larger than the number of possible -CPU ids, exactly _because_ we've always done those constant-sized -cpumask scans using a widened type before. So the return value of a -cpumask scan should be checked with - - if (cpu >= nr_cpu_ids) - ... - -because the cpumask scan did not necessarily stop exactly *at* that -maximum CPU id. - -But a few cases ended up instead using checks like - - if (cpu == nr_cpumask_bits) - ... - -which used that internal "widened" number of bits. And that used to -work pretty much by accident (ok, in this case "by accident" is simply -because it matched the historical internal implementation of the cpumask -scanning, so it was more of a "intentionally using implementation -details rather than an accident"). - -But the extended constant-sized optimizations then did that internal -implementation differently, and now that code that did things wrong but -matched the old implementation no longer worked at all. - -Which then causes subsequent odd problems due to using what ends up -being an invalid CPU ID. - -Most of these cases require either unusual hardware or special uses to -hit, but the random.c one triggers quite easily. - -All you really need is to have a sufficiently small CONFIG_NR_CPUS value -for the bit scanning optimization to be triggered, but not enough CPUs -to then actually fill that widened cpumask. At that point, the cpumask -scanning will return the NR_CPUS constant, which is _not_ the same as -nr_cpumask_bits. - -This just does the mindless fix with - - sed -i 's/== nr_cpumask_bits/>= nr_cpu_ids/' - -to fix the incorrect uses. - -The ones in the SCSI lpfc driver in particular could probably be fixed -more cleanly by just removing that repeated pattern entirely, but I am -not emptionally invested enough in that driver to care. - -Reported-and-tested-by: Guenter Roeck -Link: https://lore.kernel.org/lkml/481b19b5-83a0-4793-b4fd-194ad7b978c3@roeck-us.net/ -Reported-and-tested-by: Geert Uytterhoeven -Link: https://lore.kernel.org/lkml/CAMuHMdUKo_Sf7TjKzcNDa8Ve+6QrK+P8nSQrSQ=6LTRmcBKNww@mail.gmail.com/ -Reported-by: Vernon Yang -Link: https://lore.kernel.org/lkml/20230306160651.2016767-1-vernon2gm@gmail.com/ -Cc: Yury Norov -Cc: Jason A. Donenfeld -Signed-off-by: Linus Torvalds -Acked-by: Michal Kubecek ---- - arch/powerpc/xmon/xmon.c | 2 +- - drivers/char/random.c | 2 +- - drivers/net/wireguard/queueing.h | 2 +- - drivers/scsi/lpfc/lpfc_init.c | 14 +++++++------- - 4 files changed, 10 insertions(+), 10 deletions(-) - ---- a/arch/powerpc/xmon/xmon.c -+++ b/arch/powerpc/xmon/xmon.c -@@ -1275,7 +1275,7 @@ static int xmon_batch_next_cpu(void) - while (!cpumask_empty(&xmon_batch_cpus)) { - cpu = cpumask_next_wrap(smp_processor_id(), &xmon_batch_cpus, - xmon_batch_start_cpu, true); -- if (cpu == nr_cpumask_bits) -+ if (cpu >= nr_cpu_ids) - break; - if (xmon_batch_start_cpu == -1) - xmon_batch_start_cpu = cpu; ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -1311,7 +1311,7 @@ static void __cold try_to_generate_entropy(void) - /* Basic CPU round-robin, which avoids the current CPU. */ - do { - cpu = cpumask_next(cpu, &timer_cpus); -- if (cpu == nr_cpumask_bits) -+ if (cpu >= nr_cpu_ids) - cpu = cpumask_first(&timer_cpus); - } while (cpu == smp_processor_id() && num_cpus > 1); - ---- a/drivers/net/wireguard/queueing.h -+++ b/drivers/net/wireguard/queueing.h -@@ -106,7 +106,7 @@ static inline int wg_cpumask_choose_online(int *stored_cpu, unsigned int id) - { - unsigned int cpu = *stored_cpu, cpu_index, i; - -- if (unlikely(cpu == nr_cpumask_bits || -+ if (unlikely(cpu >= nr_cpu_ids || - !cpumask_test_cpu(cpu, cpu_online_mask))) { - cpu_index = id % cpumask_weight(cpu_online_mask); - cpu = cpumask_first(cpu_online_mask); ---- a/drivers/scsi/lpfc/lpfc_init.c -+++ b/drivers/scsi/lpfc/lpfc_init.c -@@ -12563,7 +12563,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - goto found_same; - new_cpu = cpumask_next( - new_cpu, cpu_present_mask); -- if (new_cpu == nr_cpumask_bits) -+ if (new_cpu >= nr_cpu_ids) - new_cpu = first_cpu; - } - /* At this point, we leave the CPU as unassigned */ -@@ -12577,7 +12577,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - * selecting the same IRQ. - */ - start_cpu = cpumask_next(new_cpu, cpu_present_mask); -- if (start_cpu == nr_cpumask_bits) -+ if (start_cpu >= nr_cpu_ids) - start_cpu = first_cpu; - - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, -@@ -12613,7 +12613,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - goto found_any; - new_cpu = cpumask_next( - new_cpu, cpu_present_mask); -- if (new_cpu == nr_cpumask_bits) -+ if (new_cpu >= nr_cpu_ids) - new_cpu = first_cpu; - } - /* We should never leave an entry unassigned */ -@@ -12631,7 +12631,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - * selecting the same IRQ. - */ - start_cpu = cpumask_next(new_cpu, cpu_present_mask); -- if (start_cpu == nr_cpumask_bits) -+ if (start_cpu >= nr_cpu_ids) - start_cpu = first_cpu; - - lpfc_printf_log(phba, KERN_INFO, LOG_INIT, -@@ -12704,7 +12704,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - goto found_hdwq; - } - new_cpu = cpumask_next(new_cpu, cpu_present_mask); -- if (new_cpu == nr_cpumask_bits) -+ if (new_cpu >= nr_cpu_ids) - new_cpu = first_cpu; - } - -@@ -12719,7 +12719,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - goto found_hdwq; - - new_cpu = cpumask_next(new_cpu, cpu_present_mask); -- if (new_cpu == nr_cpumask_bits) -+ if (new_cpu >= nr_cpu_ids) - new_cpu = first_cpu; - } - -@@ -12730,7 +12730,7 @@ lpfc_cpu_affinity_check(struct lpfc_hba *phba, int vectors) - found_hdwq: - /* We found an available entry, copy the IRQ info */ - start_cpu = cpumask_next(new_cpu, cpu_present_mask); -- if (start_cpu == nr_cpumask_bits) -+ if (start_cpu >= nr_cpu_ids) - start_cpu = first_cpu; - cpup->hdwq = new_cpup->hdwq; - logit: diff --git a/rpm/config.sh b/rpm/config.sh index 4506314..a7f51d7 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=6.3-rc1 +SRCVERSION=6.3-rc2 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression diff --git a/series.conf b/series.conf index 1f974e3..beb188a 100644 --- a/series.conf +++ b/series.conf @@ -54,7 +54,6 @@ # sorted patches ######################################################## - patches.suse/cpumask-fix-incorrect-cpumask-scanning-result-checks.patch ######################################################## # end of sorted patches ########################################################