Messages in this thread | | | Date | Tue, 24 Apr 2012 07:45:04 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the usb tree |
| |
On Tue, Apr 24, 2012 at 02:48:20PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/line6/driver.c between commit 2b8dec323d34 ("USB: > driver.c: remove err() usage") from the usb tree and commit c46b8a6567fb > ("Staging: line6: only allocate a buffer if it is needed") (and later) > from the staging tree. > > The latter supercedes the former, so I used that.
Thanks, that is correct.
greg k-h
| |