Messages in this thread | | | Date | Tue, 18 Jun 2013 09:03:33 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the usb tree |
| |
On Tue, Jun 18, 2013 at 02:55:59PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/serqt_usb2/serqt_usb2.c between commit 1143832eca8f > ("USB: serial: ports: add minor and port number") from the usb tree and > commit d68edc2881b1 ("staging: serqt_usb2: Fixed coding style > CamelCases") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Fix looks fine, thanks.
greg k-h
| |