From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Andrew F. Davis" <afd@ti•com>,
Javier Martinez Canillas <javier@osg•samsung.com>,
Samuel Ortiz <sameo@linux•intel.com>
Subject: linux-next: manual merge of the spi tree with the net-next tree
Date: Sun, 1 Nov 2015 23:18:35 +1100 [thread overview]
Message-ID: <20151101231835.06ea249c@canb.auug.org.au> (raw)
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,
},
};
reply other threads:[~2015-11-01 12:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151101231835.06ea249c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=afd@ti$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=javier@osg$(echo .)samsung.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sameo@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox