From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Tushar Behera <tushar.behera@linaro.org>,
Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 18 Jun 2013 16:56:21 +0400 [thread overview]
Message-ID: <51C058F5.80609@cogentembedded.com> (raw)
In-Reply-To: <20130618161239.5ce92432180d9418831d2514@canb.auug.org.au>
Hello.
On 18-06-2013 10:12, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/phy/phy-rcar-usb.c between commit 56a9a6de2a87 ("usb: phy:
> rcar-usb: Fix comment w.r.t. devm_ioremap_resource") from the usb tree
> and commit 725bf9dcafe1 ("phy-rcar-usb: correct base address") from the
> arm-soc tree.
Darn, and I forewarned not to apply the former commit.
WBR, Sergei
WARNING: multiple messages have this Message-ID (diff)
From: sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 18 Jun 2013 16:56:21 +0400 [thread overview]
Message-ID: <51C058F5.80609@cogentembedded.com> (raw)
In-Reply-To: <20130618161239.5ce92432180d9418831d2514@canb.auug.org.au>
Hello.
On 18-06-2013 10:12, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/phy/phy-rcar-usb.c between commit 56a9a6de2a87 ("usb: phy:
> rcar-usb: Fix comment w.r.t. devm_ioremap_resource") from the usb tree
> and commit 725bf9dcafe1 ("phy-rcar-usb: correct base address") from the
> arm-soc tree.
Darn, and I forewarned not to apply the former commit.
WBR, Sergei
next prev parent reply other threads:[~2013-06-18 12:56 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 6:12 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2013-06-18 6:12 ` Stephen Rothwell
2013-06-18 6:12 ` Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov [this message]
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
2013-06-18 16:03 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 6:45 Stephen Rothwell
2013-08-28 6:45 ` Stephen Rothwell
2013-08-28 6:45 ` Stephen Rothwell
2013-08-28 17:26 ` Greg KH
2013-08-28 17:26 ` Greg KH
2013-08-27 8:24 Stephen Rothwell
2013-08-27 8:24 ` Stephen Rothwell
2013-08-27 8:24 ` Stephen Rothwell
2013-08-27 8:21 Stephen Rothwell
2013-08-27 8:21 ` Stephen Rothwell
2013-08-27 8:21 ` Stephen Rothwell
2013-08-27 8:18 Stephen Rothwell
2013-08-27 8:18 ` Stephen Rothwell
2013-08-27 8:18 ` Stephen Rothwell
2013-08-27 8:13 Stephen Rothwell
2013-08-27 8:13 ` Stephen Rothwell
2013-08-27 8:13 ` Stephen Rothwell
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 8:54 ` Sebastian Andrzej Siewior
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:02 ` Javier Martinez Canillas
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:24 ` Benoit Cousson
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:53 ` Sebastian Andrzej Siewior
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 13:57 ` Benoit Cousson
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:02 ` Sebastian Andrzej Siewior
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:05 ` Benoit Cousson
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 14:13 ` Sebastian Andrzej Siewior
2013-08-27 17:37 ` Greg KH
2013-08-27 17:37 ` Greg KH
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 18:37 ` Felipe Balbi
2013-08-27 19:30 ` Greg KH
2013-08-27 19:30 ` Greg KH
2013-08-27 19:56 ` Felipe Balbi
2013-08-27 19:56 ` Felipe Balbi
2013-08-27 19:56 ` Felipe Balbi
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 10:06 ` Benoit Cousson
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 13:44 ` Javier Martinez Canillas
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:23 ` Felipe Balbi
2013-08-29 14:47 ` Benoit Cousson
2013-08-29 14:47 ` Benoit Cousson
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 19:23 ` Sebastian Andrzej Siewior
2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:01 ` Kevin Hilman
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 15:25 ` Sebastian Andrzej Siewior
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:12 ` Olof Johansson
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-27 16:30 ` Sebastian Andrzej Siewior
2013-08-28 13:01 ` Benoit Cousson
2013-08-28 13:01 ` Benoit Cousson
2013-08-27 16:20 ` Kevin Hilman
2013-08-27 16:20 ` Kevin Hilman
2013-02-12 3:59 Stephen Rothwell
2013-02-12 3:59 ` Stephen Rothwell
2013-02-12 3:59 ` Stephen Rothwell
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 6:05 Stephen Rothwell
2013-02-11 6:05 ` Stephen Rothwell
2013-02-11 6:05 ` Stephen Rothwell
2012-11-27 4:57 Stephen Rothwell
2012-11-27 4:57 ` Stephen Rothwell
2012-11-27 4:57 ` Stephen Rothwell
2012-11-27 8:37 ` Arnd Bergmann
2012-11-27 8:37 ` Arnd Bergmann
2012-11-13 4:20 Stephen Rothwell
2012-11-13 4:20 ` Stephen Rothwell
2012-11-13 4:20 ` Stephen Rothwell
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 8:48 ` Nicolas Ferre
2012-11-13 4:06 Stephen Rothwell
2012-11-13 4:06 ` Stephen Rothwell
2012-11-13 4:06 ` Stephen Rothwell
2012-11-13 8:47 ` Nicolas Ferre
2012-11-13 8:47 ` Nicolas Ferre
2012-11-13 8:47 ` Nicolas Ferre
2012-09-25 6:56 Stephen Rothwell
2012-09-25 6:56 ` Stephen Rothwell
2012-09-25 6:56 ` Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk
2012-09-25 7:22 ` Tony Prisk
2012-09-06 5:42 Stephen Rothwell
2012-09-06 5:42 ` Stephen Rothwell
2012-09-06 5:42 ` Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge
2012-09-06 9:32 ` Roland Stigge
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=51C058F5.80609@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=arnd@arndb.de \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=tushar.behera@linaro.org \
/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.