diff --git a/README b/README index db1a48a..96589fc 100644 --- a/README +++ b/README @@ -194,9 +194,11 @@ depending on the impact of your changes. Use scripts/tar-up.sh for creating an OBS package directory. The kernel source tree that scripts/sequence-patch.sh creates can be -test compiled as follows: +test-compiled. Before that, make sure all prerequisites are installed. +These include libopenssl-devel, libelf-devel, and dwarves (look into +rpm/kernel-binary.spec.in for a complete list). Then, the compilation +can be done as follows: - $ cp config/i386/default /var/tmp/scratch/linux-5.3-SLE15-SP3 $ cd /var/tmp/scratch/linux-5.3-SLE15-SP3 $ make oldconfig $ make diff --git a/patches.suse/ibmvnic-Assign-XPS-map-to-correct-queue-index.patch b/patches.suse/ibmvnic-Assign-XPS-map-to-correct-queue-index.patch new file mode 100644 index 0000000..8c537b1 --- /dev/null +++ b/patches.suse/ibmvnic-Assign-XPS-map-to-correct-queue-index.patch @@ -0,0 +1,44 @@ +From 6f2ce45f0c5f12b5fc6ffabf367bc1bb145534cc Mon Sep 17 00:00:00 2001 +From: Nick Child +Date: Thu, 23 Feb 2023 09:39:44 -0600 +Subject: [PATCH] ibmvnic: Assign XPS map to correct queue index + +References: bsc#1208757 ltc#201720 jsc#PED-2322 git-fixes +Patch-mainline: v6.3-rc1 +Git-commit: 6f2ce45f0c5f12b5fc6ffabf367bc1bb145534cc + +When setting the XPS map value for TX queues, use the index of the +transmit queue. +Previously, the function was passing the index of the loop that iterates +over all queues (RX and TX). This was causing invalid XPS map values. + +Fixes: 6831582937bd ("ibmvnic: Toggle between queue types in affinity mapping") +Signed-off-by: Nick Child +Reviewed-by: Pavan Chebbi +Link: https://lore.kernel.org/r/20230223153944.44969-1-nnac123@linux.ibm.com +Signed-off-by: Jakub Kicinski +Acked-by: Michal Suchanek +--- + drivers/net/ethernet/ibm/ibmvnic.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c +index 146ca1d8031b..c63d3ec9d328 100644 +--- a/drivers/net/ethernet/ibm/ibmvnic.c ++++ b/drivers/net/ethernet/ibm/ibmvnic.c +@@ -296,10 +296,10 @@ static void ibmvnic_set_affinity(struct ibmvnic_adapter *adapter) + + rc = __netif_set_xps_queue(adapter->netdev, + cpumask_bits(queue->affinity_mask), +- i, XPS_CPUS); ++ i_txqs - 1, XPS_CPUS); + if (rc) + netdev_warn(adapter->netdev, "%s: Set XPS on queue %d failed, rc = %d.\n", +- __func__, i, rc); ++ __func__, i_txqs - 1, rc); + } + + out: +-- +2.39.2 + diff --git a/patches.suse/ibmvnic-Toggle-between-queue-types-in-affinity-mappi.patch b/patches.suse/ibmvnic-Toggle-between-queue-types-in-affinity-mappi.patch index f1df940..aa6cbfa 100644 --- a/patches.suse/ibmvnic-Toggle-between-queue-types-in-affinity-mappi.patch +++ b/patches.suse/ibmvnic-Toggle-between-queue-types-in-affinity-mappi.patch @@ -4,8 +4,7 @@ Date: Fri, 27 Jan 2023 15:43:58 -0600 Subject: [PATCH] ibmvnic: Toggle between queue types in affinity mapping References: jsc#PED-2322 -Patch-mainline: queued -Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +Patch-mainline: v6.3-rc1 Git-commit: 6831582937bd23fc1640e6f65620ebf75b3b9ef4 Previously, ibmvnic IRQs were assigned to CPU numbers by assigning all diff --git a/patches.suse/ice-Do-not-skip-not-enabled-queues-in-ice_vc_dis_qs_.patch b/patches.suse/ice-Do-not-skip-not-enabled-queues-in-ice_vc_dis_qs_.patch index 046efb7..a64cd5e 100644 --- a/patches.suse/ice-Do-not-skip-not-enabled-queues-in-ice_vc_dis_qs_.patch +++ b/patches.suse/ice-Do-not-skip-not-enabled-queues-in-ice_vc_dis_qs_.patch @@ -61,15 +61,15 @@ Signed-off-by: Denis Kirjanov --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c -@@ -1396,9 +1396,9 @@ static int ice_vc_dis_qs_msg(struct ice_ +@@ -1358,9 +1358,9 @@ static int ice_vc_dis_qs_msg(struct ice_ goto error_param; } - /* Skip queue if not enabled */ - if (!test_bit(vf_q_id, vf->rxq_ena)) + if (!test_bit(vf_q_id, vf->txq_ena)) - continue; + dev_dbg(ice_pf_to_dev(vsi->back), "Queue %u on VSI %u is not enabled, but stopping it anyway\n", + vf_q_id, vsi->vsi_num); - if (ice_vsi_ctrl_one_rx_ring(vsi, false, vf_q_id, - true)) { + ice_fill_txq_meta(vsi, ring, &txq_meta); + diff --git a/patches.suse/ice-clear-stale-Tx-queue-settings-before-configuring.patch b/patches.suse/ice-clear-stale-Tx-queue-settings-before-configuring.patch index 09916a0..f479983 100644 --- a/patches.suse/ice-clear-stale-Tx-queue-settings-before-configuring.patch +++ b/patches.suse/ice-clear-stale-Tx-queue-settings-before-configuring.patch @@ -115,9 +115,9 @@ Acked-by: Thomas Bogendoerfer goto error_param; } -- /* Skip queue if not enabled */ - if (!test_bit(vf_q_id, vf->txq_ena)) -- continue; +- dev_dbg(ice_pf_to_dev(vsi->back), "Queue %u on VSI %u is not enabled, but stopping it anyway\n", +- vf_q_id, vsi->vsi_num); - - ice_fill_txq_meta(vsi, ring, &txq_meta); - diff --git a/patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch b/patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch index 4443c3c..02c62b0 100644 --- a/patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch +++ b/patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch @@ -1,15 +1,15 @@ From: Corey Minyard Date: Wed, 25 Jan 2023 10:34:47 -0600 Subject: [PATCH] ipmi:ssif: Add a timer between request retries -Patch-mainline: Queued -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git -Git-commit: 1fc7ac8a9e3a4b6bf16895c67dcb9bf455d31a49 +Patch-mainline: v6.3-rc1 +Git-commit: 00bb7e763ec9f384cb382455cb6ba5588b5375cf References: bsc#1206459 The IPMI spec has a time (T6) specified between request retries. Add the handling for that. Reported by: Tony Camuso +Cc: stable@vger.kernel.org Signed-off-by: Corey Minyard Acked-by: Chester Lin --- diff --git a/patches.suse/ipmi-ssif-Remove-rtc_us_timer.patch b/patches.suse/ipmi-ssif-Remove-rtc_us_timer.patch index 8ae082d..77acaa6 100644 --- a/patches.suse/ipmi-ssif-Remove-rtc_us_timer.patch +++ b/patches.suse/ipmi-ssif-Remove-rtc_us_timer.patch @@ -1,13 +1,13 @@ From: Corey Minyard Date: Wed, 25 Jan 2023 10:41:48 -0600 Subject: [PATCH] ipmi:ssif: Remove rtc_us_timer -Patch-mainline: Queued -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git -Git-commit: 48b4e13a3b8064ad61225ef6cb768c115c3a13c9 +Patch-mainline: v6.3-rc1 +Git-commit: 9e8b89926fb87e5625bdde6fd5de2c31fb1d83bf References: bsc#1206459 It was cruft left over from older handling of run to completion. +Cc: stable@vger.kernel.org Signed-off-by: Corey Minyard Acked-by: Chester Lin --- diff --git a/patches.suse/ipmi-ssif-resend_msg-cannot-fail.patch b/patches.suse/ipmi-ssif-resend_msg-cannot-fail.patch index b3eaabb..606af52 100644 --- a/patches.suse/ipmi-ssif-resend_msg-cannot-fail.patch +++ b/patches.suse/ipmi-ssif-resend_msg-cannot-fail.patch @@ -1,15 +1,15 @@ From: Corey Minyard Date: Wed, 25 Jan 2023 10:11:06 -0600 Subject: [PATCH] ipmi:ssif: resend_msg() cannot fail -Patch-mainline: Queued -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git -Git-commit: 56d64b4c876fbdf70ce4881f9fbde224e749c5bc +Patch-mainline: v6.3-rc1 +Git-commit: 95767ed78a181d5404202627499f9cde56053b96 References: bsc#1206459 The resend_msg() function cannot fail, but there was error handling around using it. Rework the handling of the error, and fix the out of retries debug reporting that was wrong around this, too. +Cc: stable@vger.kernel.org Signed-off-by: Corey Minyard Acked-by: Chester Lin --- diff --git a/patches.suse/ipmi_ssif-Rename-idle-state-and-check.patch b/patches.suse/ipmi_ssif-Rename-idle-state-and-check.patch index 1784184..4553c41 100644 --- a/patches.suse/ipmi_ssif-Rename-idle-state-and-check.patch +++ b/patches.suse/ipmi_ssif-Rename-idle-state-and-check.patch @@ -1,14 +1,14 @@ From: Corey Minyard Date: Wed, 25 Jan 2023 10:13:13 -0600 Subject: [PATCH] ipmi_ssif: Rename idle state and check -Patch-mainline: Queued -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git -Git-commit: b2aa938a4b7d2f2c21ef95c4ed779d4448bedd36 +Patch-mainline: v6.3-rc1 +Git-commit: 8230831c43a328c2be6d28c65d3f77e14c59986b References: bsc#1206459 Rename the SSIF_IDLE() to IS_SSIF_IDLE(), since that is more clear, and rename SSIF_NORMAL to SSIF_IDLE, since that's more accurate. +Cc: stable@vger.kernel.org Signed-off-by: Corey Minyard Acked-by: Chester Lin --- diff --git a/patches.suse/loop-fix-ioctl-calls-using-compat_loop_info.patch b/patches.suse/loop-fix-ioctl-calls-using-compat_loop_info.patch new file mode 100644 index 0000000..ab0c652 --- /dev/null +++ b/patches.suse/loop-fix-ioctl-calls-using-compat_loop_info.patch @@ -0,0 +1,65 @@ +From f941c51eeac7ebe0f8ec30943bf78e7f60aad039 Mon Sep 17 00:00:00 2001 +From: Carlos Llamas +Date: Tue, 29 Mar 2022 20:18:15 +0000 +Subject: [PATCH] loop: fix ioctl calls using compat_loop_info +Patch-mainline: v5.18-rc1 +Git-commit: f941c51eeac7ebe0f8ec30943bf78e7f60aad039 +References: bsc#1207333 + +Support for cryptoloop was deleted in commit 47e9624616c8 ("block: +remove support for cryptoloop and the xor transfer"), making the usage +of loop_info->lo_encrypt_type obsolete. However, this member was also +removed from the compat_loop_info definition and this breaks userspace +ioctl calls for 32-bit binaries and CONFIG_COMPAT=y. + +This patch restores the compat_loop_info->lo_encrypt_type member and +marks it obsolete as well as in the uapi header definitions. + +Fixes: 47e9624616c8 ("block: remove support for cryptoloop and the xor transfer") +Signed-off-by: Carlos Llamas +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20220329201815.1347500-1-cmllamas@google.com +Signed-off-by: Jens Axboe +Reviewed-by: Petr Vorel +--- + drivers/block/loop.c | 1 + + include/uapi/linux/loop.h | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index e733c48de2e9..39e7650f89b1 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -1592,6 +1592,7 @@ struct compat_loop_info { + compat_ulong_t lo_inode; /* ioctl r/o */ + compat_dev_t lo_rdevice; /* ioctl r/o */ + compat_int_t lo_offset; ++ compat_int_t lo_encrypt_type; /* obsolete, ignored */ + compat_int_t lo_encrypt_key_size; /* ioctl w/o */ + compat_int_t lo_flags; /* ioctl r/o */ + char lo_name[LO_NAME_SIZE]; +diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h +index 24a1c45bd1ae..98e60801195e 100644 +--- a/include/uapi/linux/loop.h ++++ b/include/uapi/linux/loop.h +@@ -45,7 +45,7 @@ struct loop_info { + unsigned long lo_inode; /* ioctl r/o */ + __kernel_old_dev_t lo_rdevice; /* ioctl r/o */ + int lo_offset; +- int lo_encrypt_type; ++ int lo_encrypt_type; /* obsolete, ignored */ + int lo_encrypt_key_size; /* ioctl w/o */ + int lo_flags; + char lo_name[LO_NAME_SIZE]; +@@ -61,7 +61,7 @@ struct loop_info64 { + __u64 lo_offset; + __u64 lo_sizelimit;/* bytes, 0 == max available */ + __u32 lo_number; /* ioctl r/o */ +- __u32 lo_encrypt_type; ++ __u32 lo_encrypt_type; /* obsolete, ignored */ + __u32 lo_encrypt_key_size; /* ioctl w/o */ + __u32 lo_flags; + __u8 lo_file_name[LO_NAME_SIZE]; +-- +2.39.0 + diff --git a/patches.suse/powerpc-64s-Make-POWER10-and-later-use-pause_short-i.patch b/patches.suse/powerpc-64s-Make-POWER10-and-later-use-pause_short-i.patch new file mode 100644 index 0000000..74c2fa4 --- /dev/null +++ b/patches.suse/powerpc-64s-Make-POWER10-and-later-use-pause_short-i.patch @@ -0,0 +1,89 @@ +From 9c7bfc2dc21e737e8e4a753630bce675e1e7c0ad Mon Sep 17 00:00:00 2001 +From: Nicholas Piggin +Date: Tue, 20 Sep 2022 22:22:59 +1000 +Subject: [PATCH] powerpc/64s: Make POWER10 and later use pause_short in + cpu_relax loops + +References: bsc#1208376 ltc#201076 +Patch-mainline: v6.1-rc1 +Git-commit: 9c7bfc2dc21e737e8e4a753630bce675e1e7c0ad + +We want to move away from using SMT priority updates for cpu_relax, and +use a 'wait' instruction which is similar to x86. As well as being a +much better fit for what everybody else uses and tests with, priority +nops are stateful which is nasty (interrupts have to consider they might +be taken at a different priority), and they're expensive to execute, +similar to a mtSPR which can effect other threads in the pipe. + +This has shown to give results that are less affected by code alignment +on benchmarks that cause a lot of spin waiting (e.g., rwsem contention +on unixbench filesystem benchmarks) on POWER10. + +QEMU TCG only supports this instruction correctly since v7.1, versions +without the fix may cause hangs whne running POWER10 CPUs. + +Reviewed-by: Segher Boessenkool +Signed-off-by: Nicholas Piggin +[mpe: Fix checkpatch warnings RE the macros] +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220920122259.363092-2-npiggin@gmail.com +Acked-by: Michal Suchanek +--- + arch/powerpc/include/asm/processor.h | 22 +++++++++++++++++----- + arch/powerpc/include/asm/vdso/processor.h | 8 +++++++- + 2 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h +index 97a77b37daa3..9bff4ab8242d 100644 +--- a/arch/powerpc/include/asm/processor.h ++++ b/arch/powerpc/include/asm/processor.h +@@ -355,11 +355,23 @@ static inline unsigned long __pack_fe01(unsigned int fpmode) + + #ifdef CONFIG_PPC64 + +-#define spin_begin() HMT_low() +- +-#define spin_cpu_relax() barrier() +- +-#define spin_end() HMT_medium() ++#define spin_begin() \ ++ asm volatile(ASM_FTR_IFCLR( \ ++ "or 1,1,1", /* HMT_LOW */ \ ++ "nop", /* v3.1 uses pause_short in cpu_relax instead */ \ ++ %0) :: "i" (CPU_FTR_ARCH_31) : "memory") ++ ++#define spin_cpu_relax() \ ++ asm volatile(ASM_FTR_IFCLR( \ ++ "nop", /* Before v3.1 use priority nops in spin_begin/end */ \ ++ PPC_WAIT(2, 0), /* aka pause_short */ \ ++ %0) :: "i" (CPU_FTR_ARCH_31) : "memory") ++ ++#define spin_end() \ ++ asm volatile(ASM_FTR_IFCLR( \ ++ "or 2,2,2", /* HMT_MEDIUM */ \ ++ "nop", \ ++ %0) :: "i" (CPU_FTR_ARCH_31) : "memory") + + #endif + +diff --git a/arch/powerpc/include/asm/vdso/processor.h b/arch/powerpc/include/asm/vdso/processor.h +--- a/arch/powerpc/include/asm/vdso/processor.h ++++ b/arch/powerpc/include/asm/vdso/processor.h +@@ -22,7 +22,13 @@ + #define HMT_high() asm volatile("or 3, 3, 3 # high priority") + + #ifdef CONFIG_PPC64 +-#define cpu_relax() do { HMT_low(); HMT_medium(); barrier(); } while (0) ++#define cpu_relax() \ ++ asm volatile(ASM_FTR_IFCLR( \ ++ /* Pre-POWER10 uses low ; medium priority nops */ \ ++ "or 1,1,1 ; or 2,2,2", \ ++ /* POWER10 onward uses pause_short (wait 2,0) */ \ ++ PPC_WAIT(2, 0), \ ++ %0) :: "i" (CPU_FTR_ARCH_31) : "memory") + #else + #define cpu_relax() barrier() + #endif +-- +2.39.2 + diff --git a/patches.suse/powerpc-add-ISA-v3.0-v3.1-wait-opcode-macro.patch b/patches.suse/powerpc-add-ISA-v3.0-v3.1-wait-opcode-macro.patch new file mode 100644 index 0000000..44a7f27 --- /dev/null +++ b/patches.suse/powerpc-add-ISA-v3.0-v3.1-wait-opcode-macro.patch @@ -0,0 +1,58 @@ +From dabeb572adf24bbd7cb21d1cc4d118bdf2c2ab74 Mon Sep 17 00:00:00 2001 +From: Nicholas Piggin +Date: Tue, 20 Sep 2022 22:22:58 +1000 +Subject: [PATCH] powerpc: add ISA v3.0 / v3.1 wait opcode macro + +References: bsc#1208376 ltc#201076 +Patch-mainline: v6.1-rc1 +Git-commit: dabeb572adf24bbd7cb21d1cc4d118bdf2c2ab74 + +The wait instruction encoding changed between ISA v2.07 and ISA v3.0. +In v3.1 the instruction gained a new field. + +Update the PPC_WAIT macro to the current encoding. Rename the older +incompatible one with a _v203 suffix as it was introduced in v2.03 +(the WC field was introduced in v2.07 but the kernel only uses WC=0). + +Reviewed-by: Segher Boessenkool +Signed-off-by: Nicholas Piggin +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/20220920122259.363092-1-npiggin@gmail.com +Acked-by: Michal Suchanek +--- + arch/powerpc/include/asm/ppc-opcode.h | 7 +++++-- + arch/powerpc/kernel/idle_64e.S | 2 +- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h +index c6d724104ed1..21e33e46f4b8 100644 +--- a/arch/powerpc/include/asm/ppc-opcode.h ++++ b/arch/powerpc/include/asm/ppc-opcode.h +@@ -330,6 +330,7 @@ + #define __PPC_XSP(s) ((((s) & 0x1e) | (((s) >> 5) & 0x1)) << 21) + #define __PPC_XTP(s) __PPC_XSP(s) + #define __PPC_T_TLB(t) (((t) & 0x3) << 21) ++#define __PPC_PL(p) (((p) & 0x3) << 16) + #define __PPC_WC(w) (((w) & 0x3) << 21) + #define __PPC_WS(w) (((w) & 0x1f) << 11) + #define __PPC_SH(s) __PPC_WS(s) +@@ -388,7 +389,8 @@ + #define PPC_RAW_RFDI (0x4c00004e) + #define PPC_RAW_RFMCI (0x4c00004c) + #define PPC_RAW_TLBILX(t, a, b) (0x7c000024 | __PPC_T_TLB(t) | __PPC_RA0(a) | __PPC_RB(b)) +-#define PPC_RAW_WAIT(w) (0x7c00007c | __PPC_WC(w)) ++#define PPC_RAW_WAIT_v203 (0x7c00007c) ++#define PPC_RAW_WAIT(w, p) (0x7c00003c | __PPC_WC(w) | __PPC_PL(p)) + #define PPC_RAW_TLBIE(lp, a) (0x7c000264 | ___PPC_RB(a) | ___PPC_RS(lp)) + #define PPC_RAW_TLBIE_5(rb, rs, ric, prs, r) \ + (0x7c000264 | ___PPC_RB(rb) | ___PPC_RS(rs) | ___PPC_RIC(ric) | ___PPC_PRS(prs) | ___PPC_R(r)) +@@ -606,7 +608,8 @@ + #define PPC_TLBILX_ALL(a, b) PPC_TLBILX(0, a, b) + #define PPC_TLBILX_PID(a, b) PPC_TLBILX(1, a, b) + #define PPC_TLBILX_VA(a, b) PPC_TLBILX(3, a, b) +-#define PPC_WAIT(w) stringify_in_c(.long PPC_RAW_WAIT(w)) ++#define PPC_WAIT_v203 stringify_in_c(.long PPC_RAW_WAIT_v203) ++#define PPC_WAIT(w, p) stringify_in_c(.long PPC_RAW_WAIT(w, p)) + #define PPC_TLBIE(lp, a) stringify_in_c(.long PPC_RAW_TLBIE(lp, a)) + #define PPC_TLBIE_5(rb, rs, ric, prs, r) \ + stringify_in_c(.long PPC_RAW_TLBIE_5(rb, rs, ric, prs, r)) diff --git a/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch b/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch index 2323cf7..df1c6b4 100644 --- a/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch +++ b/patches.suse/usb-dwc3-dwc3-qcom-Add-missing-platform_device_put-i.patch @@ -4,7 +4,7 @@ Date: Fri, 31 Dec 2021 11:36:41 +0000 Subject: [PATCH] usb: dwc3: dwc3-qcom: Add missing platform_device_put() in dwc3_qcom_acpi_register_core Git-commit: fa0ef93868a6062babe1144df2807a8b1d4924d2 -References: git-fixes +References: bsc#1208741 CVE-2023-22995 Patch-mainline: v5.17-rc1 Add the missing platform_device_put() before return from diff --git a/patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch b/patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch new file mode 100644 index 0000000..28ede74 --- /dev/null +++ b/patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch @@ -0,0 +1,49 @@ +From 817644fa4525258992f17fecf4f1d6cdd2e1b731 Mon Sep 17 00:00:00 2001 +From: Hironori Shiina +Date: Mon, 26 Dec 2022 10:11:19 -0800 +Subject: [PATCH] xfs: get root inode correctly at bulkstat +Git-commit: 817644fa4525258992f17fecf4f1d6cdd2e1b731 +Patch-mainline: v6.2-rc4 +References: git-fixes bsc#1207501 ltc#201370 + +The root inode number should be set to `breq->startino` for getting stat +information of the root when XFS_BULK_IREQ_SPECIAL_ROOT is used. +Otherwise, the inode search is started from 1 +(XFS_BULK_IREQ_SPECIAL_ROOT) and the inode with the lowest number in a +filesystem is returned. + +Fixes: bf3cb3944792 ("xfs: allow single bulkstat of special inodes") +Signed-off-by: Hironori Shiina +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Acked-by: Anthony Iliopoulos + +--- + fs/xfs/xfs_ioctl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c +index 13f1b2add390..736510bc241b 100644 +--- a/fs/xfs/xfs_ioctl.c ++++ b/fs/xfs/xfs_ioctl.c +@@ -754,7 +754,7 @@ xfs_bulkstat_fmt( + static int + xfs_bulk_ireq_setup( + struct xfs_mount *mp, +- struct xfs_bulk_ireq *hdr, ++ const struct xfs_bulk_ireq *hdr, + struct xfs_ibulk *breq, + void __user *ubuffer) + { +@@ -780,7 +780,7 @@ xfs_bulk_ireq_setup( + + switch (hdr->ino) { + case XFS_BULK_IREQ_SPECIAL_ROOT: +- hdr->ino = mp->m_sb.sb_rootino; ++ breq->startino = mp->m_sb.sb_rootino; + break; + default: + return -EINVAL; +-- +2.35.3 + diff --git a/rpm/group-source-files.pl b/rpm/group-source-files.pl index 768ecff..89fa8e8 100755 --- a/rpm/group-source-files.pl +++ b/rpm/group-source-files.pl @@ -66,7 +66,7 @@ sub calc_dirs do { $path =~ s{/[^/]+$}{}; $dirs{$path} = 1; - } while ($path ne $base); + } while ($path ne $base and $path ne ""); # This loop also makes sure that $base itself is included. } diff --git a/rpm/kernel-module-subpackage b/rpm/kernel-module-subpackage index 6645965..3a3d18c 100644 --- a/rpm/kernel-module-subpackage +++ b/rpm/kernel-module-subpackage @@ -82,23 +82,28 @@ END { exit(! good) } ' $spec ) %pre -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} +/usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %post -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} +/usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %preun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %postun -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} +%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %posttrans -n %{-n*}-kmp-%1 -%{-b:KMP_NEEDS_MKINITRD=1} /usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \ +%{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD} +/usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \ --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \ --flavor "%1" --usrmerged "0%{?usrmerged}" "$@" %files -n %{-n*}-kmp-%1 diff --git a/scripts/git_sort/tests/opensuse-15.3/Dockerfile b/scripts/git_sort/tests/opensuse-15.3/Dockerfile deleted file mode 100644 index 6c45bc6..0000000 --- a/scripts/git_sort/tests/opensuse-15.3/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# https://hub.docker.com/r/opensuse/leap/ -FROM opensuse/leap:15.3 AS base - -RUN zypper -n ref - -FROM base AS packages - -RUN zypper -n in git python3 python3-dbm rcs - -RUN git config --global user.email "you@example.com" -RUN git config --global user.name "Your Name" - -RUN zypper -n ar -G https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Leap_15.3/Kernel:tools.repo -RUN zypper -n in python3-pygit2 quilt - -FROM packages - -VOLUME /scripts - -WORKDIR /scripts/git_sort - -CMD python3 -m unittest discover -v diff --git a/scripts/git_sort/tests/opensuse-15.4/Dockerfile b/scripts/git_sort/tests/opensuse-15.4/Dockerfile new file mode 100644 index 0000000..1d5cbc7 --- /dev/null +++ b/scripts/git_sort/tests/opensuse-15.4/Dockerfile @@ -0,0 +1,24 @@ +# https://hub.docker.com/r/opensuse/leap/ +FROM opensuse/leap:15.4 AS base + +RUN zypper -n ref + +FROM base AS packages + +RUN zypper -n in git python3 python3-dbm rcs + +RUN git config --global user.email "you@example.com" +RUN git config --global user.name "Your Name" + +COPY Kernel.gpg /tmp +RUN rpmkeys --import /tmp/Kernel.gpg +RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15_SP4/Kernel:tools.repo +RUN zypper -n in python3-pygit2 quilt + +FROM packages + +VOLUME /scripts + +WORKDIR /scripts/git_sort + +CMD python3 -m unittest discover -v diff --git a/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile b/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile index 205d2c8..af6cfbc 100644 --- a/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile +++ b/scripts/git_sort/tests/opensuse-tumbleweed/Dockerfile @@ -10,7 +10,9 @@ RUN zypper -n in git python3 python3-dbm python3-pygit2 rcs util-linux RUN git config --global user.email "you@example.com" RUN git config --global user.name "Your Name" -RUN zypper -n ar -G https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Factory/Kernel:tools.repo +COPY Kernel.gpg /tmp +RUN rpmkeys --import /tmp/Kernel.gpg +RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/openSUSE_Factory/Kernel:tools.repo RUN zypper -n in --from Kernel_tools quilt FROM packages diff --git a/scripts/git_sort/tests/run_all.sh b/scripts/git_sort/tests/run_all.sh index 0177c1a..f63ab5b 100755 --- a/scripts/git_sort/tests/run_all.sh +++ b/scripts/git_sort/tests/run_all.sh @@ -6,13 +6,19 @@ for release in \ sle12-sp4 \ sle12-sp5 \ sle15 \ - opensuse-15.3 \ + opensuse-15.4 \ opensuse-tumbleweed \ ; do echo "Building container image for $release..." + cp -a $libdir/../../lib/SUSE/Kernel.gpg $libdir/$release docker build -q -t gs-test-$release "$libdir/$release" + ret=$? + rm -f $libdir/$release/Kernel.gpg + [ $ret -eq 0 ] || exit $? echo "Running tests in $release:" docker run --rm --name=gs-test-$release \ --mount type=bind,source="$libdir/../../",target=/scripts,readonly \ gs-test-$release + ret=$? + [ $ret -eq 0 ] || exit $? done diff --git a/scripts/git_sort/tests/sle12-sp4/Dockerfile b/scripts/git_sort/tests/sle12-sp4/Dockerfile index e0c545b..49d8f9c 100644 --- a/scripts/git_sort/tests/sle12-sp4/Dockerfile +++ b/scripts/git_sort/tests/sle12-sp4/Dockerfile @@ -2,13 +2,13 @@ FROM registry.suse.de/suse/containers/sle-server/12-sp4/containers/suse/sles12sp4:latest AS base RUN rpm -e container-suseconnect -RUN zypper -n ar -G http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo -RUN zypper -n ar -G http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo -RUN zypper -n ar -G http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1 -RUN zypper -n ar -G http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2 -RUN zypper -n ar -G http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3 +RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo +RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo +RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1 +RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2 +RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP4-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3 # RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP4/$(rpm -E %_arch)/product/ SDK -RUN zypper -n ar -G http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP4/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP4:$(rpm -E %_arch).repo +RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP4/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP4:$(rpm -E %_arch).repo RUN zypper -n ref @@ -19,7 +19,9 @@ RUN zypper -n in git-core python3 python3-dbm rcs RUN git config --global user.email "you@example.com" RUN git config --global user.name "Your Name" -RUN zypper -n ar -G https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP4/Kernel:tools.repo +COPY Kernel.gpg /tmp +RUN rpmkeys --import /tmp/Kernel.gpg +RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP4/Kernel:tools.repo RUN zypper -n in python3-pygit2 quilt FROM packages diff --git a/scripts/git_sort/tests/sle12-sp5/Dockerfile b/scripts/git_sort/tests/sle12-sp5/Dockerfile index c8b601d..f5e2f58 100644 --- a/scripts/git_sort/tests/sle12-sp5/Dockerfile +++ b/scripts/git_sort/tests/sle12-sp5/Dockerfile @@ -2,13 +2,13 @@ FROM registry.suse.de/suse/containers/sle-server/12-sp5/containers/suse/sles12sp5:latest AS base RUN rpm -e container-suseconnect -RUN zypper -n ar -G http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo -RUN zypper -n ar -G http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo -RUN zypper -n ar -G http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1 -RUN zypper -n ar -G http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2 -RUN zypper -n ar -G http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3 +RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/GA/standard/SUSE:SLE-12:GA.repo +RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-12:/Update/standard/SUSE:SLE-12:Update.repo +RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD1/ DVD1 +RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD2/ DVD2 +RUN zypper -n ar http://download.suse.de/install/SLP/SLE-12-SP5-Server-GM/$(rpm -E %_arch)/DVD3/ DVD3 # RUN zypper -n ar -G http://updates.suse.de/SUSE/Products/SLE-SDK/12-SP5/$(rpm -E %_arch)/product/ SDK -RUN zypper -n ar -G http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP5/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP5:$(rpm -E %_arch).repo +RUN zypper -n ar http://download.suse.de/update/build.suse.de/SUSE/Updates/SLE-SERVER/12-SP5/$(rpm -E %_arch)/update/SUSE:Updates:SLE-SERVER:12-SP5:$(rpm -E %_arch).repo RUN zypper -n ref @@ -19,7 +19,9 @@ RUN zypper -n in git-core python3 python3-dbm rcs RUN git config --global user.email "you@example.com" RUN git config --global user.name "Your Name" -RUN zypper -n ar -G https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP5/Kernel:tools.repo +COPY Kernel.gpg /tmp +RUN rpmkeys --import /tmp/Kernel.gpg +RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_12_SP5/Kernel:tools.repo RUN zypper -n in python3-pygit2 quilt FROM packages diff --git a/scripts/git_sort/tests/sle15/Dockerfile b/scripts/git_sort/tests/sle15/Dockerfile index 3fd5bf4..002074f 100644 --- a/scripts/git_sort/tests/sle15/Dockerfile +++ b/scripts/git_sort/tests/sle15/Dockerfile @@ -1,9 +1,9 @@ # http://registry.suse.de/ -FROM registry.suse.de/suse/containers/sle-server/15/containers/bci/python:3.9 AS base +FROM registry.suse.de/suse/containers/sle-server/15/containers/bci/python:3.6 AS base RUN rpm -e container-suseconnect -RUN zypper -n ar -G http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/SUSE:SLE-15:GA.repo -RUN zypper -n ar -G http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/SUSE:SLE-15:Update.repo +RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/GA/standard/SUSE:SLE-15:GA.repo +RUN zypper -n ar http://download.suse.de/ibs/SUSE:/SLE-15:/Update/standard/SUSE:SLE-15:Update.repo RUN zypper -n ref FROM base AS packages @@ -13,7 +13,9 @@ RUN zypper -n in git-core python3 python3-dbm rcs awk RUN git config --global user.email "you@example.com" RUN git config --global user.name "Your Name" -RUN zypper -n ar -G https://download.opensuse.org/repositories/Kernel:/tools/SLE_15/Kernel:tools.repo +COPY Kernel.gpg /tmp +RUN rpmkeys --import /tmp/Kernel.gpg +RUN zypper -n ar https://download.opensuse.org/repositories/Kernel:/tools/SLE_15/Kernel:tools.repo RUN zypper -n in python3-pygit2 quilt FROM packages diff --git a/scripts/git_sort/tests/test_series_sort.py b/scripts/git_sort/tests/test_series_sort.py index f0ffe5b..25f80a9 100755 --- a/scripts/git_sort/tests/test_series_sort.py +++ b/scripts/git_sort/tests/test_series_sort.py @@ -293,8 +293,8 @@ class TestFromPatch(unittest.TestCase): self.repo.remotes.create("rdma", self.rdma_repo) self.dledford_repo = k_org_canon_prefix + "dledford/rdma.git" self.repo.remotes.create("dledford/rdma", self.dledford_repo) - self.nf_repo = k_org_canon_prefix + "pablo/nf.git" - self.repo.remotes.create("pablo/nf", self.nf_repo) + self.nf_repo = k_org_canon_prefix + "netfilter/nf.git" + self.repo.remotes.create("netfilter/nf", self.nf_repo) self.commits = {} self.commits["mainline 0"] = self.repo.create_commit( @@ -377,7 +377,7 @@ class TestFromPatch(unittest.TestCase): tree.write(), [self.commits["mainline 0"]] ) - self.repo.references.create("refs/remotes/pablo/nf/master", + self.repo.references.create("refs/remotes/netfilter/nf/master", self.commits["nf 0"]) self.commits["mainline 2"] = self.repo.create_commit( @@ -822,13 +822,13 @@ class TestFromPatch(unittest.TestCase): with open("series.conf", mode="w") as f: f.write(tests.support.format_series(( - ("pablo/nf-next", ( + ("netfilter/nf-next", ( name, )), ))) series2 = tests.support.format_series(( - ("pablo/nf", ( + ("netfilter/nf", ( name, )), )) @@ -838,9 +838,9 @@ class TestFromPatch(unittest.TestCase): def test_found_notindexed_upstream_bad2_moveupstream(self): """ - patch sorted in pablo nf-next (not fetched), commit found in pablo nf, + patch sorted in netfilter nf-next (not fetched), commit found in netfilter nf, git-repo tag is bad - moves to pablo nf + moves to netfilter nf tag is NOT updated This is a special case. See the log of commit 0ac6457e94e8 @@ -854,7 +854,7 @@ class TestFromPatch(unittest.TestCase): def test_found_notindexed_upstream_bad2_nomoveupstream(self): """ - patch sorted in pablo nf-next (not fetched), commit found in pablo nf, + patch sorted in netfilter nf-next (not fetched), commit found in netfilter nf, git-repo tag is bad error, possible causes: section is wrong or Git-repo is wrong diff --git a/scripts/lib/SUSE/Kernel.gpg b/scripts/lib/SUSE/Kernel.gpg new file mode 100644 index 0000000..4d7dbc7 --- /dev/null +++ b/scripts/lib/SUSE/Kernel.gpg @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQENBFEaM/IBCADo3+2CX4/tZoGIooy7QF8+J94rwr7Tov3kXFADlXr+aG7zHMrz +r398QiSCmLsE7kJ8DcapHH+TaYrpy5yuS06RV4euhlJjo2+SHEcSzTGDIjrPTDvM +8KZE3CWZgyRTVZnTq7bRPtVhSIzkTPNyJe1AMMDZH8YYgDgo0zleZWR3w3VA75dC +fGUYjFTjymAM2QtzK3WAgywqZK0F21MKOCUWrz8ZFbCmdcZh/mAYDhmNlFcN6mZS +E/yD5E6pqGEF1Pr4dfwP0NbPBpsYq8wP3T5TIdaD5wr38u2QJNORxCKi8fuCqpf7 +HQx5v3x2EVz4VhRzzc31TPVz1LX5MPby8ypBABEBAAG0Lktlcm5lbCBPQlMgUHJv +amVjdCA8S2VybmVsQGJ1aWxkLm9wZW5zdXNlLm9yZz6JATwEEwECACYFAmFcgfcC +GwMFCRRg/gUGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDs7vIQA1ecHYjiB/9j +HSpLuZUnN2YIg6BFTXs4thRLcH0oaYqqvn9j9B4JR9ORHkCharrsBGLRw8zk+Rxt +fCKkty0hkF8yEnnrQV1SaTIBotadf+OnK3Rll4XTO/i7ww7vNcBklYDl801j8z21 +rDoDt9WPRMO748XFHbc1lcQxw7kyfT5XrmpMA1aKcP8jGk2Zs0+1dR4ZlHMs5yq3 +txVIq5dZE+cB+5F4ab3QhFdtGJlW5oM4kzojLSvPJq2NMH4NZPM0fbotbrKSiVDO +QjYURv7Crh/3uPs2OHgh3QRaEva4rU7z2Q/z6Lo5iinQJ9WcRfL8cMOHxSMArUCw +IwudjqU4hN/AyJ+OIYK0iEYEExECAAYFAlEaM/IACgkQOzARt2udZSOyewCguDRQ +jsRPwMa3DqdijMtrGaWTtdcAn20WA8ufB0LM8evtkMiv4PmlYfEz +=ehs+ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/scripts/lib/SUSE/SUSE_Trust_Root.pem b/scripts/lib/SUSE/SUSE_Trust_Root.pem index 27cb843..85975b5 100644 --- a/scripts/lib/SUSE/SUSE_Trust_Root.pem +++ b/scripts/lib/SUSE/SUSE_Trust_Root.pem @@ -1,4 +1,4 @@ ------BEGIN TRUSTED CERTIFICATE----- +-----BEGIN CERTIFICATE----- MIIG6DCCBNCgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBqDELMAkGA1UEBhMCREUx EjAQBgNVBAgTCUZyYW5jb25pYTESMBAGA1UEBxMJTnVyZW1iZXJnMSEwHwYDVQQK ExhTVVNFIExpbnV4IFByb2R1Y3RzIEdtYkgxFTATBgNVBAsTDE9QUyBTZXJ2aWNl @@ -35,6 +35,5 @@ OL+vEVNBlzGiU2mPuk/E75V43dhnaI3ktqph5oNq6gEZWArLkze2nksWdexjH7G5 42cij0RBO/+5RjmVzG9IXzmScE2V57McJpVDf0lPV57+xCkn6msqyRiJoDS3DPfV ySq1QlcPxhQUNSbDIL663gwirdJyf98C4W/zVcwjnUc+zGgxVInqhJVpuWvte9h/ bIf8cLGxGtSyQ616qwdS92vg1atJoG51Jdxw0EhzFtxJ8QVrfkGn1IT2ngUYYaOK -W8NcaXbJ/yeblISOdtHRxuCpZs8P9MxDAQn/X873eYfcim1xfqSimgJ2dpAwEQwP -U1VTRSBUcnVzdCBSb290 ------END TRUSTED CERTIFICATE----- +W8NcaXbJ/yeblISOdtHRxuCpZs8P9MxDAQn/X873eYfcim1xfqSimgJ2dpA= +-----END CERTIFICATE----- diff --git a/scripts/osc_wrapper b/scripts/osc_wrapper index 83f98c1..1869e6c 100755 --- a/scripts/osc_wrapper +++ b/scripts/osc_wrapper @@ -251,11 +251,7 @@ do_build() shift ;; *.spec) - if test $# -eq 1; then - spec=$1 - else - osc_args=("${osc_args[@]}" "$1") - fi + spec=$1 shift ;; *) diff --git a/scripts/renamepatches b/scripts/renamepatches index f86d7da..81a4e44 100755 --- a/scripts/renamepatches +++ b/scripts/renamepatches @@ -29,14 +29,20 @@ fi branch=$1 trap 'rm -f "$temp"' EXIT temp=$(mktemp) -git grep -iE '^(Git-commit:|No-fix:|\(cherry picked from commit)' $branch | grep -vF patches.kernel.org > $temp +git grep -iE '^(Git-commit:|No-fix:|\(cherry picked from commit)' $branch -- 'patches.*' | tr ':' ' ' | \ + awk '!/patches.kernel.org/ {fn=$2; hash=$NF; map[hash]=map[hash] fn;} + END { for (hash in map) printf("map[%s]=\"%s\"\n", hash, map[hash]); }' \ + >$temp -grep -E "^[[:space:]]*patches\.[a-z]+\/" < series.conf | while read patch ; do - commit="$([ -f $patch ] && { grep -iE "^(Git-commit|No-fix):" < $patch | awk '{ print $2}' ; - grep -i "^(cherry picked from commit" < $patch | awk '{ print $5}' ; } )" - [ -n "$commit" ] && echo "$commit" | while read c ; do - grep -F $c < $temp | tr ':' ' ' | while read junk fn blah ; do - [ -n "$fn" ] && [ $fn != $patch ] && git mv $patch $fn && sed -i -e "s,$patch,$fn," series.conf - done - done +declare -A map +source $temp + +grep -E "^[[:space:]]*patches\.[a-z]+/" < series.conf | while read patch ; do + [ ! -f "$patch" ] && continue + commit="$(awk -v IGNORECASE=1 '/^(Git-commit|No-fix):/ { print $2} + /^\(cherry picked from commit/ { print $5}' $patch)" + [ -z "$commit" ] && continue + for fn in ${map[$commit]} ; do + [ $fn != $patch ] && git mv $patch $fn && sed -i -e "s,$patch,$fn," series.conf + done done diff --git a/scripts/sequence-patch.sh b/scripts/sequence-patch.sh index 15f9409..bdfac19 100755 --- a/scripts/sequence-patch.sh +++ b/scripts/sequence-patch.sh @@ -503,7 +503,7 @@ if ! [ -d $ORIG_DIR ]; then fi if $VANILLA; then - PATCHES=( $(scripts/guards $SYMBOLS < series.conf | egrep '^patches\.(kernel\.org|rpmify)/') ) + PATCHES=( $(scripts/guards $SYMBOLS < series.conf | grep -E '^patches\.(kernel\.org|rpmify)/') ) else PATCHES=( $(scripts/guards $SYMBOLS < series.conf) ) fi diff --git a/series.conf b/series.conf index 1260a25..bb7d83d 100644 --- a/series.conf +++ b/series.conf @@ -22937,6 +22937,7 @@ patches.suse/nvme-allow-duplicate-NSIDs-for-private-namespaces.patch patches.suse/nvme-fix-RCU-hole-that-allowed-for-endless-looping-i.patch patches.suse/nvme-multipath-fix-hang-when-disk-goes-live-over-rec.patch + patches.suse/loop-fix-ioctl-calls-using-compat_loop_info.patch patches.suse/drbd-fix-potential-silent-data-corruption.patch patches.suse/drbd-remove-usage-of-list-iterator-variable-after-loop.patch patches.suse/xfs-drop-async-cache-flushes-from-CIL-commits.patch @@ -34808,6 +34809,8 @@ patches.suse/powerpc-64-Remove-unused-SYS_CALL_TABLE-symbol.patch patches.suse/powerpc-mm-64s-Drop-pgd_huge.patch patches.suse/ppc64-kdump-Limit-kdump-base-to-512MB.patch + patches.suse/powerpc-add-ISA-v3.0-v3.1-wait-opcode-macro.patch + patches.suse/powerpc-64s-Make-POWER10-and-later-use-pause_short-i.patch patches.suse/powerpc-pseries-Move-vas_migration_handler-early-dur.patch patches.suse/powerpc-boot-Explicitly-disable-usage-of-SPE-instruc.patch patches.suse/powerpc-kprobes-Fix-null-pointer-reference-in-arch_p.patch @@ -36731,6 +36734,7 @@ patches.suse/cifs-protect-access-of-TCP_Server_Info-dstaddr-hostname-.patch patches.suse/cifs-refcount-only-the-selected-iface-during-interface-update.patch patches.suse/cifs-fix-interface-count-calculation-during-refresh.patch + patches.suse/xfs-get-root-inode-correctly-at-bulkstat.patch patches.suse/scsi-storvsc-Fix-swiotlb-bounce-buffer-leak-in-confi.patch patches.suse/scsi-mpi3mr-Refer-CONFIG_SCSI_MPI3MR-in-Makefile.patch patches.suse/scsi-mpt3sas-Remove-usage-of-dma_get_required_mask-A.patch @@ -36868,9 +36872,12 @@ patches.suse/VMCI-Use-threaded-irqs-instead-of-tasklets.patch patches.suse/module-Don-t-wait-for-GOING-modules.patch patches.suse/Fix-page-corruption-caused-by-racy-check-in-__free_pages.patch - - # netdev/net-next patches.suse/ibmvnic-Toggle-between-queue-types-in-affinity-mappi.patch + patches.suse/ipmi-ssif-resend_msg-cannot-fail.patch + patches.suse/ipmi_ssif-Rename-idle-state-and-check.patch + patches.suse/ipmi-ssif-Remove-rtc_us_timer.patch + patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch + patches.suse/ibmvnic-Assign-XPS-map-to-correct-queue-index.patch # out-of-tree patches patches.suse/locking-rwsem-Prevent-non-first-waiter-from-spinning.patch @@ -36908,10 +36915,6 @@ patches.suse/media-dvb-core-Fix-UAF-due-to-refcount-races-at-rele.patch patches.suse/scsi-core-Add-BLIST_NO_ASK_VPD_SIZE-for-some-VDASD.patch patches.suse/char-pcmcia-synclink_cs-Fix-use-after-free-in-mgslpc.patch - patches.suse/ipmi-ssif-resend_msg-cannot-fail.patch - patches.suse/ipmi_ssif-Rename-idle-state-and-check.patch - patches.suse/ipmi-ssif-Remove-rtc_us_timer.patch - patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch ######################################################## # kbuild/module infrastructure fixes