Stephen Rothwell <[email protected]> writes: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/wlags49_h2/wl_netdev.c between commit 8d4ade284a41 > ("wlags49_h2: Call dev_kfree/consume_skb_any instead of dev_kfree_skb") > from the net-next tree and commit fed3ffd8f7ef ("staging: wlags49_h2: > reindent wl_netdev.c") (and maybe others) from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
That looks like the correct resolution. Thanks, Eric -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
