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

Date:	Fri, 10 Apr 2015 13:53:12 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Laurent Pinchart <laurent.pinchart@...asonboard.com>,
	Michal Simek <michal.simek@...inx.com>,
	Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/devicetree/bindings/vendor-prefixes.txt between commit
f71b10be4c8a ("of: Add vendor prefix for Arasan") from Linus' tree and
commit 5888f9df0dcd ("[media] of: Add vendor prefix for Aptina
Imaging") from the v4l-dvb 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 3e8bd6d34c96,4326f52eba73..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -21,7 -20,7 +21,8 @@@ amlogic	Amlogic, Inc
  ams	AMS AG
  amstaos	AMS-Taos Inc.
  apm	Applied Micro Circuits Corporation (APM)
+ aptina	Aptina Imaging
 +arasan	Arasan Chip Systems
  arm	ARM Ltd.
  armadeus	ARMadeus Systems SARL
  asahi-kasei	Asahi Kasei Corp.

Content of type "application/pgp-signature" skipped