From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19
Date: Wed, 19 Nov 2014 22:06:43 +0000 [thread overview]
Message-ID: <201411192306.43386.arnd@arndb.de> (raw)
In-Reply-To: <cover.1415059146.git.horms+renesas@verge.net.au>
On Tuesday 04 November 2014, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC koelsch board removal updates for v3.19.
>
> This pull request is based on a merge of:
>
> * "Renesas ARM Based SoC DT DU Updates for v3.19",
> tagged as renesas-dt-du-for-v3.19.
>
> * "Renesas ARM Based SoC DT Cleanups Updates for v3.19",
> tagged as renesas-dt-cleanups-for-v3.19.
>
> Both of which I have also sent a pull-request for.
>
>
> The following changes since commit 11886d1158e0dc123283891b662381f629ab47a0:
>
> Merge tag 'renesas-dt-cleanups-for-v3.19' into koelsch-board-removal-for-v3.19.base (2014-10-30 10:14:38 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-koelsch-board-removal-for-v3.19
>
> for you to fetch changes up to 79e69d179cb3391040a3693fca8bc12ec03c05fc:
>
> ARM: shmobile: koelsch dts: Drop console= bootargs parameter (2014-10-30 10:18:31 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19
>
> * Remove lecacy C koelsh board support
I've tried merging this one in two ways, but I'm not too happy about either one:
- we could put it into next/boards, but I don't think there will be anything
else in that branch and I was considering not to have one at all.
- it would also fit into next/cleanup, but then we already have
renesas-dt-cleanups-for-v3.19 categorized as "next/dt" rather than
"next/cleanup". Moving that one into cleanups solves the problem
nicely, but it's rather large and my feeling is that Olof's decision
to put it into next/dt was better.
I think you are trying too hard to avoid merge conflicts, as I can't see any
true dependency on renesas-dt-cleanups-for-v3.19, and I'd be happier if
you could rebase it onto renesas-dt-du-for-v3.19 by itself. There is
a trivial merge conflict that I have to resolve, but it seems more
sensible that way.
Any other thoughts?
Clearly the changes in this branch are great and I definitely want to have
them in 3.19.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19
Date: Wed, 19 Nov 2014 23:06:43 +0100 [thread overview]
Message-ID: <201411192306.43386.arnd@arndb.de> (raw)
In-Reply-To: <cover.1415059146.git.horms+renesas@verge.net.au>
On Tuesday 04 November 2014, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC koelsch board removal updates for v3.19.
>
> This pull request is based on a merge of:
>
> * "Renesas ARM Based SoC DT DU Updates for v3.19",
> tagged as renesas-dt-du-for-v3.19.
>
> * "Renesas ARM Based SoC DT Cleanups Updates for v3.19",
> tagged as renesas-dt-cleanups-for-v3.19.
>
> Both of which I have also sent a pull-request for.
>
>
> The following changes since commit 11886d1158e0dc123283891b662381f629ab47a0:
>
> Merge tag 'renesas-dt-cleanups-for-v3.19' into koelsch-board-removal-for-v3.19.base (2014-10-30 10:14:38 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-koelsch-board-removal-for-v3.19
>
> for you to fetch changes up to 79e69d179cb3391040a3693fca8bc12ec03c05fc:
>
> ARM: shmobile: koelsch dts: Drop console= bootargs parameter (2014-10-30 10:18:31 +0900)
>
> ----------------------------------------------------------------
> Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19
>
> * Remove lecacy C koelsh board support
I've tried merging this one in two ways, but I'm not too happy about either one:
- we could put it into next/boards, but I don't think there will be anything
else in that branch and I was considering not to have one at all.
- it would also fit into next/cleanup, but then we already have
renesas-dt-cleanups-for-v3.19 categorized as "next/dt" rather than
"next/cleanup". Moving that one into cleanups solves the problem
nicely, but it's rather large and my feeling is that Olof's decision
to put it into next/dt was better.
I think you are trying too hard to avoid merge conflicts, as I can't see any
true dependency on renesas-dt-cleanups-for-v3.19, and I'd be happier if
you could rebase it onto renesas-dt-du-for-v3.19 by itself. There is
a trivial merge conflict that I have to resolve, but it seems more
sensible that way.
Any other thoughts?
Clearly the changes in this branch are great and I definitely want to have
them in 3.19.
Arnd
next prev parent reply other threads:[~2014-11-19 22:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-04 1:50 [GIT PULL] Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19 Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 1/7] ARM: shmobile: Remove shmobile_clk_workaround() implementation Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 2/7] ARM: shmobile: koelsch: Remove legacy C board code Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 3/7] ARM: shmobile: r8a7791: Remove legacy code Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 4/7] ARM: shmobile: koelsch: Remove reference board code Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 5/7] MAINTAINERS: Remove reference to shmobile / koelsch_defconfig Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 6/7] ARM: dts: koelsch: Stop building r8a7791-koelsch.dtb in legacy builds Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-04 1:50 ` [PATCH 7/7] ARM: shmobile: koelsch dts: Drop console= bootargs parameter Simon Horman
2014-11-04 1:50 ` Simon Horman
2014-11-19 22:06 ` Arnd Bergmann [this message]
2014-11-19 22:06 ` [GIT PULL] Renesas ARM Based SoC Koelsch Board Removal Updates for v3.19 Arnd Bergmann
2014-11-20 0:40 ` Simon Horman
2014-11-20 0:40 ` Simon Horman
2014-11-20 7:33 ` Arnd Bergmann
2014-11-20 7:33 ` Arnd Bergmann
2014-11-20 9:24 ` Simon Horman
2014-11-20 9:24 ` Simon Horman
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=201411192306.43386.arnd@arndb.de \
--to=arnd@arndb.de \
--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.