linux-kernel - linux-next: manual merge of the renesas tree with the gen-gpio 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: <20130417160256.3bb8bc1e26fe4e9dc47fe5f1@canb.auug.org.au>
Date:	Wed, 17 Apr 2013 16:02:56 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexandre Courbot <acourbot@...dia.com>,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>
Subject: linux-next: manual merge of the renesas tree with the gen-gpio tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
drivers/pinctrl/sh-pfc/Kconfig between commit 76ec9d18b897 ("Convert
selectors of GENERIC_GPIO to GPIOLIB") from the gen-gpio tree and commit
809e5fce84f4 ("sh-pfc: Remove dependency on GPIOLIB") from the renesas
tree.

I fixed it up (using the latter) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped