| 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
| ||
|
Message-ID: <CACJDEmrV4uqLQ5wPGTQ7vHRAo3hHXDdWrTB5h65hfF+B9rJCgQ@mail.gmail.com> Date: Tue, 2 Oct 2012 14:51:19 -0400 From: Konrad Rzeszutek Wilk <konrad@...nel.org> To: Stefano Stabellini <stefano.stabellini@...citrix.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, xen-devel@...ts.xensource.com, Stephen Rothwell <sfr@...b.auug.org.au>, linux-next@...r.kernel.org Subject: Re: [PATCH] xen: resolve merge conflict with 617276307cd4cdb9a95c77efaa3063695af63aa7 On Tue, Oct 2, 2012 at 1:29 PM, Stefano Stabellini <stefano.stabellini@...citrix.com> wrote: > The Xen tree tries to add a line to > arch/arm/mach-vexpress/Makefile.boot that has been removed by the > following commit in Linus' master: > > commit 617276307cd4cdb9a95c77efaa3063695af63aa7 > Author: Rob Herring <rob.herring@...xeda.com> > Date: Thu Sep 6 13:43:04 2012 -0500 > > ARM: vexpress: convert to multi-platform > > In fact the dts Makefile is now arch/arm/boot/dts/Makefile, as per > commit 9cd11c0c47b8690b47e7573311ce5c483cb344ed. > > > This is the merge resolution patch. > > Signed-off-by: Stefano Stabellini <stefano.stabellini@...citrix.com> Great. Thanks for posting it! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists