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: Wed, 28 Nov 2012 21:20:41 -0800 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Davide Ciminaghi <ciminaghi@...dd.com>, Samuel Ortiz <sameo@...ux.intel.com>, Bill Pemberton <wfp5p@...ginia.edu> Subject: Re: linux-next: manual merge of the driver-core tree with the mfd tree On Thu, Nov 29, 2012 at 02:57:14PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/mfd/sta2x11-mfd.c between various commits from the mfd tree and > commits f791be492f76 ("mfd: remove use of __devinit"), a9e9ce4c4167 > ("mfd: remove use of __devinitdata") and a73e5df16b52 ("mfd: remove use > of __devinitconst") from the driver-core tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good, 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