linux-kernel - linux-next: manual merge of the usb 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110304155800.b48993d7.sfr@canb.auug.org.au>
Date:	Fri, 4 Mar 2011 15:58:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Richard Zhao <richard.zhao@...escale.com>,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Fabio Estevam <fabio.estevam@...escale.com>
Subject: linux-next: manual merge of the usb tree with the i.MX tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/fsl_mxc_udc.c between commit
4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
ARCH_MX3X") from the i.MX tree and commit
a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 ("usb: gadget/fsl_mxc_udc:
Detect the CPU type in run-time") from the usb tree.

The latter is a superset of the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped