From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751870AbbHVFow (ORCPT ); Sat, 22 Aug 2015 01:44:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:51940 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341AbbHVFol (ORCPT ); Sat, 22 Aug 2015 01:44:41 -0400 Date: Fri, 21 Aug 2015 22:44:34 -0700 From: Greg KH To: Stephen Rothwell Cc: Linus Torvalds , Jiri Slaby , Andrew Morton , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Eduardo Valentin Subject: Re: [GIT PULL] TTY/Serial patches for 4.3-rc1 Message-ID: <20150822054434.GA6245@kroah.com> References: <20150820191121.GA24594@kroah.com> <20150821095733.479a51aa@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150821095733.479a51aa@canb.auug.org.au> User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 21, 2015 at 09:57:33AM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Thu, 20 Aug 2015 12:11:21 -0700 Greg KH 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: > > From: Stephen Rothwell > 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 > --- > 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 Ugh, you are right, sorry about that. I can't add it to my tree at the moment, but can do so in a few weeks... greg k-h