Messages in this thread | | | Date | Tue, 22 Jan 2013 20:42:36 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with Linus' tree |
| |
On Wed, Jan 23, 2013 at 03:15:52PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu: > Don't free chip label memory") from Linus' tree and commit 641d03422a59 > ("gpio: Convert to devm_ioremap_resource()") 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
| |