linux-kernel - linux-next: manual merge of the driver-core tree with the mmc 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: <20131028222007.30619a9f7d18f5acd9b1ae60@canb.auug.org.au>
Date:	Mon, 28 Oct 2013 22:20:07 +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,
	Johan Hovold <jhovold@...il.com>,
	Ulf Hansson <ulf.hansson@...aro.org>,
	Chris Ball <cjb@...top.org>
Subject: linux-next: manual merge of the driver-core tree with the mmc tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mmc/host/mvsdio.c between commit 50596285e0be ("mmc: mvsdio:
Remove redundant suspend and resume callbacks") from the mmc tree and
commit 1867adee6ed7 ("mmc: mvsdio: fix deferred probe from __init") from
the driver-core tree.

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

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

diff --cc drivers/mmc/host/mvsdio.c
index 22ba4d33e95b,deecee08c288..000000000000
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@@ -845,7 -872,10 +845,8 @@@ static const struct of_device_id mvsdio
  MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
  
  static struct platform_driver mvsd_driver = {
- 	.remove		= __exit_p(mvsd_remove),
+ 	.probe		= mvsd_probe,
+ 	.remove		= mvsd_remove,
 -	.suspend	= mvsd_suspend,
 -	.resume		= mvsd_resume,
  	.driver		= {
  		.name	= DRIVER_NAME,
  		.of_match_table = mvsdio_dt_ids,

Content of type "application/pgp-signature" skipped