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

[Stephen Rothwell]

Hi Dave,

On Wed, 11 Dec 2013 19:36:39 -0500 (EST) David Miller <davem@xxxxxxxxxxxxx> wrote:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Thu, 12 Dec 2013 11:15:39 +1100
> 
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/macvtap.c between commit ce232ce01d61 ("macvtap: signal
> > truncated packets") from the net tree and commit 55ec8e25cd97 ("macvtap:
> > remove unused parameter in macvtap_do_read()") from the net-next tree.
> > 
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
> 
> The net-next commit in question was reverted last night.

Actually, the only relevant revert in the net-next tree I fetched this
morning is commit de2aa4760b45 (Revert "macvtap: remove useless codes in
macvtap_aio_read() and macvtap_recvmsg()") which reverts 41e4af69a598,
not the commit mentioned above.  Unless you haven't pushed out the
net-next tree with a later revert ...

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature