linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Rostislav Lisovy <lisovy@gmail.com>,
	Shawn Guo <shawn.guo@linaro.org>,
	Silvio F <silvio.fricke@gmail.com>
Subject: linux-next: manual merge of the dt-rh tree with the imx-mxs tree
Date: Mon, 4 Nov 2013 15:27:39 +1100	[thread overview]
Message-ID: <20131104152739.92ae486e7d418221c6a48a1e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commit
064d7f6c985a ("ARM: dts: Add vendor prefix for Voipac Technologies
s.r.o") from the imx-mxs tree and commit d6c3073e7fb5 ("DT: sort
vendor-prefixes.txt") from the dt-rh tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 8319844fb68d,640e86dc0ae7..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -65,13 -66,12 +67,13 @@@ snps 	Synopsys, Inc
  st	STMicroelectronics
  ste	ST-Ericsson
  stericsson	ST-Ericsson
- toumaz	Toumaz
  ti	Texas Instruments
  toshiba	Toshiba Corporation
+ toumaz	Toumaz
  v3	V3 Semiconductor
  via	VIA Technologies, Inc.
 +voipac	Voipac Technologies s.r.o.
+ winbond Winbond Electronics corp.
  wlf	Wolfson Microelectronics
  wm	Wondermedia Technologies, Inc.
- winbond Winbond Electronics corp.
  xlnx	Xilinx

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-11-04  4:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-04  4:27 Stephen Rothwell [this message]
2013-11-04 13:17 ` linux-next: manual merge of the dt-rh tree with the imx-mxs tree Shawn Guo
2013-11-04 14:15   ` Rob Herring
2013-11-04 14:36     ` Shawn Guo
2013-11-04 14:47       ` Rob Herring

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=20131104152739.92ae486e7d418221c6a48a1e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lisovy@gmail.com \
    --cc=robherring2@gmail.com \
    --cc=shawn.guo@linaro.org \
    --cc=silvio.fricke@gmail.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).