Re: [GIT PULL] TTY/Serial patches for 4.3-rc1

[Stephen Rothwell]

Hi Linus,

On Fri, 21 Aug 2015 09:57:33 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Thu, 20 Aug 2015 12:11:21 -0700 Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > All have been in linux-next with no reported issues.
> 
> Except see below.
> 
> > Eduardo Valentin (4):
> >       serial: imx: introduce serial_imx_enable_wakeup()
> 
> I reported that this commit breaks the arm multi_v7_defconfig build and
> I have seen no fix applied.
> 
> I have been applying the following patch for a few days but do not know
> if it is the correct resolution:

Just a reminder that if you pull in Greg's tty tree before he returns
from whereever he is, it need the patch below to fix the build.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 18 Aug 2015 15:56:40 +1000
Subject: [PATCH] serial: imx: partial revert of "introduce serial_imx_enable_wakeup()"

This reverts the part of commit 189550b8644e that affects
arch/arm/boot/dts/Makefile

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/arm/boot/dts/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d3ee1f01ffc7..233159d2eaab 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -330,7 +330,6 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
 	imx6q-wandboard-revb1.dtb
 dtb-$(CONFIG_SOC_IMX6SL) += \
 	imx6sl-evk.dtb \
-	imx6sl-fox-p1.dtb \
 	imx6sl-warp.dtb
 dtb-$(CONFIG_SOC_IMX6SX) += \
 	imx6sx-sabreauto.dtb \
-- 
2.5.0

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/