From: Linus Torvalds <[email protected]> Date: Wed, 18 May 2016 11:45:06 -0700
> David, do you happen to recall that merge conflict? I think you must > have removed that "skb_info" variable declaration and initialization > manually (due to the "unused variable" warning, which in turn was due > to the incorrect merge of the actual conflict), because I think git > would have merged that line into the result. Yes, I know I buggered this merge conflict and Kalle said he'd have a fix coming my way ASAP. Sorry, I was travelling today, so I'll catch up with this tomorrow. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
