Re: linux-next: manual merge of the wireless-drivers-next tree with the net-next tree

From: David Miller
Date: Mon May 16 2016 - 11:09:44 EST


From: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Date: Mon, 16 May 2016 16:10:27 +0300

> I wasn't expecting that skb_info variable is removed. Do we now have
> merge damage somewhere? Luca, what do you think?

It's possible I got the net --> net-next merge wrong the other day, feel
free to send me an appropriate fixup.

Thanks.