From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org,
Dmitry Baryshkov <dbaryshkov@gmail•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: linux-next: manual merge of the usb.current tree
Date: Fri, 8 Aug 2008 11:26:46 +1000 [thread overview]
Message-ID: <20080808112646.b5502bf1.sfr@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2008-08-08 1:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-08 1:26 Stephen Rothwell [this message]
2008-08-08 4:33 ` linux-next: manual merge of the usb.current tree Greg KH
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=20080808112646.b5502bf1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dbaryshkov@gmail$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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