linux-kernel - linux-next: manual merge of the gpio 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:	Mon, 14 May 2012 18:31:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Grant Likely <grant.likely@...retlab.ca>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sachin Kamat <sachin.kamat@...aro.org>,
	Olof Johansson <olof@...om.net>
Subject: linux-next: manual merge of the gpio tree with Linus' tree

Hi Grant,

Today's linux-next merge of the gpio tree got a conflict in
drivers/gpio/gpio-samsung.c between commit 2760f7adbb6c ("gpio/exynos:
Fix compiler warnings when non-exynos machines are selected") from Linus'
tree and commit fd454997d687 ("gpio: samsung: refactor gpiolib init for
exynos4/5") from the gpio tree.

I used the version from the gpio tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped