Messages in this thread | | | From | (Eric W. Biederman) | Date | Thu, 27 Mar 2014 12:14:13 -0700 | Subject | Re: linux-next: manual merge of the staging tree with the net-next tree |
| |
Stephen Rothwell <sfr@canb.auug.org.au> 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
| |