aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-12-15 11:20:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-12-15 11:20:38 +0000
commit5705d058eb0abea99dfa47dbbdb8ef9cd47ae0b8 (patch)
tree8784110fb6ac1721ce5773b655efa2226e7f03a3 /target/linux/generic
parent513702e6580e8c790894f85d92e0d8a2745406fb (diff)
downloadupstream-5705d058eb0abea99dfa47dbbdb8ef9cd47ae0b8.tar.gz
upstream-5705d058eb0abea99dfa47dbbdb8ef9cd47ae0b8.tar.bz2
upstream-5705d058eb0abea99dfa47dbbdb8ef9cd47ae0b8.zip
generic/4.4: bump to -rc5
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 47894
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.4/834-ledtrig-libata.patch2
-rw-r--r--target/linux/generic/patches-4.4/863-gpiommc.patch2
-rw-r--r--target/linux/generic/patches-4.4/902-debloat_proc.patch4
-rw-r--r--target/linux/generic/patches-4.4/997-device_tree_cmdline.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
index 6c6e78e005..c60fc1a515 100644
--- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
@@ -138,7 +138,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/*
* Define if arch has non-standard setup. This is a _PCI_ standard
-@@ -876,6 +879,12 @@ struct ata_port {
+@@ -877,6 +880,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif
diff --git a/target/linux/generic/patches-4.4/863-gpiommc.patch b/target/linux/generic/patches-4.4/863-gpiommc.patch
index de112d407b..55982b65b5 100644
--- a/target/linux/generic/patches-4.4/863-gpiommc.patch
+++ b/target/linux/generic/patches-4.4/863-gpiommc.patch
@@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4879,6 +4879,11 @@ T: git git://linuxtv.org/anttip/media_tr
+@@ -4880,6 +4880,11 @@ T: git git://linuxtv.org/anttip/media_tr
S: Maintained
F: drivers/media/usb/hackrf/
diff --git a/target/linux/generic/patches-4.4/902-debloat_proc.patch b/target/linux/generic/patches-4.4/902-debloat_proc.patch
index 2d7cc5d904..57ceeae82c 100644
--- a/target/linux/generic/patches-4.4/902-debloat_proc.patch
+++ b/target/linux/generic/patches-4.4/902-debloat_proc.patch
@@ -133,8 +133,8 @@
}
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
-@@ -1551,10 +1551,12 @@ static int __init setup_vmstat(void)
- cpu_notifier_register_done();
+@@ -1553,10 +1553,12 @@ static int __init setup_vmstat(void)
+ vmstat_wq = alloc_workqueue("vmstat", WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);
#endif
#ifdef CONFIG_PROC_FS
- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
diff --git a/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch b/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch
index 2ea41497a9..566648fcc5 100644
--- a/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch
+++ b/target/linux/generic/patches-4.4/997-device_tree_cmdline.patch
@@ -1,6 +1,6 @@
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
-@@ -951,6 +951,9 @@ int __init early_init_dt_scan_chosen(uns
+@@ -956,6 +956,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));