From: "John W. Linville" <[email protected]> Date: Fri, 1 Aug 2014 12:57:38 -0400
> Please pull this last(?) batch of wireless change intended for the > 3.17 stream... When I pull this I get tons of conflicts for: CONFLICT (content): Merge conflict in net/6lowpan/iphc.c I don't feel comfortable fixing these up, where are they coming from? -- 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/
