Re: linux-next: manual merge of the usb tree with the tip tree

2016-03-08 Thread Greg KH
On Wed, Mar 09, 2016 at 01:35:15PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got a conflict in: > > Documentation/kernel-parameters.txt > > between commit: > > d2aa1acad22f ("mm/init: Add 'rodata=off' boot cmdline parameter to disable > read-only

linux-next: manual merge of the usb tree with the tip tree

2016-03-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the usb tree got a conflict in: Documentation/kernel-parameters.txt between commit: d2aa1acad22f ("mm/init: Add 'rodata=off' boot cmdline parameter to disable read-only kernel mappings") from the tip tree and commit: 605df8af33a7 ("phy: rockchip-usb:

Re: linux-next: manual merge of the usb tree with the tip tree

2014-03-17 Thread Greg KH
On Mon, Mar 17, 2014 at 06:31:26PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > arch/arm/mach-shmobile/Kconfig between commit aeb8fb7910fc ("ARM: > shmobile: Remove CMT, TMU and STI Kconfig entries") from the tip tree and > commit f6723

Re: linux-next: manual merge of the usb tree with the tip tree

2014-03-17 Thread Greg KH
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:

linux-next: manual merge of the usb tree with the tip tree

2014-03-17 Thread Stephen Rothwell
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 b

linux-next: manual merge of the usb tree with the tip tree

2014-03-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in arch/arm/mach-shmobile/Kconfig between commit aeb8fb7910fc ("ARM: shmobile: Remove CMT, TMU and STI Kconfig entries") from the tip tree and commit f6723b569a67 ("usb: host: remove selects of USB_ARCH_HAS_?HCI") from the usb tree.