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, 3 Dec 2012 10:25:45 -0800 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>, linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Joe Perches <joe@...ches.com>, Vinod Koul <vinod.koul@...ux.intel.com>, Bill Pemberton <wfp5p@...ginia.edu>, Thomas Petazzoni <thomas.petazzoni@...e-electrons.com> Subject: Re: linux-next: manual merge of the arm-soc tree with the slave_dma and tree On Mon, Dec 03, 2012 at 05:12:32PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > drivers/dma/mv_xor.c between commit d51e88b99533 ("dma: Convert dev_printk > (KERN_<LEVEL> to dev_<level>(") from the slave-dma tree, commits > a7d6e3ec28bb ("dma: remove use of __devexit_p") and 463a1f8b3cee ("dma: > remove use of __devinit") from the driver-core tree and various commits > from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good to me, thanks. greg k-h -- 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