From: khilman@linaro•org (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: arm-soc: Xilinx Zynq DT changes for v3.12
Date: Wed, 14 Aug 2013 08:20:17 -0700 [thread overview]
Message-ID: <871u5w5mfi.fsf@kernel.org> (raw)
In-Reply-To: <CAOesGMiT3Vw9_YKu86ve2NH-h_ZD+nrVDe94Rtqh6DcAf9gCUw@mail.gmail.com> (Olof Johansson's message of "Tue, 13 Aug 2013 23:17:34 -0700")
Olof Johansson <olof@lixom•net> writes:
> On Tue, Aug 13, 2013 at 10:50 PM, Michal Simek <monstr@monstr•eu> wrote:
>
>> I wasn't aware about using earlier -rc. The last information I got
>> is that these trees should be based on Linux -rc (or tagged if you like) version.
>> I will keep this in my mind and will use earlier versions in the next pull requests.
>
> Yes, the request to not always go with the latest -rc is new for this
> release cycle, so we're generally not pushing back and enforcing it,
> just asking nicely :)
>
> However, since Kevin just got up to speed at the same time, he might
> have been of the impression that it's something we've been asking for
> in the past. :)
>
> The reason for asking is that if we keep getting new and different
> -rcs as bases for merge requests, the history starts to look like a
> lot of merge-backs from upstream, when there's rarely a real need for
> being based on such a new -rc. Still, it's not a big deal, and we've
> been doing it that way now for a couple of years, but I think we could
> avoid some of it without causing anyone more work (once they're used
> to it :).
>
>> It is just one single patch and I believe you have to use rc5
>> and resolve that all conflicts anyway that's why it is just question
>> of time when you have to deal with it.
>
> Ah, I saw that there was a branch included from the zynq tree and
> figured this was in it. I'll let Kevin handle the merge so it's up to
> him if he prefers to rebase back or just merge it in with -rc5.
I'll take care of the merge with -rc5 this time.
Kevin
prev parent reply other threads:[~2013-08-14 15:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 14:50 arm-soc: Xilinx Zynq DT changes for v3.12 Michal Simek
2013-08-13 22:46 ` Kevin Hilman
2013-08-14 0:18 ` Kevin Hilman
2013-08-14 5:50 ` Michal Simek
2013-08-14 6:17 ` Olof Johansson
2013-08-14 15:20 ` Kevin Hilman [this message]
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=871u5w5mfi.fsf@kernel.org \
--to=khilman@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox