From: Lee Jones <lee.jones@linaro.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org,
"Stephen Rothwell" <sfr@canb.auug.org.au>,
"Stephen Warren" <swarren@wwwdotorg.org>,
"Olof Johansson" <olof@lixom.net>,
"Matthias Klein" <matthias.klein@linux.com>,
"Hauke Mehrtens" <hauke@hauke-m.de>,
"Rafał Miłecki" <zajec5@gmail.com>,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 8 Dec 2014 13:00:09 +0000 [thread overview]
Message-ID: <20141208130009.GL3951@x1> (raw)
In-Reply-To: <2406890.FlzRjyvuXd@wuerfel>
On Mon, 08 Dec 2014, Arnd Bergmann wrote:
> On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote:
> > Hi Stephen,
> >
> > Today's linux-next merge of the bcm2835 tree got a conflict in
> > arch/arm/boot/dts/Makefile between commit 302a5ef29d49 ("ARM: BCM5301X:
> > Add DT for Netgear R6300 V2") from the arm-soc tree and commit
> > 6298ed17a404 ("ARM: bcm2835: Add device tree for Raspberry Pi model
> > B+") from the bcm2835 tree.
> >
> > I fixed it up (the bcm2835 tree patch is also in the arm-soc tree as
> > commit ba2a1d6959ac ("ARM: bcm2835: Add device tree for Raspberry Pi
> > model B+"), so I just used the arm-soc version) and can carry the fix
> > as necessary (no action is required).
>
> Thanks a lot for the notification!
>
> Lee, do you know what is going on? Did you accidentally rebase a commit
> that you already sent for inclusion in arm-soc?
Nope. The branch hasn't changed at all.
OOI why would a re-base affect anything? I sent you it in patch form.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree
Date: Mon, 8 Dec 2014 13:00:09 +0000 [thread overview]
Message-ID: <20141208130009.GL3951@x1> (raw)
In-Reply-To: <2406890.FlzRjyvuXd@wuerfel>
On Mon, 08 Dec 2014, Arnd Bergmann wrote:
> On Monday 08 December 2014 12:06:19 Stephen Rothwell wrote:
> > Hi Stephen,
> >
> > Today's linux-next merge of the bcm2835 tree got a conflict in
> > arch/arm/boot/dts/Makefile between commit 302a5ef29d49 ("ARM: BCM5301X:
> > Add DT for Netgear R6300 V2") from the arm-soc tree and commit
> > 6298ed17a404 ("ARM: bcm2835: Add device tree for Raspberry Pi model
> > B+") from the bcm2835 tree.
> >
> > I fixed it up (the bcm2835 tree patch is also in the arm-soc tree as
> > commit ba2a1d6959ac ("ARM: bcm2835: Add device tree for Raspberry Pi
> > model B+"), so I just used the arm-soc version) and can carry the fix
> > as necessary (no action is required).
>
> Thanks a lot for the notification!
>
> Lee, do you know what is going on? Did you accidentally rebase a commit
> that you already sent for inclusion in arm-soc?
Nope. The branch hasn't changed at all.
OOI why would a re-base affect anything? I sent you it in patch form.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2014-12-08 13:00 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-08 1:06 linux-next: manual merge of the bcm2835 tree with the arm-soc tree Stephen Rothwell
2014-12-08 1:06 ` Stephen Rothwell
2014-12-08 1:06 ` Stephen Rothwell
2014-12-08 11:25 ` Arnd Bergmann
2014-12-08 11:25 ` Arnd Bergmann
2014-12-08 13:00 ` Lee Jones [this message]
2014-12-08 13:00 ` Lee Jones
2014-12-08 13:28 ` Arnd Bergmann
2014-12-08 13:28 ` Arnd Bergmann
2014-12-08 13:49 ` Lee Jones
2014-12-08 13:49 ` Lee Jones
2014-12-08 15:08 ` Arnd Bergmann
2014-12-08 15:08 ` Arnd Bergmann
2014-12-08 16:08 ` Stephen Warren
2014-12-08 16:08 ` Stephen Warren
2014-12-08 16:51 ` Lee Jones
2014-12-08 16:51 ` Lee Jones
2014-12-08 17:37 ` Stephen Warren
2014-12-08 17:37 ` Stephen Warren
2014-12-09 8:21 ` Lee Jones
2014-12-09 8:21 ` Lee Jones
-- strict thread matches above, loose matches on Subject: below --
2014-03-09 12:14 Mark Brown
2014-03-03 1:02 Stephen Rothwell
2014-03-03 1:02 ` Stephen Rothwell
2014-03-03 1:02 ` Stephen Rothwell
2014-03-03 5:21 ` Stephen Warren
2014-03-03 5:21 ` Stephen Warren
2014-03-03 5:35 ` Olof Johansson
2014-03-03 5:35 ` Olof Johansson
2013-03-18 4:06 Stephen Rothwell
2013-03-18 4:06 ` Stephen Rothwell
2013-03-18 4:06 ` Stephen Rothwell
2013-03-18 4:04 Stephen Rothwell
2013-03-18 4:04 ` Stephen Rothwell
2013-03-18 4:04 ` Stephen Rothwell
2013-03-18 15:19 ` Stephen Warren
2013-03-18 15:19 ` Stephen Warren
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=20141208130009.GL3951@x1 \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=hauke@hauke-m.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthias.klein@linux.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=swarren@wwwdotorg.org \
--cc=zajec5@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 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.