From: Roland Stigge <stigge@antcom.de>
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, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Thu, 06 Sep 2012 11:32:03 +0200 [thread overview]
Message-ID: <50486D93.4090009@antcom.de> (raw)
In-Reply-To: <20120906154240.12f7e0c01686559dd43744fa@canb.auug.org.au>
On 09/06/2012 07:42 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/host/Kconfig between commit 952230d774bb ("usb: ohci:
> Fix Kconfig dependency on USB_ISP1301") from the usb tree and
> commit d684f05f2d55 ("ARM: mach-pnx4008: Remove architecture") from
> the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no
> action required).
Thanks - this little conflict was expected when merging pnx4008
removal and the isp1301 deoendency fix.
And the fixup is correct.
Roland
WARNING: multiple messages have this Message-ID (diff)
From: stigge@antcom.de (Roland Stigge)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Thu, 06 Sep 2012 11:32:03 +0200 [thread overview]
Message-ID: <50486D93.4090009@antcom.de> (raw)
In-Reply-To: <20120906154240.12f7e0c01686559dd43744fa@canb.auug.org.au>
On 09/06/2012 07:42 AM, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/usb/host/Kconfig between commit 952230d774bb ("usb: ohci:
> Fix Kconfig dependency on USB_ISP1301") from the usb tree and
> commit d684f05f2d55 ("ARM: mach-pnx4008: Remove architecture") from
> the arm-soc tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no
> action required).
Thanks - this little conflict was expected when merging pnx4008
removal and the isp1301 deoendency fix.
And the fixup is correct.
Roland
next prev parent reply other threads:[~2012-09-06 9:32 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 5:42 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2012-09-06 5:42 ` Stephen Rothwell
2012-09-06 5:42 ` Stephen Rothwell
2012-09-06 9:32 ` Roland Stigge [this message]
2012-09-06 9:32 ` Roland Stigge
-- strict thread matches above, loose matches on Subject: below --
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-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-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-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
2013-02-11 6:05 Stephen Rothwell
2013-02-11 6:05 ` Stephen Rothwell
2013-02-11 6:05 ` 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-12 3:59 Stephen Rothwell
2013-02-12 3:59 ` Stephen Rothwell
2013-02-12 3:59 ` Stephen Rothwell
2013-06-18 6:12 Stephen Rothwell
2013-06-18 6:12 ` Stephen Rothwell
2013-06-18 6:12 ` Stephen Rothwell
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 12:56 ` Sergei Shtylyov
2013-06-18 16:03 ` Greg KH
2013-06-18 16:03 ` Greg KH
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-08-27 8:18 Stephen Rothwell
2013-08-27 8:18 ` Stephen Rothwell
2013-08-27 8:18 ` 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:24 Stephen Rothwell
2013-08-27 8:24 ` Stephen Rothwell
2013-08-27 8:24 ` Stephen Rothwell
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
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=50486D93.4090009@antcom.de \
--to=stigge@antcom.de \
--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 \
/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.