Messages in this thread | | | Date | Mon, 23 Nov 2009 12:00:52 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the net-current tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in drivers/ieee802154/fakehard.c between commit 56cf54831fd1be105e89a9df899e3b22442da180 ("ieee802154: dont leak skbs in ieee802154_fake_xmit()") from the net-current tree and commit 8964be4a9a5ca8cab1219bb046db2f6d1936227c ("net: rename skb->iif to skb->skb_iif") from the net tree.
The former removed the code modified by the latter, so I used the former. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |