Messages in this thread |  | | | Date | Fri, 9 Mar 2012 07:18:57 -0800 | | From | Greg KH <> | | Subject | Re: linux-next: manual merge of the driver-core tree with the powerpc tree |
| |
On Fri, Mar 09, 2012 at 04:40:25PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/base/driver.c between commit fcd6f7620202 ("driver-core: remove > legacy iSeries hack") from the powerpc tree and commit 9875bb480cc8 > ("Eliminate get_driver() and put_driver()") from the driver-core tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks good to me, thanks for doing this.
greg k-h
|  |