[openwrt/openwrt] kernel: bump 6.12 to 6.12.33
LEDE Commits
lede-commits at lists.infradead.org
Thu Jun 12 03:42:40 PDT 2025
noltari pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/98ead2c70f53b9a9b136f2c5207809c82211c0f3
commit 98ead2c70f53b9a9b136f2c5207809c82211c0f3
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Tue Jun 10 08:05:48 2025 -0400
kernel: bump 6.12 to 6.12.33
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.33
All patches automatically rebased.
Build system: x86/64
Build-tested: x86/64
Run-tested: x86/64
Signed-off-by: John Audia <therealgraysky at proton.me>
Link: https://github.com/openwrt/openwrt/pull/19084
Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
...ial-pl2303-account-for-deficits-of-clones.patch | 8 +++---
target/linux/generic/kernel-6.12 | 4 +--
...-io.h-rework-split-ioread64-iowrite64-hel.patch | 31 +++++++---------------
3 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/target/linux/bcm27xx/patches-6.12/950-0821-USB-serial-pl2303-account-for-deficits-of-clones.patch b/target/linux/bcm27xx/patches-6.12/950-0821-USB-serial-pl2303-account-for-deficits-of-clones.patch
index ca33db81c9..0fc3d3d5fd 100644
--- a/target/linux/bcm27xx/patches-6.12/950-0821-USB-serial-pl2303-account-for-deficits-of-clones.patch
+++ b/target/linux/bcm27xx/patches-6.12/950-0821-USB-serial-pl2303-account-for-deficits-of-clones.patch
@@ -26,7 +26,7 @@ Signed-off-by: Johan Hovold <johan at kernel.org>
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID),
-@@ -467,6 +468,25 @@ static int pl2303_detect_type(struct usb
+@@ -469,6 +470,25 @@ static int pl2303_detect_type(struct usb
return -ENODEV;
}
@@ -52,7 +52,7 @@ Signed-off-by: Johan Hovold <johan at kernel.org>
static int pl2303_startup(struct usb_serial *serial)
{
struct pl2303_serial_private *spriv;
-@@ -489,6 +509,9 @@ static int pl2303_startup(struct usb_ser
+@@ -491,6 +511,9 @@ static int pl2303_startup(struct usb_ser
spriv->quirks = (unsigned long)usb_get_serial_data(serial);
spriv->quirks |= spriv->type->quirks;
@@ -62,7 +62,7 @@ Signed-off-by: Johan Hovold <johan at kernel.org>
usb_set_serial_data(serial, spriv);
if (type != TYPE_HXN) {
-@@ -725,9 +748,18 @@ static void pl2303_encode_baud_rate(stru
+@@ -727,9 +750,18 @@ static void pl2303_encode_baud_rate(stru
static int pl2303_get_line_request(struct usb_serial_port *port,
unsigned char buf[7])
{
@@ -82,7 +82,7 @@ Signed-off-by: Johan Hovold <johan at kernel.org>
ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
GET_LINE_REQUEST, GET_LINE_REQUEST_TYPE,
0, 0, buf, 7, 100);
-@@ -1064,9 +1096,13 @@ static int pl2303_carrier_raised(struct
+@@ -1066,9 +1098,13 @@ static int pl2303_carrier_raised(struct
static int pl2303_set_break(struct usb_serial_port *port, bool enable)
{
struct usb_serial *serial = port->serial;
diff --git a/target/linux/generic/kernel-6.12 b/target/linux/generic/kernel-6.12
index f30c6f52ea..abb61cf84e 100644
--- a/target/linux/generic/kernel-6.12
+++ b/target/linux/generic/kernel-6.12
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.12 = .32
-LINUX_KERNEL_HASH-6.12.32 = a9b020721778384507010177d3929e7d4058f7f6120f05a99d56b5c5c0346a70
+LINUX_VERSION-6.12 = .33
+LINUX_KERNEL_HASH-6.12.33 = c0a575630f2603a20bb0641f8df8f955e46c9d7ac1fae8b54b21316e6b52a254
diff --git a/target/linux/uml/patches-6.12/000-v6.13-asm-generic-io.h-rework-split-ioread64-iowrite64-hel.patch b/target/linux/uml/patches-6.12/000-v6.13-asm-generic-io.h-rework-split-ioread64-iowrite64-hel.patch
index f4092aad3f..70ecd7ec25 100644
--- a/target/linux/uml/patches-6.12/000-v6.13-asm-generic-io.h-rework-split-ioread64-iowrite64-hel.patch
+++ b/target/linux/uml/patches-6.12/000-v6.13-asm-generic-io.h-rework-split-ioread64-iowrite64-hel.patch
@@ -28,11 +28,9 @@ Signed-off-by: Arnd Bergmann <arnd at arndb.de>
lib/iomap.c | 40 +++++++++++++--------------
4 files changed, 60 insertions(+), 48 deletions(-)
-diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
-index 196087a8126e..9f3f25d7fc58 100644
--- a/include/asm-generic/iomap.h
+++ b/include/asm-generic/iomap.h
-@@ -31,42 +31,22 @@ extern unsigned int ioread16(const void __iomem *);
+@@ -31,42 +31,22 @@ extern unsigned int ioread16(const void
extern unsigned int ioread16be(const void __iomem *);
extern unsigned int ioread32(const void __iomem *);
extern unsigned int ioread32be(const void __iomem *);
@@ -83,11 +81,9 @@ index 196087a8126e..9f3f25d7fc58 100644
/*
* "string" versions of the above. Note that they
-diff --git a/include/linux/io-64-nonatomic-hi-lo.h b/include/linux/io-64-nonatomic-hi-lo.h
-index f32522bb3aa5..d3eade7cf663 100644
--- a/include/linux/io-64-nonatomic-hi-lo.h
+++ b/include/linux/io-64-nonatomic-hi-lo.h
-@@ -101,22 +101,38 @@ static inline void iowrite64be_hi_lo(u64 val, void __iomem *addr)
+@@ -101,22 +101,38 @@ static inline void iowrite64be_hi_lo(u64
#ifndef ioread64
#define ioread64_is_nonatomic
@@ -126,11 +122,9 @@ index f32522bb3aa5..d3eade7cf663 100644
+#endif
#endif /* _LINUX_IO_64_NONATOMIC_HI_LO_H_ */
-diff --git a/include/linux/io-64-nonatomic-lo-hi.h b/include/linux/io-64-nonatomic-lo-hi.h
-index 448a21435dba..94e676ec3d3f 100644
--- a/include/linux/io-64-nonatomic-lo-hi.h
+++ b/include/linux/io-64-nonatomic-lo-hi.h
-@@ -101,22 +101,38 @@ static inline void iowrite64be_lo_hi(u64 val, void __iomem *addr)
+@@ -101,22 +101,38 @@ static inline void iowrite64be_lo_hi(u64
#ifndef ioread64
#define ioread64_is_nonatomic
@@ -169,8 +163,6 @@ index 448a21435dba..94e676ec3d3f 100644
+#endif
#endif /* _LINUX_IO_64_NONATOMIC_LO_HI_H_ */
-diff --git a/lib/iomap.c b/lib/iomap.c
-index 4f8b31baa575..a65717cd86f7 100644
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -111,7 +111,7 @@ EXPORT_SYMBOL(ioread16be);
@@ -182,7 +174,7 @@ index 4f8b31baa575..a65717cd86f7 100644
static u64 pio_read64_lo_hi(unsigned long port)
{
u64 lo, hi;
-@@ -153,21 +153,21 @@ static u64 pio_read64be_hi_lo(unsigned long port)
+@@ -153,21 +153,21 @@ static u64 pio_read64be_hi_lo(unsigned l
}
__no_kmsan_checks
@@ -207,7 +199,7 @@ index 4f8b31baa575..a65717cd86f7 100644
{
IO_COND(addr, return pio_read64be_lo_hi(port),
return mmio_read64be(addr));
-@@ -175,19 +175,19 @@ u64 ioread64be_lo_hi(const void __iomem *addr)
+@@ -175,19 +175,19 @@ u64 ioread64be_lo_hi(const void __iomem
}
__no_kmsan_checks
@@ -242,7 +234,7 @@ index 4f8b31baa575..a65717cd86f7 100644
static void pio_write64_lo_hi(u64 val, unsigned long port)
{
outl(val, port);
-@@ -261,7 +261,7 @@ static void pio_write64be_hi_lo(u64 val, unsigned long port)
+@@ -261,7 +261,7 @@ static void pio_write64be_hi_lo(u64 val,
pio_write32be(val, port + sizeof(u32));
}
@@ -251,7 +243,7 @@ index 4f8b31baa575..a65717cd86f7 100644
{
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
-@@ -269,7 +269,7 @@ void iowrite64_lo_hi(u64 val, void __iomem *addr)
+@@ -269,7 +269,7 @@ void iowrite64_lo_hi(u64 val, void __iom
writeq(val, addr));
}
@@ -260,7 +252,7 @@ index 4f8b31baa575..a65717cd86f7 100644
{
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
-@@ -277,7 +277,7 @@ void iowrite64_hi_lo(u64 val, void __iomem *addr)
+@@ -277,7 +277,7 @@ void iowrite64_hi_lo(u64 val, void __iom
writeq(val, addr));
}
@@ -269,7 +261,7 @@ index 4f8b31baa575..a65717cd86f7 100644
{
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
-@@ -285,7 +285,7 @@ void iowrite64be_lo_hi(u64 val, void __iomem *addr)
+@@ -285,7 +285,7 @@ void iowrite64be_lo_hi(u64 val, void __i
mmio_write64be(val, addr));
}
@@ -278,7 +270,7 @@ index 4f8b31baa575..a65717cd86f7 100644
{
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
-@@ -293,12 +293,12 @@ void iowrite64be_hi_lo(u64 val, void __iomem *addr)
+@@ -293,12 +293,12 @@ void iowrite64be_hi_lo(u64 val, void __i
mmio_write64be(val, addr));
}
@@ -296,6 +288,3 @@ index 4f8b31baa575..a65717cd86f7 100644
/*
* These are the "repeat MMIO read/write" functions.
---
-2.49.0
-
More information about the lede-commits
mailing list