netdev - linux-next: manual merge of the wireless-next 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 16 Apr 2012 12:49:06 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Eric Dumazet <eric.dumazet@...il.com>,
	Samuel Ortiz <sameo@...ux.intel.com>,
	Eric Lapuyade <eric.lapuyade@...el.com>
Subject: linux-next: manual merge of the wireless-next tree with the
 net-next tree

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
include/net/nfc/nfc.h between commit 95c961747284 ("net: cleanup unsigned
to unsigned int") from the net-next tree and commits c4fbb6515a4d ("NFC:
The core part should generate the target index") and 01ae0eea9bed ("NFC:
Fix next target_idx type and rename for clarity") from the wireless-next
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/net/nfc/nfc.h
index 79955a2,313d00f..0000000
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@@ -86,7 -90,8 +90,8 @@@ struct nfc_genl_data 
  };
  
  struct nfc_dev {
 -	unsigned idx;
 +	unsigned int idx;
+ 	u32 target_next_idx;
  	struct nfc_target *targets;
  	int n_targets;
  	int targets_generation;

Content of type "application/pgp-signature" skipped