linux-kernel - linux-next: manual merge of the dt-rh tree with the tegra 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: <20160427135018.2aac12f4@canb.auug.org.au>
Date:	Wed, 27 Apr 2016 13:50:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rob Herring <robherring2@...il.com>,
	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>,
	Thierry Reding <treding@...dia.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexandre Courbot <acourbot@...dia.com>
Subject: linux-next: manual merge of the dt-rh tree with the tegra tree

Hi Rob,

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

  Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt

between commit:

  53cafb93da6f ("dt-bindings: Add documentation for GM20B GPU")

from the tegra tree and commit:

  f43521e95211 ("dt-bindings: tegra: Remove 0, prefix from unit-addresses")

from the dt-rh tree.

I fixed it up (they were very similar) 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