From: robert.richter@caviumnetworks.com (Robert Richter)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] arm64, thunder: Enable Cavium Thunder SoC Family
Date: Mon, 6 Oct 2014 10:32:20 +0200 [thread overview]
Message-ID: <20141006083220.GY31556@rric.localhost> (raw)
In-Reply-To: <10758908.VF9CYFtfmA@wuerfel>
Arnd,
On 02.10.14 17:44:48, Arnd Bergmann wrote:
> On Thursday 02 October 2014 16:44:52 Robert Richter wrote:
> > The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
> >
> > Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
> >
> > for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
> >
> > arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
> >
> > ----------------------------------------------------------------
> > Enablement patches for Cavium Thunder SoC Family. The patches add
> > devicetree and Kconfig support and then add Thunder to the defconfig.
>
> I've pulled them into a new next/arm64 branch in the arm-soc tree,
> but noticed that you had based them on top of -rc5. If you have no
> strong reasons to pick a newer -rc, it's better to base on top of
> -rc1, to save us trouble with backmerges.
>
> I ended up rebasing to -rc1, since you gave the option to apply the
> patches directly.
thanks for applying the patches.
Ok, I think a reason to update to -rc5 was a conflict in another patch
of my patch stack unrelated to this series. Wasn't aware of
backmerging conflicts you might get and will avoid unnecessary updates
in the future.
> I originally missed the patches because they were not sent to
> arm at kernel.org but only to our personal addresses. Please include
> the arm at kernel.org address whenever you want patches or pull requests
> to get applied (as opposed to reviewed). We are not really taking
> new code for arm-soc any more, but this one was first submitted
> for inclusion a while back, so I'm making an exception.
Will use arm at kernel.org in next requests.
> Finally, I also wanted to pull your "dts, kbuild: Implement support
> for dtb vendor subdirs", but that clearly conflicts with this series,
> and I decided not to pull that and take this one instead.
I was hoping one or the other patch set would have applied earlier,
then I could have rebased them. Anyway, will do this now and let you
know after the merge window closed.
> I'm guessing we'd see conflicts with other patches in linux-next,
> so I'd rather not do the merge any more now, we can take that one
> for 3.19.
Fine with me.
-Robert
WARNING: multiple messages have this Message-ID (diff)
From: Robert Richter <robert.richter@caviumnetworks.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: <linux-arm-kernel@lists.infradead.org>,
Robert Richter <rric@kernel.org>, Olof Johansson <olof@lixom.net>,
Mark Rutland <Mark.Rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <Will.Deacon@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Subject: Re: [GIT PULL] arm64, thunder: Enable Cavium Thunder SoC Family
Date: Mon, 6 Oct 2014 10:32:20 +0200 [thread overview]
Message-ID: <20141006083220.GY31556@rric.localhost> (raw)
In-Reply-To: <10758908.VF9CYFtfmA@wuerfel>
Arnd,
On 02.10.14 17:44:48, Arnd Bergmann wrote:
> On Thursday 02 October 2014 16:44:52 Robert Richter wrote:
> > The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
> >
> > Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
> >
> > for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
> >
> > arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
> >
> > ----------------------------------------------------------------
> > Enablement patches for Cavium Thunder SoC Family. The patches add
> > devicetree and Kconfig support and then add Thunder to the defconfig.
>
> I've pulled them into a new next/arm64 branch in the arm-soc tree,
> but noticed that you had based them on top of -rc5. If you have no
> strong reasons to pick a newer -rc, it's better to base on top of
> -rc1, to save us trouble with backmerges.
>
> I ended up rebasing to -rc1, since you gave the option to apply the
> patches directly.
thanks for applying the patches.
Ok, I think a reason to update to -rc5 was a conflict in another patch
of my patch stack unrelated to this series. Wasn't aware of
backmerging conflicts you might get and will avoid unnecessary updates
in the future.
> I originally missed the patches because they were not sent to
> arm@kernel.org but only to our personal addresses. Please include
> the arm@kernel.org address whenever you want patches or pull requests
> to get applied (as opposed to reviewed). We are not really taking
> new code for arm-soc any more, but this one was first submitted
> for inclusion a while back, so I'm making an exception.
Will use arm@kernel.org in next requests.
> Finally, I also wanted to pull your "dts, kbuild: Implement support
> for dtb vendor subdirs", but that clearly conflicts with this series,
> and I decided not to pull that and take this one instead.
I was hoping one or the other patch set would have applied earlier,
then I could have rebased them. Anyway, will do this now and let you
know after the merge window closed.
> I'm guessing we'd see conflicts with other patches in linux-next,
> so I'd rather not do the merge any more now, we can take that one
> for 3.19.
Fine with me.
-Robert
next prev parent reply other threads:[~2014-10-06 8:32 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-12 17:49 [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family Robert Richter
2014-09-12 17:49 ` Robert Richter
2014-09-12 17:49 ` [PATCH v3 1/4] arm64, thunder: Add initial dts for Cavium Thunder SoC Robert Richter
2014-09-12 17:49 ` Robert Richter
2014-09-12 17:49 ` Robert Richter
2014-09-12 17:49 ` [PATCH v3 2/4] arm64, thunder: Document devicetree bindings " Robert Richter
2014-09-12 17:49 ` Robert Richter
2014-09-12 17:49 ` [PATCH v3 3/4] arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family Robert Richter
2014-09-12 17:49 ` Robert Richter
2014-09-12 17:49 ` [PATCH v3 4/4] arm64, defconfig: Enable Cavium Thunder SoC in defconfig Robert Richter
2014-09-12 17:49 ` Robert Richter
2014-09-23 10:41 ` [PATCH v3 0/4] arm64, thunder: Enable Cavium Thunder SoC Family Robert Richter
2014-09-23 10:41 ` Robert Richter
2014-09-23 10:46 ` Will Deacon
2014-09-23 10:46 ` Will Deacon
2014-09-23 11:21 ` Catalin Marinas
2014-09-23 11:21 ` Catalin Marinas
2014-09-23 14:14 ` Robert Richter
2014-09-23 14:14 ` Robert Richter
2014-10-02 7:29 ` Robert Richter
2014-10-02 7:29 ` Robert Richter
2014-10-02 14:44 ` [GIT PULL] " Robert Richter
2014-10-02 14:44 ` Robert Richter
2014-10-02 15:44 ` Arnd Bergmann
2014-10-02 15:44 ` Arnd Bergmann
2014-10-06 8:32 ` Robert Richter [this message]
2014-10-06 8:32 ` Robert Richter
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=20141006083220.GY31556@rric.localhost \
--to=robert.richter@caviumnetworks.com \
--cc=linux-arm-kernel@lists.infradead.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.