diff options
| author | John Audia <therealgraysky@proton.me> | 2023-06-21 11:19:45 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-06-23 23:07:17 +0200 |
| commit | e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5 (patch) | |
| tree | d5b915cebdca1b75f0416e6355c5307bf6be6f9d /target/linux/generic | |
| parent | 1f5fce27c195373fedcf233a48470de97752058f (diff) | |
| download | upstream-e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5.tar.gz upstream-e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5.tar.bz2 upstream-e0fb38f4eeed6cd56d4b5178aeb91442b4fe92a5.zip | |
kernel: bump 6.1 to 6.1.35
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch index 23f8be5d264..7257f7010bb 100644 --- a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch @@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1169,6 +1171,11 @@ static const struct usb_device_id option +@@ -1173,6 +1175,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/pending-6.1/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch index a4413e919b4..82576d644d7 100644 --- a/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch +++ b/target/linux/generic/pending-6.1/300-mips_expose_boot_raw.patch @@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net> --- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1032,9 +1032,6 @@ config FW_ARC +@@ -1033,9 +1033,6 @@ config FW_ARC config ARCH_MAY_HAVE_PC_FDC bool @@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net> config CEVT_BCM1480 bool -@@ -3089,6 +3086,18 @@ choice +@@ -3090,6 +3087,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice |