Hi Martin, still conflicts here: M include/net/6lowpan.h M net/6lowpan/iphc.c M net/bluetooth/6lowpan.c M net/ieee802154/6lowpan_rtnl.c <stdin>:91: trailing whitespace. warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging net/ieee802154/6lowpan_rtnl.c Auto-merging net/bluetooth/6lowpan.c Auto-merging net/6lowpan/iphc.c CONFLICT (content): Merge conflict in net/6lowpan/iphc.c Auto-merging include/net/6lowpan.h Failed to merge in the changes. Patch failed at 0001 Simplify lowpan receive path so skb is freed in, lowpan_rcv when dropped. Save your work in a branch. Do you have bluetooth-next in your remotes? Then run "git remote update $REMOTE_NAME" and checkout $REMOTE_NAME/master, then use git cherry-pick to add patches from the branch. - Alex -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
