From: Tony Prisk <linux@prisktech.co.nz>
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: Tue, 25 Sep 2012 19:22:56 +1200 [thread overview]
Message-ID: <1348557776.18425.2.camel@gitbox> (raw)
In-Reply-To: <20120925165603.7676aa78ed5cfbf8a21fb734@canb.auug.org.au>
On Tue, 2012-09-25 at 16:56 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> arch/arm/mach-vt8500/bv07.c, arch/arm/mach-vt8500/devices-vt8500.c,
> arch/arm/mach-vt8500/devices-wm8505.c, arch/arm/mach-vt8500/devices.c,
> arch/arm/mach-vt8500/devices.h and arch/arm/mach-vt8500/wm8505_7in.c
> between commit 100d45970327 ("ARM: vt8500: Add support for UHCI companion
> controller") from the usb tree and commit e9a91de7602a ("arm: vt8500: Update
> arch-vt8500 to devicetree support") from the arm-soc tree.
>
> I just removed the files and can carry the fix as necessary (there may be
> more work required).
>
Removing the files is the correct solution. Shouldn't be any other work
required if the rest of commit e9a91de7602a changes went in.
I'll pull down -next and check it.
Regards
Tony P
WARNING: multiple messages have this Message-ID (diff)
From: linux@prisktech.co.nz (Tony Prisk)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the usb tree
Date: Tue, 25 Sep 2012 19:22:56 +1200 [thread overview]
Message-ID: <1348557776.18425.2.camel@gitbox> (raw)
In-Reply-To: <20120925165603.7676aa78ed5cfbf8a21fb734@canb.auug.org.au>
On Tue, 2012-09-25 at 16:56 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got conflicts in
> arch/arm/mach-vt8500/bv07.c, arch/arm/mach-vt8500/devices-vt8500.c,
> arch/arm/mach-vt8500/devices-wm8505.c, arch/arm/mach-vt8500/devices.c,
> arch/arm/mach-vt8500/devices.h and arch/arm/mach-vt8500/wm8505_7in.c
> between commit 100d45970327 ("ARM: vt8500: Add support for UHCI companion
> controller") from the usb tree and commit e9a91de7602a ("arm: vt8500: Update
> arch-vt8500 to devicetree support") from the arm-soc tree.
>
> I just removed the files and can carry the fix as necessary (there may be
> more work required).
>
Removing the files is the correct solution. Shouldn't be any other work
required if the rest of commit e9a91de7602a changes went in.
I'll pull down -next and check it.
Regards
Tony P
next prev parent reply other threads:[~2012-09-25 7:22 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 6:56 linux-next: manual merge of the arm-soc tree with the usb tree Stephen Rothwell
2012-09-25 6:56 ` Stephen Rothwell
2012-09-25 6:56 ` Stephen Rothwell
2012-09-25 7:22 ` Tony Prisk [this message]
2012-09-25 7:22 ` Tony Prisk
-- 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-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-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-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=1348557776.18425.2.camel@gitbox \
--to=linux@prisktech.co.nz \
--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.