linux-kernel - linux-next: manual merge of the dt-rh tree with the arm-soc 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>] [day] [month] [year] [list]

Message-Id: <20140117142350.dc957c59116a9d0885e4724a@canb.auug.org.au>
Date:	Fri, 17 Jan 2014 14:23:50 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rob Herring <robherring2@...il.com>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Lothar Waßmann" <LW@...O-electronics.de>,
	Arnaud Ebalard <arno@...isbad.org>,
	Jason Cooper <jason@...edaemon.net>,
	Thierry Reding <thierry.reding@...il.com>
Subject: linux-next: manual merge of the dt-rh tree with the arm-soc tree

Hi Rob,

Today's linux-next merge of the dt-rh tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commits
70e123373c05 ("rtc: Add support for Intersil ISL12057 I2C RTC chip") from
the arm-soc tree and 53d6b36020c7 ("of: Add vendor prefix for LG
Corporation") from Linus' tree and commit 7e73700ce785 ("of: add vendor
prefix for Ka-Ro electronics GmbH") 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 d92c88f551f9,d98fa9a6279c..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -42,8 -38,7 +42,9 @@@ ibm	International Business Machines (IB
  idt	Integrated Device Technologies, Inc.
  img	Imagination Technologies Ltd.
  intercontrol	Inter Control Group
 +isl	Intersil
+ karo	Ka-Ro electronics GmbH
 +lg	LG Corporation
  linux	Linux-specific binding
  lsi	LSI Corp. (LSI Logic)
  marvell	Marvell Technology Group Ltd.

Content of type "application/pgp-signature" skipped