linux-kernel - linux-next: manual merge of the drm 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>] [day] [month] [year] [list]

Message-ID: <20151222114502.6adbfdd9@canb.auug.org.au>
Date:	Tue, 22 Dec 2015 11:45:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Airlie <airlied@...ux.ie>, Shawn Guo <shawn.guo@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sean Cross <xobs@...agi.com>,
	Lucas Stach <l.stach@...gutronix.de>,
	Thierry Reding <treding@...dia.com>
Subject: linux-next: manual merge of the drm tree with the imx-mxs tree

Hi Dave,

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

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  453bb38ce504 ("devicetree: bindings: Add vendor prefix for Kosagi")

from the imx-mxs tree and commit:

  f42fb5539ab5 ("devicetree: add vendor prefix for Kyocera Corporation")

from the drm 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 e4cd78a4c652,b123731b2dca..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -123,7 -124,7 +124,8 @@@ jedec	JEDEC Solid State Technology Asso
  karo	Ka-Ro electronics GmbH
  keymile	Keymile GmbH
  kinetic Kinetic Technologies
 +kosagi	Sutajio Ko-Usagi PTE Ltd.
+ kyo	Kyocera Corporation
  lacie	LaCie
  lantiq	Lantiq Semiconductor
  lenovo	Lenovo Group Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/