* linux-next: manual merge of the usb.current tree
@ 2008-08-08 1:26 Stephen Rothwell
2008-08-08 4:33 ` Greg KH
2008-08-13 0:53 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2008-08-08 1:26 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Dmitry Baryshkov, Russell King
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
Hi Greg,
Today's linux-next merge of the usb.current tree got a conflict in
drivers/usb/gadget/omap_udc.c between commit
a09e64fbc0094e3073dbb09c3b4bfe4ab669244b ("[ARM] Move
include/asm-arm/arch-* to arch/arm/*/include/mach") from the arm-current
tree and commit b7eff3b991784964df1e7eeffd944032ccc3e11f ("USB: omap_udc:
fix compilation with debug enabled") from the usb.current tree.
Some of the arm header files have moved. I think I fixed it up right (I
changed asm/arch/control.h to mach/control.h) and will carry the fix
while necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the usb.current tree
2008-08-08 1:26 linux-next: manual merge of the usb.current tree Stephen Rothwell
@ 2008-08-08 4:33 ` Greg KH
2008-08-13 0:53 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2008-08-08 4:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Dmitry Baryshkov, Russell King
On Fri, Aug 08, 2008 at 11:26:46AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb.current tree got a conflict in
> drivers/usb/gadget/omap_udc.c between commit
> a09e64fbc0094e3073dbb09c3b4bfe4ab669244b ("[ARM] Move
> include/asm-arm/arch-* to arch/arm/*/include/mach") from the arm-current
> tree and commit b7eff3b991784964df1e7eeffd944032ccc3e11f ("USB: omap_udc:
> fix compilation with debug enabled") from the usb.current tree.
>
> Some of the arm header files have moved. I think I fixed it up right (I
> changed asm/arch/control.h to mach/control.h) and will carry the fix
> while necessary.
Thanks for the warning.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the usb.current tree
2008-08-08 1:26 linux-next: manual merge of the usb.current tree Stephen Rothwell
2008-08-08 4:33 ` Greg KH
@ 2008-08-13 0:53 ` Stephen Rothwell
2008-08-13 3:59 ` Greg KH
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2008-08-13 0:53 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, Dmitry Baryshkov, Russell King
[-- Attachment #1: Type: text/plain, Size: 871 bytes --]
Hi Greg, Dmitry,
On Fri, 8 Aug 2008 11:26:46 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the usb.current tree got a conflict in
> drivers/usb/gadget/omap_udc.c between commit
> a09e64fbc0094e3073dbb09c3b4bfe4ab669244b ("[ARM] Move
> include/asm-arm/arch-* to arch/arm/*/include/mach") from the arm-current
> tree and commit b7eff3b991784964df1e7eeffd944032ccc3e11f ("USB: omap_udc:
> fix compilation with debug enabled") from the usb.current tree.
>
> Some of the arm header files have moved. I think I fixed it up right (I
> changed asm/arch/control.h to mach/control.h) and will carry the fix
> while necessary.
The arm changes here are now in Linus' tree, so this could be fixed up in
your patch.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the usb.current tree
2008-08-13 0:53 ` Stephen Rothwell
@ 2008-08-13 3:59 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2008-08-13 3:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Dmitry Baryshkov, Russell King
On Wed, Aug 13, 2008 at 10:53:56AM +1000, Stephen Rothwell wrote:
> Hi Greg, Dmitry,
>
> On Fri, 8 Aug 2008 11:26:46 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the usb.current tree got a conflict in
> > drivers/usb/gadget/omap_udc.c between commit
> > a09e64fbc0094e3073dbb09c3b4bfe4ab669244b ("[ARM] Move
> > include/asm-arm/arch-* to arch/arm/*/include/mach") from the arm-current
> > tree and commit b7eff3b991784964df1e7eeffd944032ccc3e11f ("USB: omap_udc:
> > fix compilation with debug enabled") from the usb.current tree.
> >
> > Some of the arm header files have moved. I think I fixed it up right (I
> > changed asm/arch/control.h to mach/control.h) and will carry the fix
> > while necessary.
>
> The arm changes here are now in Linus' tree, so this could be fixed up in
> your patch.
Ok, will do.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-08-13 4:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-08 1:26 linux-next: manual merge of the usb.current tree Stephen Rothwell
2008-08-08 4:33 ` Greg KH
2008-08-13 0:53 ` Stephen Rothwell
2008-08-13 3:59 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox