diff options
| author | John Audia <therealgraysky@proton.me> | 2024-01-05 15:40:08 -0500 |
|---|---|---|
| committer | Nick Hainke <vincent@systemli.org> | 2024-01-06 10:53:39 +0100 |
| commit | 37bb3893929fc3277e7d26ff0012d86526c98b77 (patch) | |
| tree | c402ddd257dab492822d70003722a067eb0d0267 /target/linux/generic/hack-5.15 | |
| parent | bcdab304678f0ea5ae2d57eb93c946e9416583cf (diff) | |
kernel: bump 5.15 to 5.15.146
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.146
Removed upstreamed:
generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.146&id=ac385518598f50dd1b9b41bd05f50ce9795481d5
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-5.15')
3 files changed, 3 insertions, 34 deletions
diff --git a/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch index 262a58036e..b03b4a674f 100644 --- a/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch +++ b/target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3597,6 +3597,11 @@ static int xmit_one(struct sk_buff *skb, +@@ -3600,6 +3600,11 @@ static int xmit_one(struct sk_buff *skb, if (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch index 60f02f7143..0060fbbd2a 100644 --- a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1146,6 +1151,11 @@ static const struct usb_device_id option +@@ -1147,6 +1152,11 @@ static const struct usb_device_id option { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support /* Quectel products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), -@@ -1187,6 +1197,11 @@ static const struct usb_device_id option +@@ -1188,6 +1198,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch b/target/linux/generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch deleted file mode 100644 index 4cf420a859..0000000000 --- a/target/linux/generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Namjae Jeon <linkinjeon@kernel.org> -To: sashal@kernel.org, gregkh@linuxfoundation.org, stable@vger.kernel.org -Cc: smfrench@gmail.com, Namjae Jeon <linkinjeon@kernel.org> -Subject: [PATCH v2 5.15.y 1/8] ksmbd: have a dependency on cifs ARC4 -Date: Wed, 27 Dec 2023 19:25:58 +0900 [thread overview] -Message-ID: <20231227102605.4766-2-linkinjeon@kernel.org> (raw) -In-Reply-To: <20231227102605.4766-1-linkinjeon@kernel.org> - -Omitted the change that has a dependency on cifs ARC4 from backporting -commit f9929ef6a2a5("ksmbd: add support for key exchange"). -This patch make ksmbd have a dependeny on cifs ARC4. - -Fixes: c5049d2d73b2 ("ksmbd: add support for key exchange") -Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> ---- - fs/Kconfig | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/fs/Kconfig -+++ b/fs/Kconfig -@@ -369,8 +369,8 @@ source "fs/ksmbd/Kconfig" - - config SMBFS_COMMON - tristate -- default y if CIFS=y -- default m if CIFS=m -+ default y if CIFS=y || SMB_SERVER=y -+ default m if CIFS=m || SMB_SERVER=m - - source "fs/coda/Kconfig" - source "fs/afs/Kconfig" |