linux-kernel - linux-next: manual merge of the dt-rh tree with the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20131104152739.92ae486e7d418221c6a48a1e@canb.auug.org.au>
Date:	Mon, 4 Nov 2013 15:27:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rob Herring <robherring2@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rostislav Lisovy <lisovy@...il.com>,
	Shawn Guo <shawn.guo@...aro.org>,
	Silvio F <silvio.fricke@...il.com>
Subject: linux-next: manual merge of the dt-rh tree with the imx-mxs tree

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@...b.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

Content of type "application/pgp-signature" skipped