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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 702 bytes --]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
("printk: Enable the use of more than one CON_BOOT (early console)") from
the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
printk: early_printk,console: Allow more than one early console") from
the usb tree.

I assume that these are trying to do (more or less) the same thing.  I
have dropped the one from the usb tree for today.  Please sort this out -
at least remove the usb tree one until you have done so, thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

[Greg KH]

On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
> ("printk: Enable the use of more than one CON_BOOT (early console)") from
> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
> printk: early_printk,console: Allow more than one early console") from
> the usb tree.
> 
> I assume that these are trying to do (more or less) the same thing.  I
> have dropped the one from the usb tree for today.  Please sort this out -
> at least remove the usb tree one until you have done so, thanks.

Jason, any thoughts?  I'm going to drop your printk stuff from my tree
now, care to sort it out and resend your whole series?

thanks,

greg k-h

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

[Jason Wessel]

Greg KH wrote:
> On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
>   
>> Hi Greg,
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
>> ("printk: Enable the use of more than one CON_BOOT (early console)") from
>> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
>> printk: early_printk,console: Allow more than one early console") from
>> the usb tree.
>>
>> I assume that these are trying to do (more or less) the same thing.  I
>> have dropped the one from the usb tree for today.  Please sort this out -
>> at least remove the usb tree one until you have done so, thanks.
>>     
>
> Jason, any thoughts?  I'm going to drop your printk stuff from my tree
> now, care to sort it out and resend your whole series?
>
>   

I will investigate, re-test and send a new series to Greg KH later in
the week.  The preliminary result shows the problem is a result of a
clash with two different patches in the tip tree.   My patch set and the
two patches it collides with context wise fix different things.

In order to resolve this it appears that the series will need to get
split into something for the tip tree and something for the USB tree, or
we wait for the next pull of the tip branch into the Linus's tree.

Thanks,
Jason.

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

[Greg KH]

On Wed, Aug 19, 2009 at 09:37:03PM -0500, Jason Wessel wrote:
> Greg KH wrote:
> > On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
> >   
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the usb tree got a conflict in
> >> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
> >> ("printk: Enable the use of more than one CON_BOOT (early console)") from
> >> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
> >> printk: early_printk,console: Allow more than one early console") from
> >> the usb tree.
> >>
> >> I assume that these are trying to do (more or less) the same thing.  I
> >> have dropped the one from the usb tree for today.  Please sort this out -
> >> at least remove the usb tree one until you have done so, thanks.
> >>     
> >
> > Jason, any thoughts?  I'm going to drop your printk stuff from my tree
> > now, care to sort it out and resend your whole series?
> >
> >   
> 
> I will investigate, re-test and send a new series to Greg KH later in
> the week.  The preliminary result shows the problem is a result of a
> clash with two different patches in the tip tree.   My patch set and the
> two patches it collides with context wise fix different things.
> 
> In order to resolve this it appears that the series will need to get
> split into something for the tip tree and something for the USB tree, or
> we wait for the next pull of the tip branch into the Linus's tree.

Hm, I'd prefer to get this in before that :)

Let me know what you find.  If there are conflicts, we can work it out.

thanks,

greg k-h

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

[Peter Zijlstra]

On Wed, 2009-08-19 at 19:48 -0700, Greg KH wrote:
> On Wed, Aug 19, 2009 at 09:37:03PM -0500, Jason Wessel wrote:
> > Greg KH wrote:
> > > On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
> > >   
> > >> Hi Greg,
> > >>
> > >> Today's linux-next merge of the usb tree got a conflict in
> > >> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
> > >> ("printk: Enable the use of more than one CON_BOOT (early console)") from
> > >> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
> > >> printk: early_printk,console: Allow more than one early console") from
> > >> the usb tree.
> > >>
> > >> I assume that these are trying to do (more or less) the same thing.  I
> > >> have dropped the one from the usb tree for today.  Please sort this out -
> > >> at least remove the usb tree one until you have done so, thanks.
> > >>     
> > >
> > > Jason, any thoughts?  I'm going to drop your printk stuff from my tree
> > > now, care to sort it out and resend your whole series?
> > >
> > >   
> > 
> > I will investigate, re-test and send a new series to Greg KH later in
> > the week.  The preliminary result shows the problem is a result of a
> > clash with two different patches in the tip tree.   My patch set and the
> > two patches it collides with context wise fix different things.
> > 
> > In order to resolve this it appears that the series will need to get
> > split into something for the tip tree and something for the USB tree, or
> > we wait for the next pull of the tip branch into the Linus's tree.
> 
> Hm, I'd prefer to get this in before that :)
> 
> Let me know what you find.  If there are conflicts, we can work it out.

