From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/2] arm64: dts: zx: Fix gic GICR property
Date: Wed, 7 Dec 2016 12:34:12 -0800 [thread overview]
Message-ID: <20161207203412.GA10158@localhost> (raw)
In-Reply-To: <20161206011244.GC2749@dragon>
On Tue, Dec 06, 2016 at 09:12:46AM +0800, Shawn Guo wrote:
> Hi Olof,
>
> On Mon, Dec 05, 2016 at 04:55:02PM -0800, Olof Johansson wrote:
> > Hi Shawn,
> >
> > On Sun, Dec 4, 2016 at 6:24 PM, Shawn Guo <shawnguo@kernel.org> wrote:
> > > Hi Arnd,
> > >
> > > On Fri, Dec 02, 2016 at 09:28:58PM +0100, Arnd Bergmann wrote:
> > >> Given that there is any concern about the patch now, and the merge
> > >> window is almost open, I'm moving both patches to the
> > >> next/fixes-non-critical branch and will merge it for v4.10 instead
> > >> of sending it for v4.9.
> > >>
> > >> If you end up deciding that the patch is wrong, please follow up
> > >> with a fix on top. Once the situation is resolved and the patch
> > >> merged upstream, feel free to ask stable at vger.kernel.org for a
> > >> backport to stable kernels to get it into v4.9.x.
> > >
> > > The patch is correct, though it can be cleaned up a bit further per
> > > Marc's suggestion. Since we now have 4.9-rc8, I'm wondering if we can
> > > still get this into 4.9 to save the stable kernel backport.
> > >
> > > I sent you a cleanup patch on top of this one yesterday. If you like,
> > > I can quickly resend the patch with the cleanup squashed.
> >
> > Since the patches have already been applied, an incremental patch to
> > apply on top would work best here.
>
> No problem. So would you please apply the incremental patch [1] to the
> same branch? Or I can send it to you later during -rc cycles. Just let
> me know your preference.
>
> Shawn
>
> [1] https://www.spinics.net/lists/arm-kernel/msg546957.html
So, it seems that Arnd didn't apply the old patch to fixes-non-critical, or
at least didn't push out after doing it. So, I've done that now, as well as
applied the fixup you have above.
-Olof
next prev parent reply other threads:[~2016-12-07 20:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-13 12:31 [PATCH v2 0/2] Fix and add more zx dt nodes Jun Nie
2016-10-13 12:31 ` [PATCH v2 1/2] arm64: dts: zx: Fix gic GICR property Jun Nie
2016-10-17 20:49 ` Olof Johansson
2016-11-25 22:03 ` Arnd Bergmann
2016-11-28 14:08 ` Shawn Guo
2016-12-02 16:38 ` Arnd Bergmann
2016-12-03 10:55 ` Shawn Guo
2016-12-02 17:02 ` Marc Zyngier
2016-12-02 20:28 ` Arnd Bergmann
2016-12-05 2:24 ` Shawn Guo
2016-12-06 0:55 ` Olof Johansson
2016-12-06 1:12 ` Shawn Guo
2016-12-07 20:34 ` Olof Johansson [this message]
2016-12-07 21:44 ` Arnd Bergmann
2016-12-07 22:12 ` Olof Johansson
2016-12-07 23:25 ` Arnd Bergmann
2016-12-03 9:22 ` Shawn Guo
2016-12-03 10:11 ` Marc Zyngier
2016-10-13 12:31 ` [PATCH v2 2/2] arm64: dts: zx: Add clock controller nodes Jun Nie
2016-10-17 20:48 ` Olof Johansson
2016-10-24 8:56 ` Shawn Guo
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=20161207203412.GA10158@localhost \
--to=olof@lixom.net \
--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.