linux-kernel - Re: linux-next: build failure after merge of the tty tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20170207073823.638e2e67@canb.auug.org.au>
Date:   Tue, 7 Feb 2017 07:38:23 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>
Cc:     Rob Herring <robh@...nel.org>,
        linux-next <linux-next@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Sebastian Reichel <sre@...nel.org>
Subject: Re: linux-next: build failure after merge of the tty tree

Hi Greg,

On Mon, 6 Feb 2017 16:18:22 +0100 Greg KH <greg@...ah.com> wrote:
>
> On Mon, Feb 06, 2017 at 08:09:16AM -0600, Rob Herring wrote:
> > 
> > It didn't, but we happened to already have a fix queued up for 4.11.
> > The fix is in your usb-next branch:
> > 
> > commit 7a3b7cd332db08546f3cdd984f11773e0d1999e7
> > Author: Stephen Boyd <stephen.boyd@...aro.org>
> > Date:   Wed Dec 28 14:56:48 2016 -0800
> > 
> >     of: device: Export of_device_{get_modalias, uvent_modalias} to modules
> > 
> >     The ULPI bus can be built as a module, and it will soon be
> >     calling these functions when it supports probing devices from DT.
> >     Export them so they can be used by the ULPI module.
> > 
> >     Acked-by: Rob Herring <robh@...nel.org>
> >     Cc: <devicetree@...r.kernel.org>
> >     Signed-off-by: Stephen Boyd <stephen.boyd@...aro.org>
> >     Signed-off-by: Peter Chen <peter.chen@....com>  
> 
> Ah, so the if this is pulled into linux-next at the same time, then
> there's no build error.
> 
> Stephen, do you need/want me to cherry-pick this into the tty branch, or
> is it ok as-is?

I will change things so that I merge the usb tree before the tty tree.
Please remember to tell Linus that they need to be merged in that order.

-- 
Cheers,
Stephen Rothwell