linux-kernel - linux-next: manual merge of the tpmdd tree with Linus' 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]

Date:	Mon, 20 Jun 2016 13:13:45 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
	Rob Herring <robh@...nel.org>,
	Christophe Ricard <christophe.ricard@...il.com>,
	Fabio Estevam <fabio.estevam@....com>
Subject: linux-next: manual merge of the tpmdd tree with Linus' tree

Hi Jarkko,

Today's linux-next merge of the tpmdd tree got a conflict in:

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  7aa5d38cfb77 ("of: Add Inforce Computing to vendor prefix list")
  3eefa7e8cc85 ("dt-bindings: Add vendor prefix for TechNexion")

from Linus' tree and commits:

  45a33961f81a ("devicetree: Add infineon to vendor-prefix.txt")
  3a34e75f6a91 ("devicetree: Add Trusted Computing Group to vendor-prefix.txt")

from the tpmdd tree.

BTW: commit 3a34e75f6a91 added the new entry out of alphabetical order.

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 d2bce2239769,717bae92e28a..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -125,10 -111,9 +125,11 @@@ hp	Hewlett Packar
  i2se	I2SE GmbH
  ibm	International Business Machines (IBM)
  idt	Integrated Device Technologies, Inc.
 +ifi	Ingenieurburo Fur Ic-Technologie (I/F/I)
  iom	Iomega Corporation
  img	Imagination Technologies Ltd.
+ infineon Infineon Technologies
 +inforce	Inforce Computing
  ingenic	Ingenic Semiconductor
  innolux	Innolux Corporation
  intel	Intel Corporation
@@@ -251,12 -227,10 +252,13 @@@ st	STMicroelectronic
  startek	Startek
  ste	ST-Ericsson
  stericsson	ST-Ericsson
 +syna	Synaptics Inc.
  synology	Synology, Inc.
 +SUNW	Sun Microsystems, Inc
  tbs	TBS Technologies
 -tcl	Toby Churchill Ltd.
+ tcg	Trusted Computing Group
 +tcl	Toby Churchill Ltd.
 +technexion	TechNexion
  technologic	Technologic Systems
  thine	THine Electronics, Inc.
  ti	Texas Instruments