drop some 6.12 patches

diff --git a/queue-6.12/gpio-idio-16-actually-make-use-of-the-gpio_idio_16-s.patch b/queue-6.12/gpio-idio-16-actually-make-use-of-the-gpio_idio_16-s.patch
deleted file mode 100644 (file)
index adbe730..0000000
--- a/queue-6.12/gpio-idio-16-actually-make-use-of-the-gpio_idio_16-s.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8845b746c447c715080e448d62aeed25f73fb205 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 3 Dec 2024 18:26:30 +0100
-Subject: gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
-
-[ Upstream commit 9ac4b58fcef0f9fc03fa6e126a5f53c1c71ada8a ]
-
-DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h>
-is included. So move the define above the include block.
-
-Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module")
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
-Acked-by: William Breathitt Gray <wbg@kernel.org>
-Link: https://lore.kernel.org/r/20241203172631.1647792-2-u.kleine-koenig@baylibre.com
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpio/gpio-idio-16.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpio/gpio-idio-16.c b/drivers/gpio/gpio-idio-16.c
-index 2c9512589297..0103be977c66 100644
---- a/drivers/gpio/gpio-idio-16.c
-+++ b/drivers/gpio/gpio-idio-16.c
-@@ -3,6 +3,9 @@
-  * GPIO library for the ACCES IDIO-16 family
-  * Copyright (C) 2022 William Breathitt Gray
-  */
-+
-+#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
-+
- #include <linux/bits.h>
- #include <linux/device.h>
- #include <linux/err.h>
-@@ -14,8 +17,6 @@
- 
- #include "gpio-idio-16.h"
- 
--#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
--
- #define IDIO_16_DAT_BASE 0x0
- #define IDIO_16_OUT_BASE IDIO_16_DAT_BASE
- #define IDIO_16_IN_BASE (IDIO_16_DAT_BASE + 1)
--- 
-2.39.5
-

