aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-09-11 22:17:47 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-09-11 22:17:47 +0200
commit76fc277917fc847892dbbf525aea9f90a035d296 (patch)
tree02359075c937d894ad19fdf3a6d6fbfd6ebfd3d8 /target/linux/generic
parente22ca21daab6d5be87b2b005b5a9440629730169 (diff)
downloadupstream-76fc277917fc847892dbbf525aea9f90a035d296.tar.gz
upstream-76fc277917fc847892dbbf525aea9f90a035d296.tar.bz2
upstream-76fc277917fc847892dbbf525aea9f90a035d296.zip
ath79: Make patches apply again
The patch adding support for LEDs connected to a reset controller did not apply any more, refresh it on top of current master. Fixes: 53fc987b2552 ("generic: move ledbar driver from mediatek target") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch6
-rw-r--r--target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch2
-rw-r--r--target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch2
3 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch b/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch
index 92264eedf9..2b4baab456 100644
--- a/target/linux/generic/hack-5.10/800-ubnt-ledbar-driver.patch
+++ b/target/linux/generic/hack-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"
diff --git a/target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch b/target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch
index e5622ccbbe..6fc93d9422 100644
--- a/target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch
+++ b/target/linux/generic/pending-5.15/020-05-mm-multigenerational-lru-aging.patch
@@ -168,7 +168,7 @@ Change-Id: I3ae8abc3100d023cecb3a699d86020ae6fc10a45
#include <asm/tlbflush.h>
-@@ -790,6 +791,13 @@ static bool page_referenced_one(struct p
+@@ -793,6 +794,13 @@ static bool page_referenced_one(struct p
}
if (pvmw.pte) {
diff --git a/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
index 4e347a4671..b0b399a2dd 100644
--- a/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ b/target/linux/generic/pending-5.15/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -7556,7 +7556,7 @@ static void __init alloc_node_mem_map(st
+@@ -7557,7 +7557,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)