From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Anand Gadiyar <gadiyar@ti•com>, Felipe Balbi <balbi@ti•com>,
Tony Lindgren <tony@atomide•com>,
linux-omap@vger•kernel.org,
Keshava Munegowda <keshava_mgowda@ti•com>
Subject: linux-next: manual merge of the usb tree with the omap tree
Date: Wed, 2 Mar 2011 16:57:55 +1100 [thread overview]
Message-ID: <20110302165755.b45124c8.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-omap2/board-4430sdp.c between commit
1dbea0f5e23b6c647db72fa4a048cb7140625e13 ("arm: omap4: 4430sdp: drop ehci
support") from the omap tree and commit
181b250cf53233a7a7c6d7e1e9df402506712e93 ("arm: omap: usb: create common
enums and structures for ehci and ohci") from the usb tree.
The former removed the code modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-03-02 5:57 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-02 5:57 Stephen Rothwell [this message]
2011-03-03 8:48 ` linux-next: manual merge of the usb tree with the omap tree Felipe Balbi
2011-03-03 16:02 ` Greg KH
2011-03-03 17:39 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:57 Stephen Rothwell
2011-03-02 8:23 ` Felipe Balbi
2011-03-02 14:23 ` Greg KH
2011-03-03 8:18 ` Felipe Balbi
2010-12-23 6:18 Stephen Rothwell
2010-12-23 8:36 ` Felipe Balbi
2010-12-23 18:29 ` Cousson, Benoit
2011-01-06 15:02 ` Ming Lei
2011-01-06 15:07 ` Anand Gadiyar
2011-01-06 15:25 ` Ming Lei
2011-01-06 15:50 ` Ming Lei
2011-01-07 14:07 ` Anand Gadiyar
2011-01-07 14:15 ` Ming Lei
2011-01-07 14:39 ` Anand Gadiyar
2011-01-07 15:20 ` Anand Gadiyar
2011-01-07 18:54 ` Gadiyar, Anand
2011-01-07 19:24 ` Felipe Balbi
2011-01-10 13:53 ` Ming Lei
2011-01-10 14:09 ` Anand Gadiyar
2011-01-06 15:43 ` Brad Parker
2011-01-06 16:59 ` Koen Kooi
2011-01-06 17:57 ` Nishanth Menon
2011-01-06 18:15 ` Kevin Hilman
2011-01-06 18:21 ` Nishanth Menon
2011-01-06 18:38 ` Kevin Hilman
2011-01-06 20:24 ` Nishanth Menon
2011-01-06 21:29 ` Kevin Hilman
2011-01-06 18:27 ` Paul Walmsley
2009-11-11 8:30 Stephen Rothwell
2009-11-11 19:12 ` Tony Lindgren
2009-11-11 19:20 ` Tony Lindgren
2009-11-11 21:52 ` 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=20110302165755.b45124c8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@ti$(echo .)com \
--cc=gadiyar@ti$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=keshava_mgowda@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=tony@atomide$(echo .)com \
/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