diff --git a/debian/changelog b/debian/changelog index 6cec5d5e2..d293e81d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -linux (4.10~rc7-1~exp1) UNRELEASED; urgency=medium +linux (4.10-1~exp1) UNRELEASED; urgency=medium - * New upstream release candidate + * New upstream release: https://kernelnewbies.org/Linux_4.10 [ Ben Hutchings ] * aufs: Update support patchset to aufs4.x-rcN-20170206 + * Set ABI to trunk [ Roger Shimizu ] * debian/copyright & debian/README.source: diff --git a/debian/config/defines b/debian/config/defines index 3d2b059ca..8552f055c 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 2 +abiname: trunk ignore-changes: __cpuhp_* module:drivers/iio/common/st_sensors/** diff --git a/debian/patches/bugfix/all/ipv4-keep-skb-dst-around-in-presence-of-IP-options.patch b/debian/patches/bugfix/all/ipv4-keep-skb-dst-around-in-presence-of-IP-options.patch deleted file mode 100644 index cb1c8ad2b..000000000 --- a/debian/patches/bugfix/all/ipv4-keep-skb-dst-around-in-presence-of-IP-options.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Eric Dumazet -Date: Sat, 4 Feb 2017 11:16:52 -0800 -Subject: ipv4: keep skb->dst around in presence of IP options -Origin: https://git.kernel.org/linus/34b2cef20f19c87999fff3da4071e66937db9644 - -Andrey Konovalov got crashes in __ip_options_echo() when a NULL skb->dst -is accessed. - -ipv4_pktinfo_prepare() should not drop the dst if (evil) IP options -are present. - -We could refine the test to the presence of ts_needtime or srr, -but IP options are not often used, so let's be conservative. - -Thanks to syzkaller team for finding this bug. - -Fixes: d826eb14ecef ("ipv4: PKTINFO doesnt need dst reference") -Signed-off-by: Eric Dumazet -Reported-by: Andrey Konovalov -Signed-off-by: David S. Miller ---- - net/ipv4/ip_sockglue.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c -index 53ae0c6..9000117 100644 ---- a/net/ipv4/ip_sockglue.c -+++ b/net/ipv4/ip_sockglue.c -@@ -1238,7 +1238,14 @@ void ipv4_pktinfo_prepare(const struct sock *sk, struct sk_buff *skb) - pktinfo->ipi_ifindex = 0; - pktinfo->ipi_spec_dst.s_addr = 0; - } -- skb_dst_drop(skb); -+ /* We need to keep the dst for __ip_options_echo() -+ * We could restrict the test to opt.ts_needtime || opt.srr, -+ * but the following is good enough as IP options are not often used. -+ */ -+ if (unlikely(IPCB(skb)->opt.optlen)) -+ skb_dst_force(skb); -+ else -+ skb_dst_drop(skb); - } - - int ip_setsockopt(struct sock *sk, int level, --- -2.1.4 - diff --git a/debian/patches/bugfix/all/pegasus-use-heap-buffers-for-all-register-access.patch b/debian/patches/bugfix/all/pegasus-use-heap-buffers-for-all-register-access.patch deleted file mode 100644 index c09f50cd0..000000000 --- a/debian/patches/bugfix/all/pegasus-use-heap-buffers-for-all-register-access.patch +++ /dev/null @@ -1,88 +0,0 @@ -From: Ben Hutchings -Date: Fri, 27 Jan 2017 02:44:26 +0000 -Subject: pegasus: Use heap buffers for all register access -Forwarded: https://patchwork.ozlabs.org/patch/724109/ -Bug-Debian: https://bugs.debian.org/852556 - -Allocating USB buffers on the stack is not portable, and no longer -works on x86_64 (with VMAP_STACK enabled as per default). - -Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") -References: https://bugs.debian.org/852556 -Reported-by: Lisandro Damián Nicanor Pérez Meyer -Tested-by: Lisandro Damián Nicanor Pérez Meyer -Signed-off-by: Ben Hutchings ---- - drivers/net/usb/pegasus.c | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) - -diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c -index 24e803fe9a53..36674484c6fb 100644 ---- a/drivers/net/usb/pegasus.c -+++ b/drivers/net/usb/pegasus.c -@@ -126,40 +126,61 @@ static void async_ctrl_callback(struct urb *urb) - - static int get_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data) - { -+ u8 *buf; - int ret; - -+ buf = kmalloc(size, GFP_NOIO); -+ if (!buf) -+ return -ENOMEM; -+ - ret = usb_control_msg(pegasus->usb, usb_rcvctrlpipe(pegasus->usb, 0), - PEGASUS_REQ_GET_REGS, PEGASUS_REQT_READ, 0, -- indx, data, size, 1000); -+ indx, buf, size, 1000); - if (ret < 0) - netif_dbg(pegasus, drv, pegasus->net, - "%s returned %d\n", __func__, ret); -+ else if (ret <= size) -+ memcpy(data, buf, ret); -+ kfree(buf); - return ret; - } - --static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, void *data) -+static int set_registers(pegasus_t *pegasus, __u16 indx, __u16 size, -+ const void *data) - { -+ u8 *buf; - int ret; - -+ buf = kmemdup(data, size, GFP_NOIO); -+ if (!buf) -+ return -ENOMEM; -+ - ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0), - PEGASUS_REQ_SET_REGS, PEGASUS_REQT_WRITE, 0, -- indx, data, size, 100); -+ indx, buf, size, 100); - if (ret < 0) - netif_dbg(pegasus, drv, pegasus->net, - "%s returned %d\n", __func__, ret); -+ kfree(buf); - return ret; - } - - static int set_register(pegasus_t *pegasus, __u16 indx, __u8 data) - { -+ u8 *buf; - int ret; - -+ buf = kmemdup(&data, 1, GFP_NOIO); -+ if (!buf) -+ return -ENOMEM; -+ - ret = usb_control_msg(pegasus->usb, usb_sndctrlpipe(pegasus->usb, 0), - PEGASUS_REQ_SET_REG, PEGASUS_REQT_WRITE, data, -- indx, &data, 1, 1000); -+ indx, buf, 1, 1000); - if (ret < 0) - netif_dbg(pegasus, drv, pegasus->net, - "%s returned %d\n", __func__, ret); -+ kfree(buf); - return ret; - } - diff --git a/debian/patches/bugfix/all/sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch b/debian/patches/bugfix/all/sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch deleted file mode 100644 index 0fcbbcfd1..000000000 --- a/debian/patches/bugfix/all/sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Marcelo Ricardo Leitner -Date: Mon, 6 Feb 2017 18:10:31 -0200 -Subject: sctp: avoid BUG_ON on sctp_wait_for_sndbuf -Origin: https://git.kernel.org/linus/2dcab598484185dea7ec22219c76dcdd59e3cb90 - -Alexander Popov reported that an application may trigger a BUG_ON in -sctp_wait_for_sndbuf if the socket tx buffer is full, a thread is -waiting on it to queue more data and meanwhile another thread peels off -the association being used by the first thread. - -This patch replaces the BUG_ON call with a proper error handling. It -will return -EPIPE to the original sendmsg call, similarly to what would -have been done if the association wasn't found in the first place. - -Acked-by: Alexander Popov -Signed-off-by: Marcelo Ricardo Leitner -Reviewed-by: Xin Long -Signed-off-by: David S. Miller ---- - net/sctp/socket.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/net/sctp/socket.c b/net/sctp/socket.c -index 37eeab7..e214d2e 100644 ---- a/net/sctp/socket.c -+++ b/net/sctp/socket.c -@@ -7426,7 +7426,8 @@ static int sctp_wait_for_sndbuf(struct sctp_association *asoc, long *timeo_p, - */ - release_sock(sk); - current_timeo = schedule_timeout(current_timeo); -- BUG_ON(sk != asoc->base.sk); -+ if (sk != asoc->base.sk) -+ goto do_error; - lock_sock(sk); - - *timeo_p = current_timeo; --- -2.1.4 - diff --git a/debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch b/debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch deleted file mode 100644 index 37545f75b..000000000 --- a/debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Roger Shimizu -Date: Mon, 30 Jan 2017 20:07:29 +0900 -Subject: [PATCH 1/2] ARM: dts: orion5x-lschl: Fix model name -Origin: https://git.kernel.org/next/linux-next/c/d566a78ab13abded6b4acdc9b3fafa8c46f3ed09 - -Model name should be consistent with legacy device file, so that user -can migrate their system from legacy device support to device-tree -safely. - -Legacy device file is currently removed, but it can be found on 4.8 -or previous version of linux: - arch/arm/mach-orion5x/ls-chl-setup.c - -Fixes: f94f268979a2 ("ARM: dts: orion5x: convert ls-chl to FDT") -Cc: Ashley Hughes -Signed-off-by: Roger Shimizu -Signed-off-by: Gregory CLEMENT ---- - arch/arm/boot/dts/orion5x-lschl.dts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-lschl.dts -index 7c999b092e06..ee751995c8d0 100644 ---- a/arch/arm/boot/dts/orion5x-lschl.dts -+++ b/arch/arm/boot/dts/orion5x-lschl.dts -@@ -2,7 +2,7 @@ - * Device Tree file for Buffalo Linkstation LS-CHLv3 - * - * Copyright (C) 2016 Ash Hughes -- * Copyright (C) 2015, 2016 -+ * Copyright (C) 2015-2017 - * Roger Shimizu - * - * This file is dual-licensed: you can use it either under the terms -@@ -52,7 +52,7 @@ - #include - - / { -- model = "Buffalo Linkstation Live v3 (LS-CHL)"; -+ model = "Buffalo Linkstation LiveV3 (LS-CHL)"; - compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x"; - - memory { /* 128 MB */ diff --git a/debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch b/debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch deleted file mode 100644 index c4b2938eb..000000000 --- a/debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch +++ /dev/null @@ -1,383 +0,0 @@ -From: Roger Shimizu -Date: Mon, 30 Jan 2017 20:07:30 +0900 -Subject: [PATCH 2/2] ARM: dts: orion5x-lschl: More consistent naming on - linkstation series -Origin: https://git.kernel.org/next/linux-next/c/56ba99b01308c360df5d18c6127f38b287550965 - -DTS files, which includes orion5x-linkstation.dtsi, are named: - orion5x-linkstation-*.dts - -So we rename the file below: - arch/arm/boot/dts/orion5x-lschl.dts -to the new name: - arch/arm/boot/dts/orion5x-linkstation-lschl.dts - -Because DTS conversion of this device was just introduced in 4.9, Debian -is still using legacy device support, other distros are the same, -so here we won't expect any impact actually. - -Fixes: f94f268979a2 ("ARM: dts: orion5x: convert ls-chl to FDT") -Cc: Ashley Hughes -Signed-off-by: Roger Shimizu -Signed-off-by: Gregory CLEMENT ---- - arch/arm/boot/dts/orion5x-linkstation-lschl.dts | 171 ++++++++++++++++++++++++ - arch/arm/boot/dts/orion5x-lschl.dts | 171 ------------------------ - 2 files changed, 171 insertions(+), 171 deletions(-) - create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lschl.dts - delete mode 100644 arch/arm/boot/dts/orion5x-lschl.dts - -diff --git a/arch/arm/boot/dts/orion5x-linkstation-lschl.dts b/arch/arm/boot/dts/orion5x-linkstation-lschl.dts -new file mode 100644 -index 000000000000..ea6c881634b9 ---- /dev/null -+++ b/arch/arm/boot/dts/orion5x-linkstation-lschl.dts -@@ -0,0 +1,171 @@ -+/* -+ * Device Tree file for Buffalo Linkstation LS-CHLv3 -+ * -+ * Copyright (C) 2016 Ash Hughes -+ * Copyright (C) 2015-2017 -+ * Roger Shimizu -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+ -+#include "orion5x-linkstation.dtsi" -+#include "mvebu-linkstation-gpio-simple.dtsi" -+#include "mvebu-linkstation-fan.dtsi" -+#include -+ -+/ { -+ model = "Buffalo Linkstation LiveV3 (LS-CHL)"; -+ compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x"; -+ -+ memory { /* 128 MB */ -+ device_type = "memory"; -+ reg = <0x00000000 0x8000000>; -+ }; -+ -+ gpio_keys { -+ func { -+ label = "Function Button"; -+ linux,code = ; -+ gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; -+ }; -+ -+ power-on-switch { -+ gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; -+ }; -+ -+ power-auto-switch { -+ gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ gpio_leds { -+ pinctrl-0 = <&pmx_led_power &pmx_led_alarm &pmx_led_info &pmx_led_func>; -+ blue-power-led { -+ gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; -+ }; -+ -+ red-alarm-led { -+ gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; -+ }; -+ -+ amber-info-led { -+ gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; -+ }; -+ -+ func { -+ label = "lschl:func:blue:top"; -+ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; -+ }; -+ }; -+ -+ gpio_fan { -+ gpios = <&gpio0 14 GPIO_ACTIVE_LOW -+ &gpio0 16 GPIO_ACTIVE_LOW>; -+ -+ alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; -+ }; -+}; -+ -+&pinctrl { -+ pmx_led_power: pmx-leds { -+ marvell,pins = "mpp0"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_power_hdd: pmx-power-hdd { -+ marvell,pins = "mpp1"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_led_alarm: pmx-leds { -+ marvell,pins = "mpp2"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_led_info: pmx-leds { -+ marvell,pins = "mpp3"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_fan_lock: pmx-fan-lock { -+ marvell,pins = "mpp6"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_power_switch: pmx-power-switch { -+ marvell,pins = "mpp8", "mpp10", "mpp15"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_power_usb: pmx-power-usb { -+ marvell,pins = "mpp9"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_fan_high: pmx-fan-high { -+ marvell,pins = "mpp14"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_fan_low: pmx-fan-low { -+ marvell,pins = "mpp16"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_led_func: pmx-leds { -+ marvell,pins = "mpp17"; -+ marvell,function = "gpio"; -+ }; -+ -+ pmx_sw_init: pmx-sw-init { -+ marvell,pins = "mpp7"; -+ marvell,function = "gpio"; -+ }; -+}; -+ -+&hdd_power { -+ gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; -+}; -+ -+&usb_power { -+ gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; -+}; -+ -diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-lschl.dts -deleted file mode 100644 -index ea6c881634b9..000000000000 ---- a/arch/arm/boot/dts/orion5x-lschl.dts -+++ /dev/null -@@ -1,171 +0,0 @@ --/* -- * Device Tree file for Buffalo Linkstation LS-CHLv3 -- * -- * Copyright (C) 2016 Ash Hughes -- * Copyright (C) 2015-2017 -- * Roger Shimizu -- * -- * This file is dual-licensed: you can use it either under the terms -- * of the GPL or the X11 license, at your option. Note that this dual -- * licensing only applies to this file, and not this project as a -- * whole. -- * -- * a) This file is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of the -- * License, or (at your option) any later version. -- * -- * This file is distributed in the hope that it will be useful -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * Or, alternatively -- * -- * b) Permission is hereby granted, free of charge, to any person -- * obtaining a copy of this software and associated documentation -- * files (the "Software"), to deal in the Software without -- * restriction, including without limitation the rights to use -- * copy, modify, merge, publish, distribute, sublicense, and/or -- * sell copies of the Software, and to permit persons to whom the -- * Software is furnished to do so, subject to the following -- * conditions: -- * -- * The above copyright notice and this permission notice shall be -- * included in all copies or substantial portions of the Software. -- * -- * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -- * OTHER DEALINGS IN THE SOFTWARE. -- */ -- --/dts-v1/; -- --#include "orion5x-linkstation.dtsi" --#include "mvebu-linkstation-gpio-simple.dtsi" --#include "mvebu-linkstation-fan.dtsi" --#include -- --/ { -- model = "Buffalo Linkstation LiveV3 (LS-CHL)"; -- compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x"; -- -- memory { /* 128 MB */ -- device_type = "memory"; -- reg = <0x00000000 0x8000000>; -- }; -- -- gpio_keys { -- func { -- label = "Function Button"; -- linux,code = ; -- gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; -- }; -- -- power-on-switch { -- gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; -- }; -- -- power-auto-switch { -- gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; -- }; -- }; -- -- gpio_leds { -- pinctrl-0 = <&pmx_led_power &pmx_led_alarm &pmx_led_info &pmx_led_func>; -- blue-power-led { -- gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; -- }; -- -- red-alarm-led { -- gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; -- }; -- -- amber-info-led { -- gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; -- }; -- -- func { -- label = "lschl:func:blue:top"; -- gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; -- }; -- }; -- -- gpio_fan { -- gpios = <&gpio0 14 GPIO_ACTIVE_LOW -- &gpio0 16 GPIO_ACTIVE_LOW>; -- -- alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; -- }; --}; -- --&pinctrl { -- pmx_led_power: pmx-leds { -- marvell,pins = "mpp0"; -- marvell,function = "gpio"; -- }; -- -- pmx_power_hdd: pmx-power-hdd { -- marvell,pins = "mpp1"; -- marvell,function = "gpio"; -- }; -- -- pmx_led_alarm: pmx-leds { -- marvell,pins = "mpp2"; -- marvell,function = "gpio"; -- }; -- -- pmx_led_info: pmx-leds { -- marvell,pins = "mpp3"; -- marvell,function = "gpio"; -- }; -- -- pmx_fan_lock: pmx-fan-lock { -- marvell,pins = "mpp6"; -- marvell,function = "gpio"; -- }; -- -- pmx_power_switch: pmx-power-switch { -- marvell,pins = "mpp8", "mpp10", "mpp15"; -- marvell,function = "gpio"; -- }; -- -- pmx_power_usb: pmx-power-usb { -- marvell,pins = "mpp9"; -- marvell,function = "gpio"; -- }; -- -- pmx_fan_high: pmx-fan-high { -- marvell,pins = "mpp14"; -- marvell,function = "gpio"; -- }; -- -- pmx_fan_low: pmx-fan-low { -- marvell,pins = "mpp16"; -- marvell,function = "gpio"; -- }; -- -- pmx_led_func: pmx-leds { -- marvell,pins = "mpp17"; -- marvell,function = "gpio"; -- }; -- -- pmx_sw_init: pmx-sw-init { -- marvell,pins = "mpp7"; -- marvell,function = "gpio"; -- }; --}; -- --&hdd_power { -- gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; --}; -- --&usb_power { -- gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; --}; -- diff --git a/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch b/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch deleted file mode 100644 index f9be9407a..000000000 --- a/debian/patches/features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Arnd Bergmann -Date: Thu, 2 Feb 2017 12:38:33 +0100 -Subject: [PATCH] ARM: orion5x: fix Makefile for linkstation-lschl.dtb -Origin: https://git.kernel.org/linus/1a902f6b70c55171ca2419d946b85274e35c9757 - -The rename of orion5x-lschl.dts needs to be reflected in the Makefile: - -make[3]: *** No rule to make target 'arch/arm/boot/dts/orion5x-lschl.dtb', needed by '__build'. - -Fixes: 6cfd3cd8d836 ("ARM: dts: orion5x-lschl: More consistent naming on linkstation series") -Signed-off-by: Arnd Bergmann -Signed-off-by: Gregory CLEMENT ---- - arch/arm/boot/dts/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index cccdbcb557b6..20fe4a54ee5e 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -616,7 +616,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ - orion5x-lacie-ethernet-disk-mini-v2.dtb \ - orion5x-linkstation-lsgl.dtb \ - orion5x-linkstation-lswtgl.dtb \ -- orion5x-lschl.dtb \ -+ orion5x-linkstation-lschl.dtb \ - orion5x-lswsgl.dtb \ - orion5x-maxtor-shared-storage-2.dtb \ - orion5x-netgear-wnr854t.dtb \ diff --git a/debian/patches/features/arm64/dts-meson-gx-add-firmware-reserved-memory-zone.patch b/debian/patches/features/arm64/dts-meson-gx-add-firmware-reserved-memory-zone.patch deleted file mode 100644 index 4da941f7f..000000000 --- a/debian/patches/features/arm64/dts-meson-gx-add-firmware-reserved-memory-zone.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Neil Armstrong -Date: Wed, 18 Jan 2017 17:50:45 +0100 -Subject: ARM64: dts: meson-gx: Add firmware reserved memory zones -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Origin: https://git.kernel.org/cgit/linux/kernel/git/khilman/linux-amlogic.git/commit?id=ecb88f3001ed9ee8c53450d971de8c18bcbf7925 -Bug-Debian: https://bugs.debian.org/852132 - -The Amlogic Meson GXBB/GXL/GXM secure monitor uses part of the memory space, -this patch adds these reserved zones. - -Without such reserved memory zones, running the following stress command : -$ stress-ng --vm 16 --vm-bytes 128M --timeout 10s -multiple times: - -Could lead to the following kernel crashes : -[ 46.937975] Bad mode in Error handler detected on CPU1, code 0xbf000000 -- SError -... -[ 47.058536] Internal error: Attempting to execute userspace memory: 8600000f [#3] PREEMPT SMP -... -Instead of the OOM killer. - -Fixes: 4f24eda8401f ("ARM64: dts: Prepare configs for Amlogic Meson GXBaby") -Signed-off-by: Neil Armstrong -Reviewed-by: Andreas Färber -[khilman: added Fixes tag, added _reserved and unit addresses] -Signed-off-by: Kevin Hilman ---- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index eada0b58ba1c..0cbe24b49710 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -55,6 +55,24 @@ - #address-cells = <2>; - #size-cells = <2>; - -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* 16 MiB reserved for Hardware ROM Firmware */ -+ hwrom_reserved: hwrom@0 { -+ reg = <0x0 0x0 0x0 0x1000000>; -+ no-map; -+ }; -+ -+ /* 2 MiB reserved for ARM Trusted Firmware (BL31) */ -+ secmon_reserved: secmon@10000000 { -+ reg = <0x0 0x10000000 0x0 0x200000>; -+ no-map; -+ }; -+ }; -+ - cpus { - #address-cells = <0x2>; - #size-cells = <0x0>; diff --git a/debian/patches/series b/debian/patches/series index 0cebdadab..198eb9d5f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -59,10 +59,6 @@ features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch features/x86/x86-memtest-WARN-if-bad-RAM-found.patch features/x86/x86-make-x32-syscall-support-conditional.patch features/arm/arm-dts-turris-omnia-add-support-for-ethernet-switch.patch -features/arm64/dts-meson-gx-add-firmware-reserved-memory-zone.patch -features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch -features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch -features/arm/ARM-orion5x-fix-Makefile-for-linkstation-lschl.dtb.patch # Miscellaneous bug fixes bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch @@ -70,7 +66,6 @@ bugfix/all/disable-some-marvell-phys.patch bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch bugfix/all/kbuild-do-not-use-hyphen-in-exported-variable-name.patch bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch -bugfix/all/pegasus-use-heap-buffers-for-all-register-access.patch bugfix/all/media-dvb-usb-dibusb-mc-common-add-module_license.patch # Miscellaneous features @@ -101,8 +96,6 @@ features/all/securelevel/arm64-add-kernel-config-option-to-set-securelevel-wh.pa # Security fixes debian/i386-686-pae-pci-set-pci-nobios-by-default.patch -bugfix/all/ipv4-keep-skb-dst-around-in-presence-of-IP-options.patch -bugfix/all/sctp-avoid-BUG_ON-on-sctp_wait_for_sndbuf.patch # Fix exported symbol versions bugfix/ia64/revert-ia64-move-exports-to-definitions.patch