From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org,
Dmitry Baryshkov <dbaryshkov@gmail.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the usb.current tree
Date: Thu, 7 Aug 2008 21:33:44 -0700 [thread overview]
Message-ID: <20080808043344.GB11743@kroah.com> (raw)
In-Reply-To: <20080808112646.b5502bf1.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2008-08-08 4:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-08 1:26 linux-next: manual merge of the usb.current tree Stephen Rothwell
2008-08-08 4:33 ` Greg KH [this message]
2008-08-13 0:53 ` Stephen Rothwell
2008-08-13 3:59 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080808043344.GB11743@kroah.com \
--to=greg@kroah.com \
--cc=dbaryshkov@gmail.com \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).