aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-21 10:45:19 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-22 10:51:27 +0100
commit07ef8b70b8734c6c8a8e345ec39fe08466785d23 (patch)
tree9d402c4ba71ea4e3c8638a64ccb24570895647f0 /target/linux
parent0d549271d397b963be4ca26406688bc5dccaf123 (diff)
downloadupstream-07ef8b70b8734c6c8a8e345ec39fe08466785d23.tar.gz
upstream-07ef8b70b8734c6c8a8e345ec39fe08466785d23.tar.bz2
upstream-07ef8b70b8734c6c8a8e345ec39fe08466785d23.zip
kernel: bump 4.9 to 4.9.138
Refreshed all patches. Compile-tested: ar71xx, layerscape Runtime-tested: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch2
-rw-r--r--target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch2
-rw-r--r--target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch b/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch
index 3eed80e714..33f28912a2 100644
--- a/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch
+++ b/target/linux/generic/pending-4.9/170-MIPS-PCI-add-controllers-before-the-specified-head.patch
@@ -19,7 +19,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
--- a/arch/mips/pci/pci-legacy.c
+++ b/arch/mips/pci/pci-legacy.c
-@@ -190,7 +190,7 @@ void register_pci_controller(struct pci_
+@@ -194,7 +194,7 @@ void register_pci_controller(struct pci_
}
INIT_LIST_HEAD(&hose->list);
diff --git a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
index ff85a13fda..c7abd99b3b 100644
--- a/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
+++ b/target/linux/generic/pending-4.9/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
@@ -181,7 +181,7 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
/*
* The generic kexec code builds a page list with physical
-@@ -99,15 +214,16 @@ machine_kexec(struct kimage *image)
+@@ -102,15 +217,16 @@ machine_kexec(struct kimage *image)
/*
* we do not want to be bothered.
*/
diff --git a/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch
index f4013f5e21..c78f6c6031 100644
--- a/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch
+++ b/target/linux/lantiq/patches-4.9/0001-MIPS-lantiq-add-pcie-driver.patch
@@ -4143,7 +4143,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+
--- a/arch/mips/pci/pci-legacy.c
+++ b/arch/mips/pci/pci-legacy.c
-@@ -300,3 +300,30 @@ char *__init pcibios_setup(char *str)
+@@ -304,3 +304,30 @@ char *__init pcibios_setup(char *str)
return pcibios_plat_setup(str);
return str;
}