netdev - linux-next: manual merge of the spi tree with the net-next 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>] [day] [month] [year] [list]

Message-ID: <20151101231835.06ea249c@canb.auug.org.au>
Date:	Sun, 1 Nov 2015 23:18:35 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nel.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Andrew F. Davis" <afd@...com>,
	Javier Martinez Canillas <javier@....samsung.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: linux-next: manual merge of the spi tree with the net-next tree

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@...b.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,
  	},
  };
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html