* linux-next: manual merge of the spi tree with the net-next tree
@ 2015-11-01 12:18 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-11-01 12:18 UTC (permalink / raw)
To: Mark Brown, David Miller, netdev
Cc: linux-next, linux-kernel, Andrew F. Davis,
Javier Martinez Canillas, Samuel Ortiz
Hi Mark,
Today's linux-next merge of the spi tree got a conflict in:
drivers/nfc/trf7970a.c
between commit:
3c39c1a54a26 ("NFC: trf7970a: Add OF match table")
from the net-next tree and commit:
3821a065f567 ("spi: Drop owner assignment from spi_drivers")
from the spi tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/nfc/trf7970a.c
index 123aa981c9d8,4036788c78b6..000000000000
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@@ -2229,8 -2223,6 +2229,7 @@@ static struct spi_driver trf7970a_spi_d
.id_table = trf7970a_id_table,
.driver = {
.name = "trf7970a",
+ .of_match_table = of_match_ptr(trf7970a_of_match),
- .owner = THIS_MODULE,
.pm = &trf7970a_pm_ops,
},
};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-01 12:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-01 12:18 linux-next: manual merge of the spi tree with the net-next tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).