Messages in this thread | | | Date | Wed, 28 Nov 2012 21:20:41 -0800 | From | Greg KH <> | 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
| |