linux-kernel - linux-next: manual merge of the gpio tree with the i.MX 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: <20110716203837.ffee6af39380620984c2d8d6@canb.auug.org.au>
Date:	Sat, 16 Jul 2011 20:38:37 +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,
	Shawn Guo <shawn.guo@...aro.org>,
	Fabio Estevam <fabio.estevam@...escale.com>,
	Sascha Hauer <s.hauer@...gutronix.de>
Subject: linux-next: manual merge of the gpio tree with the i.MX tree

Hi Grant,

Today's linux-next merge of the gpio tree got conflicts in
arch/arm/mach-imx/mm-imx1.c, arch/arm/mach-imx/mm-imx21.c and
arch/arm/mach-imx/mm-imx25.c between commit 8d3c41c8bc6a ("ARM: imx2: Fix
GPIO iosize") from the i.MX tree and commit e7fc6ae74467 ("gpio/mxc: get
rid of the uses of cpu_is_mx()") from the gpio tree.

The latter change incorporates the former, so I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped