From: Russell King <rmk@arm.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org,
David Brownell <dbrownell@users.sourceforge.net>,
Philipp Zabel <philipp.zabel@gmail.com>, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the arm tree
Date: Thu, 10 Jul 2008 08:30:37 +0100 [thread overview]
Message-ID: <20080710073036.GA3812@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20080710143354.729601d6.sfr@canb.auug.org.au>
On Thu, Jul 10, 2008 at 02:33:54PM +1000, Stephen Rothwell wrote:
> 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.
Neither am I, especially as last night I announced that everything below
a certain commit in my tree is now frozen for the merge window (which
includes this one.)
I guess whoever merges first will have the easier time.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2008-07-10 7:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-10 4:33 linux-next: manual merge of the arm tree Stephen Rothwell
2008-07-10 6:29 ` pHilipp Zabel
2008-07-10 7:30 ` Russell King [this message]
-- 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-22 15:08 ` 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=20080710073036.GA3812@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=dbrownell@users.sourceforge.net \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=philipp.zabel@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.