From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org,
David Brownell <dbrownell@users.sourceforge.net>,
Philipp Zabel <philipp.zabel@gmail.com>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the arm tree
Date: Thu, 10 Jul 2008 14:33:54 +1000 [thread overview]
Message-ID: <20080710143354.729601d6.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in
drivers/usb/gadget/ether.c between commit
41df25fad30d0e88ddc042358556f19a72d70054 ("usb ethernet gadget: use
composite gadget framework") from the usb tree and commit
7a8576204333d133d58cbcc59dacf49a5546e3e4 ("[ARM] 5120/1: pxa: correct
platform driver names for PXA25x and PXA27x UDC drivers") from the arm
tree.
I am not actually sure what to do with this. To make it build, I have
just take the usb tree's version, but there is probably more to it than
that.
--
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-07-10 4:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-10 4:33 Stephen Rothwell [this message]
2008-07-10 6:29 ` linux-next: manual merge of the arm tree pHilipp Zabel
2008-07-10 7:30 ` Russell King
-- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20 ` Dmitry Kravkov
2008-10-14 2:27 Stephen Rothwell
2008-10-14 7:59 ` Russell King
2008-10-14 8:07 ` David Brownell
2008-10-14 20:08 ` Tony Lindgren
2008-08-25 1:03 Stephen Rothwell
2008-08-26 22:20 ` Russell King
2008-08-26 23:43 ` Stephen Rothwell
2008-07-04 6:57 Stephen Rothwell
2008-07-07 9:12 ` Russell King
2008-07-07 10:39 ` Stephen Rothwell
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=20080710143354.729601d6.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dbrownell@users.sourceforge.net \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=philipp.zabel@gmail.com \
--cc=rmk@arm.linux.org.uk \
/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).