Messages in this thread | | | Date | Mon, 17 Mar 2014 11:30:43 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the tip tree |
| |
On Mon, Mar 17, 2014 at 06:34:19PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > arch/sh/Kconfig between commit fbfa893458ed ("sh: Remove Kconfig entries > for TMU, CMT and MTU2") from the tip tree and commit f6723b569a67 ("usb: > host: remove selects of USB_ARCH_HAS_?HCI") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good, thanks.
greg k-h
| |