From: Greg Kroah-Hartman Date: Thu, 4 Dec 2025 16:32:22 +0000 (+0100) Subject: drop some more patches X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a32dab0c853a5bf137fb875eab0e1d2c03ad1594;p=thirdparty%2Fkernel%2Fstable-queue.git drop some more patches --- diff --git a/queue-5.10/series b/queue-5.10/series index 433cd5fb3a..66c97d166d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -149,7 +149,6 @@ arm-at91-pm-save-and-restore-acr-during-pll-disable-.patch 9p-fix-sys-fs-9p-caches-overwriting-itself.patch 9p-sysfs_init-don-t-hardcode-error-to-enomem.patch acpi-property-return-present-device-nodes-only-on-fw.patch -tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch fbdev-add-bounds-checking-in-bit_putcs-to-fix-vmallo.patch asoc-meson-aiu-encoder-i2s-fix-bit-clock-polarity.patch ceph-add-checking-of-wait_for_completion_killable-re.patch diff --git a/queue-5.10/tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch b/queue-5.10/tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch deleted file mode 100644 index be9a061d11..0000000000 --- a/queue-5.10/tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0430138bed32614aec8697650a0f3962e1c0b1d8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Sep 2025 15:47:06 -0700 -Subject: tools bitmap: Add missing asm-generic/bitsperlong.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ian Rogers - -[ Upstream commit f38ce0209ab4553906b44bd1159e35c740a84161 ] - -small_const_nbits is defined in asm-generic/bitsperlong.h which -bitmap.h uses but doesn't include causing build failures in some build -systems. Add the missing #include. - -Note the bitmap.h in tools has diverged from that of the kernel, so no -changes are made there. - -Signed-off-by: Ian Rogers -Acked-by: Yury Norov -Cc: Adrian Hunter -Cc: Alexander Shishkin -Cc: André Almeida -Cc: Daniel Borkmann -Cc: Darren Hart -Cc: David S. Miller -Cc: Davidlohr Bueso -Cc: Ido Schimmel -Cc: Ingo Molnar -Cc: Jakub Kicinski -Cc: Jamal Hadi Salim -Cc: Jason Xing -Cc: Jiri Olsa -Cc: Jonas Gottlieb -Cc: Kan Liang -Cc: Mark Rutland -Cc: Maurice Lambert -Cc: Namhyung Kim -Cc: Paolo Abeni -Cc: Peter Zijlstra -Cc: Petr Machata -Cc: Rasmus Villemoes -Cc: Thomas Gleixner -Cc: Yuyang Huang -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/include/linux/bitmap.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h -index de45cad6cec19..1eeba6a147fb6 100644 ---- a/tools/include/linux/bitmap.h -+++ b/tools/include/linux/bitmap.h -@@ -3,6 +3,7 @@ - #define _PERF_BITOPS_H - - #include -+#include - #include - #include - #include --- -2.51.0 - diff --git a/queue-5.15/drm-amd-add-more-cyan-skillfish-pci-ids.patch b/queue-5.15/drm-amd-add-more-cyan-skillfish-pci-ids.patch deleted file mode 100644 index 1f18eb6269..0000000000 --- a/queue-5.15/drm-amd-add-more-cyan-skillfish-pci-ids.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c318c4535d0a2fc50ebad608f85c2ba6336372ae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 27 Jun 2025 10:09:06 -0400 -Subject: drm/amd: add more cyan skillfish PCI ids - -From: Alex Deucher - -[ Upstream commit 1e18746381793bef7c715fc5ec5611a422a75c4c ] - -Add additional PCI IDs to the cyan skillfish family. - -Signed-off-by: Alex Deucher -Signed-off-by: Sasha Levin ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index adcf3adc5ca51..7abcb5db9ae26 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -1942,6 +1942,11 @@ static const struct pci_device_id pciidlist[] = { - {0x1002, 0x7410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ALDEBARAN}, - - /* CYAN_SKILLFISH */ -+ {0x1002, 0x13DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, -+ {0x1002, 0x13F9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, -+ {0x1002, 0x13FA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, -+ {0x1002, 0x13FB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, -+ {0x1002, 0x13FC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, - {0x1002, 0x13FE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CYAN_SKILLFISH|AMD_IS_APU}, - - /* BEIGE_GOBY */ --- -2.51.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 393bfa8691..51a17609ff 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -132,7 +132,6 @@ ipv6-add-sanity-checks-on-ipv6_devconf.rpl_seg_enabl.patch net-nfc-nci-increase-nci_data_timeout-to-3000-ms.patch net-call-cond_resched-less-often-in-__release_sock.patch iommu-amd-skip-enabling-command-event-buffers-for-kd.patch -drm-amd-add-more-cyan-skillfish-pci-ids.patch usb-gadget-f_hid-fix-zero-length-packet-transfer.patch usb-cdns3-gadget-use-after-free-during-failed-initia.patch drm-msm-make-sure-to-not-queue-up-recovery-more-than.patch @@ -198,7 +197,6 @@ clk-ti-am33xx-keep-wkup_debugss_clkctrl-enabled.patch cpufreq-tegra186-initialize-all-cores-to-max-frequen.patch 9p-sysfs_init-don-t-hardcode-error-to-enomem.patch acpi-property-return-present-device-nodes-only-on-fw.patch -tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch fbdev-add-bounds-checking-in-bit_putcs-to-fix-vmallo.patch asoc-meson-aiu-encoder-i2s-fix-bit-clock-polarity.patch ceph-add-checking-of-wait_for_completion_killable-re.patch diff --git a/queue-5.15/tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch b/queue-5.15/tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch deleted file mode 100644 index 9e73f08d99..0000000000 --- a/queue-5.15/tools-bitmap-add-missing-asm-generic-bitsperlong.h-i.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 57302daa9a0026053191219259fd89acf099fa45 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Sep 2025 15:47:06 -0700 -Subject: tools bitmap: Add missing asm-generic/bitsperlong.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Ian Rogers - -[ Upstream commit f38ce0209ab4553906b44bd1159e35c740a84161 ] - -small_const_nbits is defined in asm-generic/bitsperlong.h which -bitmap.h uses but doesn't include causing build failures in some build -systems. Add the missing #include. - -Note the bitmap.h in tools has diverged from that of the kernel, so no -changes are made there. - -Signed-off-by: Ian Rogers -Acked-by: Yury Norov -Cc: Adrian Hunter -Cc: Alexander Shishkin -Cc: André Almeida -Cc: Daniel Borkmann -Cc: Darren Hart -Cc: David S. Miller -Cc: Davidlohr Bueso -Cc: Ido Schimmel -Cc: Ingo Molnar -Cc: Jakub Kicinski -Cc: Jamal Hadi Salim -Cc: Jason Xing -Cc: Jiri Olsa -Cc: Jonas Gottlieb -Cc: Kan Liang -Cc: Mark Rutland -Cc: Maurice Lambert -Cc: Namhyung Kim -Cc: Paolo Abeni -Cc: Peter Zijlstra -Cc: Petr Machata -Cc: Rasmus Villemoes -Cc: Thomas Gleixner -Cc: Yuyang Huang -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Sasha Levin ---- - tools/include/linux/bitmap.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h -index a83ffdf1e2117..e65a7e84c7541 100644 ---- a/tools/include/linux/bitmap.h -+++ b/tools/include/linux/bitmap.h -@@ -3,6 +3,7 @@ - #define _PERF_BITOPS_H - - #include -+#include - #include - #include - #include --- -2.51.0 -