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

[David Miller]

From: David Miller <davem@xxxxxxxxxxxxx>
Date: Wed, 11 Dec 2013 19:58:52 -0500 (EST)

> Ok I should probably revert that one too.
> 
> I'll go ahead and do that now, because it's the most straightforward
> way to avoid this merge conflict.

Actually scratch that, there is no dependency between these two changes,
it just causes overlapping changes.

If it were the case that the 'net' bug fix actually added back a use
of that removed variable, things would be different.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/