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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 12 Dec 2013 11:49:59 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, jasowang@...hat.com,
	wuzhy@...ux.vnet.ibm.com
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

Hi Dave,

On Wed, 11 Dec 2013 19:36:39 -0500 (EST) David Miller <davem@...emloft.net> wrote:
>
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped