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

From: Daniel Borkmann
Date: Thu Feb 25 2016 - 19:15:13 EST

On 02/26/2016 01:13 AM, Stephen Rothwell wrote:
I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Looks good to me, thanks Stephen!