diff --git a/queue-6.12/module-convert-default-symbol-namespace-to-string-li.patch b/queue-6.12/module-convert-default-symbol-namespace-to-string-li.patch
deleted file mode 100644 (file)
index bf10a56..0000000
--- a/queue-6.12/module-convert-default-symbol-namespace-to-string-li.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From af461b6079e6df3b95b6b1f568d9680fcdcafa71 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 3 Dec 2024 19:21:07 +0900
-Subject: module: Convert default symbol namespace to string literal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Masahiro Yamada <masahiroy@kernel.org>
-
-[ Upstream commit ceb8bf2ceaa77fe222fe8fe32cb7789c9099ddf1 ]
-
-Commit cdd30ebb1b9f ("module: Convert symbol namespace to string
-literal") only converted MODULE_IMPORT_NS() and EXPORT_SYMBOL_NS(),
-leaving DEFAULT_SYMBOL_NAMESPACE as a macro expansion.
-
-This commit converts DEFAULT_SYMBOL_NAMESPACE in the same way to avoid
-annoyance for the default namespace as well.
-
-Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-Reviewed-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Stable-dep-of: 9ac4b58fcef0 ("gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- Documentation/core-api/symbol-namespaces.rst                  | 4 ++--
- .../translations/it_IT/core-api/symbol-namespaces.rst         | 4 ++--
- .../translations/zh_CN/core-api/symbol-namespaces.rst         | 4 ++--
- drivers/cdx/Makefile                                          | 2 +-
- drivers/crypto/intel/iaa/Makefile                             | 2 +-
- drivers/crypto/intel/qat/qat_common/Makefile                  | 2 +-
- drivers/dma/idxd/Makefile                                     | 2 +-
- drivers/gpio/gpio-idio-16.c                                   | 2 +-
- drivers/hwmon/nct6775-core.c                                  | 2 +-
- drivers/i2c/busses/i2c-designware-common.c                    | 2 +-
- drivers/i2c/busses/i2c-designware-master.c                    | 2 +-
- drivers/i2c/busses/i2c-designware-slave.c                     | 2 +-
- drivers/pwm/core.c                                            | 2 +-
- drivers/pwm/pwm-dwc-core.c                                    | 2 +-
- drivers/pwm/pwm-lpss.c                                        | 2 +-
- drivers/tty/serial/sc16is7xx.c                                | 2 +-
- drivers/usb/storage/Makefile                                  | 2 +-
- include/linux/export.h                                        | 2 +-
- 18 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/Documentation/core-api/symbol-namespaces.rst b/Documentation/core-api/symbol-namespaces.rst
-index 12e4aecdae94..d1154eb43810 100644
---- a/Documentation/core-api/symbol-namespaces.rst
-+++ b/Documentation/core-api/symbol-namespaces.rst
-@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
- export all symbols defined in usb-common into the namespace USB_COMMON, add a
- line like this to drivers/usb/common/Makefile::
- 
--      ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
-+      ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
- 
- That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A
- symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
-@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation
- unit as preprocessor statement. The above example would then read::
- 
-       #undef  DEFAULT_SYMBOL_NAMESPACE
--      #define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
-+      #define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
- 
- within the corresponding compilation unit before any EXPORT_SYMBOL macro is
- used.
-diff --git a/Documentation/translations/it_IT/core-api/symbol-namespaces.rst b/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
-index 17abc25ee4c1..6657f82c0101 100644
---- a/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
-+++ b/Documentation/translations/it_IT/core-api/symbol-namespaces.rst
-@@ -69,7 +69,7 @@ Per esempio per esportare tutti i simboli definiti in usb-common nello spazio
- dei nomi USB_COMMON, si può aggiungere la seguente linea in
- drivers/usb/common/Makefile::
- 
--      ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
-+      ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
- 
- Questo cambierà tutte le macro EXPORT_SYMBOL() ed EXPORT_SYMBOL_GPL(). Invece,
- un simbolo esportato con EXPORT_SYMBOL_NS() non verrà cambiato e il simbolo
-@@ -79,7 +79,7 @@ Una seconda possibilità è quella di definire il simbolo di preprocessore
- direttamente nei file da compilare. L'esempio precedente diventerebbe::
- 
-       #undef  DEFAULT_SYMBOL_NAMESPACE
--      #define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
-+      #define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
- 
- Questo va messo prima di un qualsiasi uso di EXPORT_SYMBOL.
- 
-diff --git a/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst b/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
-index bb16f0611046..f3e73834f7d7 100644
---- a/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
-+++ b/Documentation/translations/zh_CN/core-api/symbol-namespaces.rst
-@@ -66,7 +66,7 @@
- 子系统的 ``Makefile`` 中定义默认命名空间。例如，如果要将usb-common中定义的所有符号导
- 出到USB_COMMON命名空间，可以在drivers/usb/common/Makefile中添加这样一行::
- 
--       ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
-+       ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
- 
- 这将影响所有 EXPORT_SYMBOL() 和 EXPORT_SYMBOL_GPL() 语句。当这个定义存在时，
- 用EXPORT_SYMBOL_NS()导出的符号仍然会被导出到作为命名空间参数传递的命名空间中，
-@@ -76,7 +76,7 @@
- 成::
- 
-        #undef  DEFAULT_SYMBOL_NAMESPACE
--       #define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
-+       #define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
- 
- 应置于相关编译单元中任何 EXPORT_SYMBOL 宏之前
- 
-diff --git a/drivers/cdx/Makefile b/drivers/cdx/Makefile
-index 749a3295c2bd..3ca7068a3052 100644
---- a/drivers/cdx/Makefile
-+++ b/drivers/cdx/Makefile
-@@ -5,7 +5,7 @@
- # Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
- #
- 
--ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CDX_BUS
-+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"CDX_BUS"'
- 
- obj-$(CONFIG_CDX_BUS) += cdx.o controller/
- 
-diff --git a/drivers/crypto/intel/iaa/Makefile b/drivers/crypto/intel/iaa/Makefile
-index b64b208d2344..55bda7770fac 100644
---- a/drivers/crypto/intel/iaa/Makefile
-+++ b/drivers/crypto/intel/iaa/Makefile
-@@ -3,7 +3,7 @@
- # Makefile for IAA crypto device drivers
- #
- 
--ccflags-y += -I $(srctree)/drivers/dma/idxd -DDEFAULT_SYMBOL_NAMESPACE=IDXD
-+ccflags-y += -I $(srctree)/drivers/dma/idxd -DDEFAULT_SYMBOL_NAMESPACE='"IDXD"'
- 
- obj-$(CONFIG_CRYPTO_DEV_IAA_CRYPTO) := iaa_crypto.o
- 
-diff --git a/drivers/crypto/intel/qat/qat_common/Makefile b/drivers/crypto/intel/qat/qat_common/Makefile
-index eac73cbfdd38..7acf9c576149 100644
---- a/drivers/crypto/intel/qat/qat_common/Makefile
-+++ b/drivers/crypto/intel/qat/qat_common/Makefile
-@@ -1,6 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- obj-$(CONFIG_CRYPTO_DEV_QAT) += intel_qat.o
--ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CRYPTO_QAT
-+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"CRYPTO_QAT"'
- intel_qat-objs := adf_cfg.o \
-       adf_isr.o \
-       adf_ctl_drv.o \
-diff --git a/drivers/dma/idxd/Makefile b/drivers/dma/idxd/Makefile
-index 2b4a0d406e1e..9ff9d7b87b64 100644
---- a/drivers/dma/idxd/Makefile
-+++ b/drivers/dma/idxd/Makefile
-@@ -1,4 +1,4 @@
--ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=IDXD
-+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"IDXD"'
- 
- obj-$(CONFIG_INTEL_IDXD_BUS) += idxd_bus.o
- idxd_bus-y := bus.o
-diff --git a/drivers/gpio/gpio-idio-16.c b/drivers/gpio/gpio-idio-16.c
-index 53b1eb876a12..2c9512589297 100644
---- a/drivers/gpio/gpio-idio-16.c
-+++ b/drivers/gpio/gpio-idio-16.c
-@@ -14,7 +14,7 @@
- 
- #include "gpio-idio-16.h"
- 
--#define DEFAULT_SYMBOL_NAMESPACE GPIO_IDIO_16
-+#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
- 
- #define IDIO_16_DAT_BASE 0x0
- #define IDIO_16_OUT_BASE IDIO_16_DAT_BASE
-diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
-index ee04795b98aa..c243b51837d2 100644
---- a/drivers/hwmon/nct6775-core.c
-+++ b/drivers/hwmon/nct6775-core.c
-@@ -57,7 +57,7 @@
- #include "nct6775.h"
- 
- #undef DEFAULT_SYMBOL_NAMESPACE
--#define DEFAULT_SYMBOL_NAMESPACE HWMON_NCT6775
-+#define DEFAULT_SYMBOL_NAMESPACE "HWMON_NCT6775"
- 
- #define USE_ALTERNATE
- 
-diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
-index 9d88b4fa03e4..0e7771d21469 100644
---- a/drivers/i2c/busses/i2c-designware-common.c
-+++ b/drivers/i2c/busses/i2c-designware-common.c
-@@ -29,7 +29,7 @@
- #include <linux/types.h>
- #include <linux/units.h>
- 
--#define DEFAULT_SYMBOL_NAMESPACE      I2C_DW_COMMON
-+#define DEFAULT_SYMBOL_NAMESPACE      "I2C_DW_COMMON"
- 
- #include "i2c-designware-core.h"
- 
-diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
-index e8ac9a7bf0b3..e23f93b8974e 100644
---- a/drivers/i2c/busses/i2c-designware-master.c
-+++ b/drivers/i2c/busses/i2c-designware-master.c
-@@ -22,7 +22,7 @@
- #include <linux/regmap.h>
- #include <linux/reset.h>
- 
--#define DEFAULT_SYMBOL_NAMESPACE      I2C_DW
-+#define DEFAULT_SYMBOL_NAMESPACE      "I2C_DW"
- 
- #include "i2c-designware-core.h"
- 
-diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c
-index 7035296aa24c..0a76e10f77a2 100644
---- a/drivers/i2c/busses/i2c-designware-slave.c
-+++ b/drivers/i2c/busses/i2c-designware-slave.c
-@@ -16,7 +16,7 @@
- #include <linux/pm_runtime.h>
- #include <linux/regmap.h>
- 
--#define DEFAULT_SYMBOL_NAMESPACE      I2C_DW
-+#define DEFAULT_SYMBOL_NAMESPACE      "I2C_DW"
- 
- #include "i2c-designware-core.h"
- 
-diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
-index 210368099a06..174939359ae3 100644
---- a/drivers/pwm/core.c
-+++ b/drivers/pwm/core.c
-@@ -6,7 +6,7 @@
-  * Copyright (C) 2011-2012 Avionic Design GmbH
-  */
- 
--#define DEFAULT_SYMBOL_NAMESPACE PWM
-+#define DEFAULT_SYMBOL_NAMESPACE "PWM"
- 
- #include <linux/acpi.h>
- #include <linux/module.h>
-diff --git a/drivers/pwm/pwm-dwc-core.c b/drivers/pwm/pwm-dwc-core.c
-index c8425493b95d..6dabec93a3c6 100644
---- a/drivers/pwm/pwm-dwc-core.c
-+++ b/drivers/pwm/pwm-dwc-core.c
-@@ -9,7 +9,7 @@
-  * Author: Raymond Tan <raymond.tan@intel.com>
-  */
- 
--#define DEFAULT_SYMBOL_NAMESPACE dwc_pwm
-+#define DEFAULT_SYMBOL_NAMESPACE "dwc_pwm"
- 
- #include <linux/bitops.h>
- #include <linux/export.h>
-diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
-index 867e2bc8c601..3b99feb3bb49 100644
---- a/drivers/pwm/pwm-lpss.c
-+++ b/drivers/pwm/pwm-lpss.c
-@@ -19,7 +19,7 @@
- #include <linux/pm_runtime.h>
- #include <linux/time.h>
- 
--#define DEFAULT_SYMBOL_NAMESPACE PWM_LPSS
-+#define DEFAULT_SYMBOL_NAMESPACE "PWM_LPSS"
- 
- #include "pwm-lpss.h"
- 
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index ad88a33a504f..6a0a1cce3a89 100644
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -8,7 +8,7 @@
-  */
- 
- #undef DEFAULT_SYMBOL_NAMESPACE
--#define DEFAULT_SYMBOL_NAMESPACE SERIAL_NXP_SC16IS7XX
-+#define DEFAULT_SYMBOL_NAMESPACE "SERIAL_NXP_SC16IS7XX"
- 
- #include <linux/bits.h>
- #include <linux/clk.h>
-diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
-index 46635fa4a340..28db337f190b 100644
---- a/drivers/usb/storage/Makefile
-+++ b/drivers/usb/storage/Makefile
-@@ -8,7 +8,7 @@
- 
- ccflags-y := -I $(srctree)/drivers/scsi
- 
--ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_STORAGE
-+ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_STORAGE"'
- 
- obj-$(CONFIG_USB_UAS)         += uas.o
- obj-$(CONFIG_USB_STORAGE)     += usb-storage.o
-diff --git a/include/linux/export.h b/include/linux/export.h
-index 0bbd02fd351d..1e04dbc675c2 100644
---- a/include/linux/export.h
-+++ b/include/linux/export.h
-@@ -60,7 +60,7 @@
- #endif
- 
- #ifdef DEFAULT_SYMBOL_NAMESPACE
--#define _EXPORT_SYMBOL(sym, license)  __EXPORT_SYMBOL(sym, license, __stringify(DEFAULT_SYMBOL_NAMESPACE))
-+#define _EXPORT_SYMBOL(sym, license)  __EXPORT_SYMBOL(sym, license, DEFAULT_SYMBOL_NAMESPACE)
- #else
- #define _EXPORT_SYMBOL(sym, license)  __EXPORT_SYMBOL(sym, license, "")
- #endif
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index c63fbf53506d28326db5938074e5c3473de5156f..a10a2bddc05e41c8f8ec3c02e6a213b55908d527 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -113,8 +113,6 @@ acpi-resource-fix-memory-resource-type-union-access.patch
 cxgb4-use-port-number-to-set-mac-addr.patch
 qca_spi-fix-clock-speed-for-multiple-qca7000.patch
 qca_spi-make-driver-probing-reliable.patch
-module-convert-default-symbol-namespace-to-string-li.patch
-gpio-idio-16-actually-make-use-of-the-gpio_idio_16-s.patch
 alsa-control-avoid-warn-for-symlink-errors.patch
 asoc-amd-yc-fix-the-wrong-return-value.patch
 documentation-pm-clarify-pm_runtime_resume_and_get-r.patch