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
| ||
|
Date: Mon, 20 Dec 2010 10:38:58 +0900 From: Paul Mundt <lethal@...ux-sh.org> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Magnus Damm <damm@...nsource.se> Subject: Re: linux-next: manual merge of the rmobile tree with the rmobile-current tree On Mon, Dec 20, 2010 at 12:33:29PM +1100, Stephen Rothwell wrote: > Hi Paul, > > Today's linux-next merge of the rmobile tree got a conflict in > arch/arm/mach-shmobile/include/mach/entry-macro.S between commit > 1cf215a5b43950d1a304373037828158057ff9fc ("ARM: mach-shmobile: INTC > interrupt priority level demux fix") from the rmobile-current tree and > commits 6d9598e24d50a8c72f48a3864327484a30aaee44 ("ARM: mach-shmobile: > Initial AG5 and AG5EVM support") and > 45bbaae0dcddc275594e23f108cb68869eae7433 ("ARM: mach-shmobile: Split out > entry-macros in to GIC and INTC variants") from the rmobile tree. > > I just used the version from the rmobile tree and will leave any fixup to > you. Ah, I forgot about that. I'll take care of it today, thanks. -- 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