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

Date:	Wed, 1 Jun 2011 11:35:54 +0800
From:	Shawn Guo <shawn.guo@...escale.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Chris Ball <cjb@...top.org>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, Shawn Guo <shawn.guo@...aro.org>,
	Anton Vorontsov <cbouatmailru@...il.com>,
	Grant Likely <grant.likely@...retlab.ca>
Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree

Hi Stephen,

On Wed, Jun 01, 2011 at 11:13:20AM +1000, Stephen Rothwell wrote:
> Hi Chris,
> 
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-of-core.c between commit b1608d69cb80
> ("drivercore: revert addition of of_match to struct device") from Linus'
> tree and commit e2d0d7dc5542 ("mmc: sdhci: make sdhci-of device drivers
> self registered") from the mmc tree.
> 
> The latter removes the file, so I did that (I *think* that the change
> from the former is no longer needed, but someone should check).

Yes, the change of b1608d69cb80 ("drivercore: revert addition of
of_match to struct device") is no longer needed.

-- 
Regards,
Shawn

--
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/