Maybe Robin can help out, since he authored one of the conflicting
patches? 

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

[Ingo Molnar]

* Jason Wessel <jason.wessel@windriver.com> wrote:

> Greg KH wrote:
> > On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
> >   
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the usb tree got a conflict in
> >> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
> >> ("printk: Enable the use of more than one CON_BOOT (early console)") from
> >> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
> >> printk: early_printk,console: Allow more than one early console") from
> >> the usb tree.
> >>
> >> I assume that these are trying to do (more or less) the same thing.  I
> >> have dropped the one from the usb tree for today.  Please sort this out -
> >> at least remove the usb tree one until you have done so, thanks.
> >>     
> >
> > Jason, any thoughts?  I'm going to drop your printk stuff from my tree
> > now, care to sort it out and resend your whole series?
> >
> >   
> 
> I will investigate, re-test and send a new series to 
> Greg KH later in the week.  The preliminary result 
> shows the problem is a result of a clash with two 
> different patches in the tip tree.  My patch set and 
> the two patches it collides with context wise fix 
> different things.
> 
> In order to resolve this it appears that the series 
> will need to get split into something for the tip tree 
> and something for the USB tree, or we wait for the next 
> pull of the tip branch into the Linus's tree.

The printk bits are neatly separated out in the -tip 
tree, in a standalone tree, tip:core/printk:

 earth4:~/tip> gll linus..core/printk
 42c2c8c: printk: Fix "printk: Enable the use of more than one CON_BOOT (early console)"
 1aaad49: printk: Restore previous console_loglevel when re-enabling logging
 8259cf4: printk: Ensure that "console enabled" messages are printed on the console
 4d09161: printk: Enable the use of more than one CON_BOOT (early console)

So we can base on that and extend it with your bits, and 
Greg could pull this into the USB tree as well he he 
wants to (this tree is focused to this single topic and 
is non-rebasing).

The git coordinates are:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core/printk

Please Cc: new printk/console bits to Linus and Andrew as 
well.

Thanks,

	Ingo

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

[Jason Wessel]

Peter Zijlstra wrote:
> On Wed, 2009-08-19 at 19:48 -0700, Greg KH wrote:
>   
>> On Wed, Aug 19, 2009 at 09:37:03PM -0500, Jason Wessel wrote:
>>     
>>> Greg KH wrote:
>>>       
>>>> On Wed, Aug 19, 2009 at 05:59:01PM +1000, Stephen Rothwell wrote:
>>>>   
>>>>         
>>>>> Hi Greg,
>>>>>
>>>>> Today's linux-next merge of the usb tree got a conflict in
>>>>> kernel/printk.c between commit 4d09161196c9a836eacea4b36e2f217bc34894cf
>>>>> ("printk: Enable the use of more than one CON_BOOT (early console)") from
>>>>> the tip tree and commit e289e7dc72eb6bfce70e2722d97a00f5e02893e8 ("USB:
>>>>> printk: early_printk,console: Allow more than one early console") from
>>>>> the usb tree.
>>>>>
>>>>> I assume that these are trying to do (more or less) the same thing.  I
>>>>> have dropped the one from the usb tree for today.  Please sort this out -
>>>>> at least remove the usb tree one until you have done so, thanks.
>>>>>     
>>>>>           
>>>> Jason, any thoughts?  I'm going to drop your printk stuff from my tree
>>>> now, care to sort it out and resend your whole series?
>>>>
>>>>   
>>>>         
>>> I will investigate, re-test and send a new series to Greg KH later in
>>> the week.  The preliminary result shows the problem is a result of a
>>> clash with two different patches in the tip tree.   My patch set and the
>>> two patches it collides with context wise fix different things.
>>>
>>> In order to resolve this it appears that the series will need to get
>>> split into something for the tip tree and something for the USB tree, or
>>> we wait for the next pull of the tip branch into the Linus's tree.
>>>       
>> Hm, I'd prefer to get this in before that :)
>>
>> Let me know what you find.  If there are conflicts, we can work it out.
>>     
>
> Maybe Robin can help out, since he authored one of the conflicting
> patches? 
>   


No need.  I have adjusted the context and removed the sections which
stepped on each other.

I'll post a new usb dbgp patch series off to Greg KH shortly.  Now that
nothing collides we can leave the USB dbgp / early_printk patch series
in the usb branch.  The new series touches nothing in the kernel core,
and only files in the usb tree.

The only file in the x86 tree which is touched is
drivers/usb/early/ehci-dbgp.c and it is for 2 reasons.

1) Remove the limit of 1 on earlyprintk devices
2) Move the usb dbgp device out of the this tree and into the usb early
driver area

Thanks,
Jason.

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]

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.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/Kconfig
index 9f68d2aa2a12,a06590237209..000000000000
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -107,9 -102,6 +107,7 @@@ config ARCH_R8A777
  	select CPU_V7
  	select SH_CLK_CPG
  	select ARM_GIC
- 	select USB_ARCH_HAS_EHCI
- 	select USB_ARCH_HAS_OHCI
 +	select SYS_SUPPORTS_SH_TMU
  
  config ARCH_R8A7779
  	bool "R-Car H1 (R8A77790)"
@@@ -117,10 -109,7 +115,8 @@@
  	select ARM_GIC
  	select CPU_V7
  	select SH_CLK_CPG
- 	select USB_ARCH_HAS_EHCI
- 	select USB_ARCH_HAS_OHCI
  	select RENESAS_INTC_IRQPIN
 +	select SYS_SUPPORTS_SH_TMU
  
  config ARCH_R8A7790
  	bool "R-Car H2 (R8A77900)"

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]

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).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/sh/Kconfig
index dfb1fbf38e44,64455daa63a1..000000000000
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -346,9 -354,8 +346,8 @@@ config CPU_SUBTYPE_SH772
  	bool "Support SH7720 processor"
  	select CPU_SH3
  	select CPU_HAS_DSP
 -	select SYS_SUPPORTS_CMT
 +	select SYS_SUPPORTS_SH_CMT
  	select ARCH_WANT_OPTIONAL_GPIOLIB
- 	select USB_ARCH_HAS_OHCI
  	select USB_OHCI_SH if USB_OHCI_HCD
  	select PINCTRL
  	help
@@@ -358,8 -365,7 +357,7 @@@ config CPU_SUBTYPE_SH772
  	bool "Support SH7721 processor"
  	select CPU_SH3
  	select CPU_HAS_DSP
 -	select SYS_SUPPORTS_CMT
 +	select SYS_SUPPORTS_SH_CMT
- 	select USB_ARCH_HAS_OHCI
  	select USB_OHCI_SH if USB_OHCI_HCD
  	help
  	  Select SH7721 if you have a SH3-DSP SH7721 CPU.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[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: 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

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

[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 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

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

[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: add handler for usb-uart functionality")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/kernel-parameters.txt
index 1bf357083cef,8a6c6c02f916..000000000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -3517,10 -3491,12 +3517,16 @@@ bytes respectively. Such letter suffixe
  
  	ro		[KNL] Mount root device read-only on boot
  
+ 	rockchip.usb_uart
+ 			Enable the uart passthrough on the designated usb port
+ 			on Rockchip SoCs. When active, the signals of the
+ 			debug-uart get routed to the D+ and D- pins of the usb
+ 			port and the regular usb controller gets disabled.
+ 
 +	rodata=		[KNL]
 +		on	Mark read-only kernel memory as read-only (default).
 +		off	Leave read-only kernel memory writable for debugging.
 +
  	root=		[KNL] Root filesystem
  			See name_to_dev_t comment in init/do_mounts.c.
  

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

[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 kernel mappings")
> 
> from the tip tree and commit:
> 
>   605df8af33a7 ("phy: rockchip-usb: add handler for usb-uart functionality")
> 
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc Documentation/kernel-parameters.txt
> index 1bf357083cef,8a6c6c02f916..000000000000
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@@ -3517,10 -3491,12 +3517,16 @@@ bytes respectively. Such letter suffixe
>   
>   	ro		[KNL] Mount root device read-only on boot
>   
> + 	rockchip.usb_uart
> + 			Enable the uart passthrough on the designated usb port
> + 			on Rockchip SoCs. When active, the signals of the
> + 			debug-uart get routed to the D+ and D- pins of the usb
> + 			port and the regular usb controller gets disabled.
> + 
>  +	rodata=		[KNL]
>  +		on	Mark read-only kernel memory as read-only (default).
>  +		off	Leave read-only kernel memory writable for debugging.
>  +
>   	root=		[KNL] Root filesystem
>   			See name_to_dev_t comment in init/do_mounts.c.
>   


Looks good, thanks.

greg k-h