From 41fa086e6fd8687c9cb4b848686b9083e4d12865 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 19 Jul 2022 18:32:02 +0000 Subject: [PATCH] kernel: Refresh kernel patches No manual changes needed. Signed-off-by: Hauke Mehrtens --- .../0003-leds-add-reset-controller-based-driver.patch | 6 +++--- .../950-0043-fbdev-add-FBIOCOPYAREA-ioctl.patch | 8 ++++---- .../patches-5.10/600-net-disable-GRO-by-default.patch | 2 +- .../mediatek/patches-5.10/800-ubnt-ledbar-driver.patch | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch b/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch index 68b83103657..4a721f2af26 100644 --- a/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch +++ b/target/linux/ath79/patches-5.10/0003-leds-add-reset-controller-based-driver.patch @@ -13,9 +13,9 @@ Signed-off-by: John Crispin --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -929,6 +929,17 @@ config LEDS_ACER_A500 - This option enables support for the Power Button LED of - Acer Iconia Tab A500. +@@ -931,6 +931,17 @@ config LEDS_ACER_A500 + + source "drivers/leds/blink/Kconfig" +config LEDS_RESET + tristate "LED support for reset-controller API" diff --git a/target/linux/bcm27xx/patches-5.10/950-0043-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/bcm27xx/patches-5.10/950-0043-fbdev-add-FBIOCOPYAREA-ioctl.patch index 0807512c724..4ec089a3198 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0043-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0043-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -244,7 +244,7 @@ Signed-off-by: Dave Stevenson static int bcm2708_fb_register(struct bcm2708_fb *fb) --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1085,6 +1085,30 @@ fb_blank(struct fb_info *info, int blank +@@ -1095,6 +1095,30 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -275,7 +275,7 @@ Signed-off-by: Dave Stevenson static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1093,6 +1117,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1103,6 +1127,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_fix_screeninfo fix; struct fb_cmap cmap_from; struct fb_cmap_user cmap; @@ -283,7 +283,7 @@ Signed-off-by: Dave Stevenson void __user *argp = (void __user *)arg; long ret = 0; -@@ -1168,6 +1193,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1180,6 +1205,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -299,7 +299,7 @@ Signed-off-by: Dave Stevenson default: lock_fb_info(info); fb = info->fbops; -@@ -1313,6 +1347,7 @@ static long fb_compat_ioctl(struct file +@@ -1325,6 +1359,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: diff --git a/target/linux/bcm53xx/patches-5.10/600-net-disable-GRO-by-default.patch b/target/linux/bcm53xx/patches-5.10/600-net-disable-GRO-by-default.patch index 506e6f5b99a..d001852f383 100644 --- a/target/linux/bcm53xx/patches-5.10/600-net-disable-GRO-by-default.patch +++ b/target/linux/bcm53xx/patches-5.10/600-net-disable-GRO-by-default.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h -@@ -231,10 +231,10 @@ static inline int find_next_netdev_feature(u64 feature, unsigned long start) +@@ -231,10 +231,10 @@ static inline int find_next_netdev_featu #define NETIF_F_UPPER_DISABLES NETIF_F_LRO /* changeable features with no special hardware requirements */ diff --git a/target/linux/mediatek/patches-5.10/800-ubnt-ledbar-driver.patch b/target/linux/mediatek/patches-5.10/800-ubnt-ledbar-driver.patch index 92264eedf9c..2b4baab456a 100644 --- a/target/linux/mediatek/patches-5.10/800-ubnt-ledbar-driver.patch +++ b/target/linux/mediatek/patches-5.10/800-ubnt-ledbar-driver.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -929,6 +929,16 @@ config LEDS_ACER_A500 - This option enables support for the Power Button LED of - Acer Iconia Tab A500. +@@ -931,6 +931,16 @@ config LEDS_ACER_A500 + + source "drivers/leds/blink/Kconfig" +config LEDS_UBNT_LEDBAR + tristate "LED support for Ubiquiti UniFi 6 LR"