From 9a065fcfecbf344812a92dbd9b28298da7ef2b74 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 12 Mar 2017 12:30:30 +0100 Subject: kernel: update kernel 4.9 to 4.9.14 Signed-off-by: Hauke Mehrtens --- .../mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch | 9 --------- .../patches-4.9/104-linksys_mamba_disable_keep_config.patch | 2 +- .../mvebu/patches-4.9/106-enable-bm-on-linksys-devices.patch | 2 +- .../204-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) (limited to 'target/linux/mvebu') diff --git a/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch b/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch index 8a18cfa278..906e976509 100644 --- a/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch +++ b/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch @@ -17,8 +17,6 @@ Signed-off-by: Gregory CLEMENT arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 1 + 3 files changed, 3 insertions(+) -diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts -index f3cee91..a1b6e68 100644 --- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts +++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts @@ -315,6 +315,7 @@ @@ -29,8 +27,6 @@ index f3cee91..a1b6e68 100644 }; }; }; -diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts -index 1110718..a1a75af 100644 --- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts +++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts @@ -315,6 +315,7 @@ @@ -41,8 +37,6 @@ index 1110718..a1a75af 100644 }; }; }; -diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -index 42ea876..3744ba3 100644 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts @@ -266,6 +266,7 @@ @@ -53,6 +47,3 @@ index 42ea876..3744ba3 100644 }; usb2@5 { --- -2.9.3 - diff --git a/target/linux/mvebu/patches-4.9/104-linksys_mamba_disable_keep_config.patch b/target/linux/mvebu/patches-4.9/104-linksys_mamba_disable_keep_config.patch index 4c6b3115ed..d569f93a50 100644 --- a/target/linux/mvebu/patches-4.9/104-linksys_mamba_disable_keep_config.patch +++ b/target/linux/mvebu/patches-4.9/104-linksys_mamba_disable_keep_config.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -@@ -298,7 +298,6 @@ +@@ -299,7 +299,6 @@ nand@d0000 { status = "okay"; num-cs = <1>; diff --git a/target/linux/mvebu/patches-4.9/106-enable-bm-on-linksys-devices.patch b/target/linux/mvebu/patches-4.9/106-enable-bm-on-linksys-devices.patch index 39e713898a..86c6756a92 100644 --- a/target/linux/mvebu/patches-4.9/106-enable-bm-on-linksys-devices.patch +++ b/target/linux/mvebu/patches-4.9/106-enable-bm-on-linksys-devices.patch @@ -94,7 +94,7 @@ /* USB part of the eSATA/USB 2.0 port */ usb@50000 { status = "okay"; -@@ -367,6 +378,10 @@ +@@ -368,6 +379,10 @@ }; }; }; diff --git a/target/linux/mvebu/patches-4.9/204-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch b/target/linux/mvebu/patches-4.9/204-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch index b46697b727..caf5bd4aeb 100644 --- a/target/linux/mvebu/patches-4.9/204-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch +++ b/target/linux/mvebu/patches-4.9/204-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch @@ -9,7 +9,7 @@ Signed-off-by: Andrew Lunn --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts -@@ -416,13 +416,11 @@ +@@ -417,13 +417,11 @@ }; }; -- cgit v1.2.3