kernel: refresh patches

Fixes: ee211e2fcd ("Merge Official Source")

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-11-13 15:05:11 +08:00
parent c128728811
commit 6c1ebe4474
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 9 additions and 9 deletions

View File

@ -31,14 +31,14 @@ Commit-Queue: Yu Zhao <yuzhao@chromium.org>
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@ -56,7 +56,8 @@
#define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 46
@@ -57,7 +57,8 @@
#define ARM64_WORKAROUND_1542419 47
#define ARM64_SPECTRE_BHB 48
+#define ARM64_HW_AF 49
#define ARM64_WORKAROUND_1742098 49
+#define ARM64_HW_AF 50
-#define ARM64_NCAPS 49
+#define ARM64_NCAPS 50
-#define ARM64_NCAPS 50
+#define ARM64_NCAPS 51
#endif /* __ASM_CPUCAPS_H */
--- a/arch/arm64/include/asm/cpufeature.h
@ -81,7 +81,7 @@ Commit-Queue: Yu Zhao <yuzhao@chromium.org>
/*
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1475,6 +1475,16 @@ static const struct arm64_cpu_capabiliti
@@ -1484,6 +1484,16 @@ static const struct arm64_cpu_capabiliti
.matches = has_hw_dbm,
.cpu_enable = cpu_enable_hw_dbm,
},

View File

@ -12,8 +12,8 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -826,6 +826,10 @@ struct sk_buff {
#endif
@@ -828,6 +828,10 @@ struct sk_buff {
__u8 scm_io_uring:1;
__u8 gro_skip:1;
+#ifdef CONFIG_SHORTCUT_FE

View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1364,6 +1364,7 @@ static const struct usb_device_id produc
@@ -1365,6 +1365,7 @@ static const struct usb_device_id produc
{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */