From: Andrew Morton <akpm@linux-foundation•org>
To: Masahiro Yamada <yamada.masahiro@socionext•com>
Cc: Heiko Stuebner <heiko@sntech•de>,
linux-next@vger•kernel.org,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Subject: Re: linux-next: manual merge of the akpm tree with the rockchip tree
Date: Tue, 10 Jan 2017 17:22:48 -0800 [thread overview]
Message-ID: <20170110172248.9195c9bdeb15c4c2dfe52719@linux-foundation.org> (raw)
In-Reply-To: <CAK7LNATca+7CMs+Nxw00KmPVHbiXO8Nsd-Kf9RhYWJviAO43Ag@mail.gmail.com>
On Wed, 11 Jan 2017 10:07:33 +0900 Masahiro Yamada <yamada.masahiro@socionext•com> wrote:
> 2017-01-09 11:55 GMT+09:00 Stephen Rothwell <sfr@canb•auug.org.au>:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm tree got a conflict in:
> >
> > Documentation/devicetree/bindings/soc/rockchip/grf.txt
> >
> > between commit:
> >
> > 2c257ce6ab6f ("dt-bindings: add used but undocumented rockchip grf compatible values")
> >
> > from the rockchip tree and patch:
> >
> > "scripts/spelling.txt: add "followings" pattern and fix typo instances"
> >
> > from the akpm tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc Documentation/devicetree/bindings/soc/rockchip/grf.txt
> > index c6e62cb30712,76d6ccf677f5..000000000000
> > --- a/Documentation/devicetree/bindings/soc/rockchip/grf.txt
> > +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.txt
> > @@@ -10,19 -9,16 +10,19 @@@ From RK3368 SoCs, the GRF is divided in
> >
> > Required Properties:
> >
> > - - compatible: GRF should be one of the followings
> > + - compatible: GRF should be one of the following:
> > + - "rockchip,rk3036-grf", "syscon": for rk3036
> > - "rockchip,rk3066-grf", "syscon": for rk3066
> > - "rockchip,rk3188-grf", "syscon": for rk3188
> > - "rockchip,rk3228-grf", "syscon": for rk3228
> > - "rockchip,rk3288-grf", "syscon": for rk3288
> > - "rockchip,rk3368-grf", "syscon": for rk3368
> > - "rockchip,rk3399-grf", "syscon": for rk3399
> > - - compatible: PMUGRF should be one of the followings
> > + - compatible: PMUGRF should be one of the following:
> > - "rockchip,rk3368-pmugrf", "syscon": for rk3368
> > - "rockchip,rk3399-pmugrf", "syscon": for rk3399
> > +- compatible: SGRF should be one of the following
> > + - "rockchip,rk3288-sgrf", "syscon": for rk3288
> > - reg: physical base address of the controller and length of memory mapped
> > region.
>
> Hi Andrew,
>
> I have been wondering this
> because this series is touching files across sub-systems.
>
> I expected it would be pulled into upstream
> during the previous MW, but it was not.
> How long will it stay in your branch?
(Top-posting fixed. Please don't do that!)
I expect I'll be sending
scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch in
to Linus for 4.11-rc1. If "dt-bindings: add used but undocumented
rockchip grf compatible values" gets merged befoe that, I'll fix up
scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch.
If scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch
get merged first, you'lll need to fix up "dt-bindings: add used but
undocumented rockchip grf compatible values".
prev parent reply other threads:[~2017-01-11 1:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-09 2:55 linux-next: manual merge of the akpm tree with the rockchip tree Stephen Rothwell
2017-01-11 1:07 ` Masahiro Yamada
2017-01-11 1:22 ` Andrew Morton [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=20170110172248.9195c9bdeb15c4c2dfe52719@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=heiko@sntech$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yamada.masahiro@socionext$(echo .)com \
/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