Messages in this thread | | | Date | Mon, 16 Apr 2012 12:49:06 +1000 | From | Stephen Rothwell <> | 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@canb.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; [unhandled content-type:application/pgp-signature] | |