aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-07-13 20:54:11 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-07-13 21:25:14 +0200
commit38e704be71e5676a8b0bed5bbf74a2784acdaa01 (patch)
tree4f9acb6cbc3c65562f321464cd7742933eb5585b /target/linux/generic
parentaaecfecdcde549e9e1aa09d1d5e5d0d43d5c9b49 (diff)
downloadupstream-38e704be71e5676a8b0bed5bbf74a2784acdaa01.tar.gz
upstream-38e704be71e5676a8b0bed5bbf74a2784acdaa01.tar.bz2
upstream-38e704be71e5676a8b0bed5bbf74a2784acdaa01.zip
kernel: bump kernel 4.4 to version 4.4.140
These two patches: target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch target/linux/ramips/patches-4.4/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch are replaced by upstream commit 242dbd2b3df ("mtd: cfi_cmdset_0002: Change erase functions to check chip good only") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.4/103-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.4/103-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/patches-4.4/103-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
index a53be2d15c..dfdee8b5ce 100644
--- a/target/linux/generic/patches-4.4/103-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
+++ b/target/linux/generic/patches-4.4/103-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -75,7 +75,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -5372,7 +5372,7 @@ static void __init_refok alloc_node_mem_
+@@ -5370,7 +5370,7 @@ static void __init_refok alloc_node_mem_
mem_map = NODE_DATA(0)->node_mem_map;
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)