linux-kernel - linux-next: manual merge of the devicetree tree with the drm-panel 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:   Mon, 12 Dec 2016 13:18:58 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Herring <robherring2@...il.com>,
        Thierry Reding <thierry.reding@...il.com>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Fabien Lahoudere <fabien.lahoudere@...labora.co.uk>,
        Nathan Sullivan <nathan.sullivan@...com>
Subject: linux-next: manual merge of the devicetree tree with the drm-panel
 tree

Hi Rob,

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

  Documentation/devicetree/bindings/vendor-prefixes.txt

between commit:

  05ec0e4501f7 ("drm/panel: simple: Add NVD9128 as a simple panel")

from the drm-panel tree and commit:

  1a85ff590440 ("devicetree: add vendor prefix for National Instruments")

from the devicetree tree.

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.

N.B. "nvd" was added in the wrong place, I think, so I moved it.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index 540cd9007be1,ffc8689abfd3..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -188,12 -190,11 +192,13 @@@ neonode		Neonode Inc
  netgear	NETGEAR
  netlogic	Broadcom Corporation (formerly NetLogic Microsystems)
  netxeon		Shenzhen Netxeon Technology CO., LTD
 +nexbox	Nexbox
  newhaven	Newhaven Display International
- nvd	New Vision Display
+ ni	National Instruments
  nintendo	Nintendo
  nokia	Nokia
  nuvoton	Nuvoton Technology Corporation
++nvd	New Vision Display
  nvidia	NVIDIA
  nxp	NXP Semiconductors
  okaya	Okaya Electric America, Inc.
@@@ -234,9 -235,9 +240,10 @@@ realtek Realtek Semiconductor Corp
  renesas	Renesas Electronics Corporation
  richtek	Richtek Technology Corporation
  ricoh	Ricoh Co. Ltd.
 +rikomagic	Rikomagic Tech Corp. Ltd
  rockchip	Fuzhou Rockchip Electronics Co., Ltd
  samsung	Samsung Semiconductor
+ samtec	Samtec/Softing company
  sandisk	Sandisk Corporation
  sbs	Smart Battery System
  schindler	Schindler