linux-kernel - Re: linux-next: manual merge of the xen-tip tree with the pm 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]

Date:	Tue, 12 Jul 2016 16:31:49 +0100 (BST)
From:	Stefano Stabellini <sstabellini@...nel.org>
To:	"Rafael J. Wysocki" <rjw@...ysocki.net>
cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Jeremy Fitzhardinge <jeremy@...p.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Stefano Stabellini <sstabellini@...nel.org>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Octavian Purdila <octavian.purdila@...el.com>,
	Shannon Zhao <shannon.zhao@...aro.org>
Subject: Re: linux-next: manual merge of the xen-tip tree with the pm tree

On Tue, 12 Jul 2016, Rafael J. Wysocki wrote:
> On Tuesday, July 12, 2016 02:09:26 PM Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the xen-tip tree got a conflict in:
> > 
> >   drivers/acpi/scan.c
> > 
> > between commit:
> > 
> >   68bdb6773289 ("ACPI: add support for ACPI reconfiguration notifiers")
> > 
> > from the pm tree and commit:
> > 
> >   c8ac8b6fb495 ("Xen: ACPI: Hide UART used by Xen")
> > 
> > from the xen-tip tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> Looks good to me, thanks Stehpen!
 
Looks good to me too.

Cheers,

Stefano