Messages in this thread | | | Date | Mon, 23 Apr 2012 09:38:49 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the usb tree |
| |
On Mon, Apr 23, 2012 at 03:11:46PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3 > ("USB: dt9812.c: remove err() usage") from the usb tree and commit > 73e2918990c0 ("staging: Fix typo in multiple files") from the staging > tree. > > The former supercedes the latter, so I used that.
Thanks, that sounds correct.
greg k-h
| |