linux-kernel - Re: linux-next: manual merge of the devicetree tree with the pm, mfd and regulator trees

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-prev] [day] [month] [year] [list]

Message-ID: <20141127084902.GC4628@x1>
Date:	Thu, 27 Nov 2014 08:49:02 +0000
From:	Lee Jones <lee.jones@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Grant Likely <grant.likely@...retlab.ca>,
	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	Mark Brown <broonie@...nel.org>,
	Liam Girdwood <lgirdwood@...il.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pantelis Antoniou <pantelis.antoniou@...sulko.com>,
	Romain Perier <romain.perier@...il.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the pm, mfd
 and regulator trees

> Today's linux-next merge of the devicetree tree got a conflict in
> include/linux/of.h between commits b31384fa5de3 ("Driver core: Unified
> device properties interface for platform firmware") from the pm tree
> and a4b4e0461ec5 ("of: Add standard property for poweroff capability")
> from the mfd and regulator trees and commit 7518b5890d8a ("of/overlay:
> Introduce DT overlay support") from the devicetree tree.

This patch actually originated from the Regulator tree.  I pulled it in
to avoid conflicts between MFD and Regulator.  I guess OF needs to do
the same to avoid a conflict when Linus pulls them in.

[...]

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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/