Messages in this thread | | | Date | Wed, 8 May 2019 13:47:27 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the staging tree with the imx-mxs tree |
| |
Hi all,
On Fri, 12 Apr 2019 14:49:21 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the staging tree got a conflict in: > > Documentation/devicetree/bindings/vendor-prefixes.txt > > between commit: > > 189733b0a7e4 ("dt-bindings: Add vendor prefix for Rakuten Kobo, Inc.") > > from the imx-mxs tree and commit: > > 2e5cee6c7622 ("dt-bindings: Add vendor prefix for Kionix, Inc.") > > from the staging 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/vendor-prefixes.txt > index 5f2b185a04e6,93753f447c20..000000000000 > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt > @@@ -211,7 -210,7 +211,8 @@@ kiebackpeter Kieback & Peter Gmb > kinetic Kinetic Technologies > kingdisplay King & Display Technology Co., Ltd. > kingnovel Kingnovel Technology Co., Ltd. > + kionix Kionix, Inc. > +kobo Rakuten Kobo Inc. > koe Kaohsiung Opto-Electronics Inc. > kosagi Sutajio Ko-Usagi PTE Ltd. > kyo Kyocera Corporation
This is now a conflict between the arm-soc tree and Linus' tree.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |