Messages in this thread | | | Date | Fri, 2 Aug 2013 08:28:51 +0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the net-next tree |
| |
On Thu, Aug 01, 2013 at 03:21:48PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > net/core/net-sysfs.c between commit ff80e519ab1b ("net: export physical > port id via sysfs") from the net-next tree and commit 6be8aeef348a ("net: > core: convert class code to use dev_groups") from the driver-core 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
| |