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,
Wei Yongjun <weiyj.lk@gmail.com>, Felipe Balbi <balbi@ti.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: linux-next: manual merge of the usb tree with the usb.current tree
Date: Tue, 13 Nov 2012 14:37:32 +1100 [thread overview]
Message-ID: <20121113143732.624361eaf8ed2f4d0d64dd7d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500:
fix 'musbid' undeclared error in ux500_remove()") from the usb.current
tree and commit 2f7711642559 ("usb: musb: remove hand-crafted id
handling") from the usb tree.
The latter supercedes the former so I used that and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-11-13 3:37 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-13 3:37 Stephen Rothwell [this message]
2012-11-13 18:49 ` linux-next: manual merge of the usb tree with the usb.current tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2024-04-12 4:25 Stephen Rothwell
2024-04-12 7:58 ` Greg KH
2024-02-20 3:39 Stephen Rothwell
2024-02-20 8:18 ` Greg KH
2024-02-26 5:55 ` Greg KH
2023-05-15 2:50 Stephen Rothwell
2023-05-28 14:28 ` Greg KH
2023-05-15 2:35 Stephen Rothwell
2023-05-15 3:50 ` Greg KH
2023-05-15 5:22 ` Krishna Kurapati PSSNV
2023-05-15 11:01 ` Roger Quadros
2023-05-15 11:36 ` Stephen Rothwell
2023-05-28 14:28 ` Greg KH
2023-05-28 15:48 ` Roger Quadros
2023-05-28 16:07 ` Greg KH
2023-03-31 3:01 Stephen Rothwell
2023-03-31 7:52 ` Greg KH
2023-04-10 6:56 ` Greg KH
2023-01-19 3:48 Stephen Rothwell
2023-01-18 0:56 Stephen Rothwell
2023-01-18 7:48 ` Greg KH
2023-01-23 14:40 ` Greg KH
2022-09-01 3:52 Stephen Rothwell
2022-09-05 6:04 ` Greg KH
2022-04-26 5:08 Stephen Rothwell
2022-04-26 9:41 ` Greg KH
2022-05-03 14:36 ` Greg KH
2022-02-21 20:39 broonie
2022-02-22 7:44 ` Greg KH
2021-07-22 4:12 Stephen Rothwell
2021-07-23 12:29 ` Greg KH
2021-07-27 14:45 ` Greg KH
2021-01-20 2:06 Stephen Rothwell
2021-01-20 8:02 ` Greg KH
2021-01-06 0:50 Stephen Rothwell
2021-01-11 7:11 ` Greg KH
2020-06-26 3:29 Stephen Rothwell
2020-06-26 15:14 ` Greg KH
2020-06-29 6:23 ` Greg KH
2018-06-29 4:57 Stephen Rothwell
2018-07-01 8:43 ` Greg KH
2018-07-01 15:11 ` Randy Dunlap
2018-04-23 3:04 Stephen Rothwell
2018-04-23 8:30 ` Johan Hovold
2018-04-23 8:41 ` Greg KH
2018-04-30 1:34 ` Stephen Rothwell
2018-04-30 11:55 ` Sebastian Reichel
2018-04-30 12:16 ` Greg KH
2018-04-30 12:00 ` Greg KH
2017-12-20 2:09 Stephen Rothwell
2017-12-20 9:36 ` Greg KH
2018-01-03 0:56 ` Stephen Rothwell
2018-01-04 16:06 ` Greg KH
2014-11-05 4:18 Stephen Rothwell
2014-11-05 4:30 ` Greg KH
2014-11-05 8:33 ` Paul Bolle
2014-11-06 2:19 ` Greg KH
2014-11-06 5:02 ` Stephen Rothwell
2013-12-18 5:53 Stephen Rothwell
2013-03-21 4:24 Stephen Rothwell
2012-11-14 4:07 Stephen Rothwell
2012-11-16 2:14 ` Greg KH
2012-10-25 2:05 Stephen Rothwell
2012-10-25 2:17 ` Greg KH
2012-09-12 5:37 Stephen Rothwell
2012-09-12 16:14 ` Greg KH
2012-09-12 5:37 Stephen Rothwell
2012-05-03 4:44 Stephen Rothwell
2012-05-04 23:18 ` Greg KH
2012-05-07 16:05 ` Greg KH
2012-05-07 16:05 ` Greg KH
2012-04-19 5:14 Stephen Rothwell
2012-04-19 20:07 ` Greg KH
2012-04-22 22:27 ` Greg KH
2012-03-05 6:00 Stephen Rothwell
2012-03-05 16:42 ` Greg KH
2011-08-25 4:52 Stephen Rothwell
2011-08-25 15:39 ` Greg KH
2011-08-29 15:52 ` Greg KH
2010-12-20 5:28 Stephen Rothwell
2010-12-20 18:30 ` 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=20121113143732.624361eaf8ed2f4d0d64dd7d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=balbi@ti.com \
--cc=bigeasy@linutronix.de \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=weiyj.lk@gmail.com \
/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).