netdev - Re: [README] net --> net-next merge

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] [day] [month] [year] [list]

Date:	Tue, 08 May 2012 02:02:40 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, sfr@...b.auug.org.au,
	linville@...driver.com
Subject: Re: [README] net --> net-next merge

On Mon, 2012-05-07 at 23:41 -0400, David Miller wrote:
> I just merged net into net-next, there were two major conflicts.
> 
> 1) The known iwlwifi conflict due to the skb->truesize bug fix in
>    'net'.
> 
>    I used the conflict resolution posted by John and later by Stephen
>    when he resolved it for -next.
> 
>    John, please double-check my work.
> 
> 2) drivers/net/ethernet/intel/e1000e/param.c got a conflict in
>    the code which validates adapter->itr settings.
> 
>    The net-next side looked more sophisticated so that's what I
>    used.
> 
>    Jeff, please double-check and send me fixup patches if necessary.
> 
> Thanks.

Yeah, I will need to send a fixup patch.  I have something for you later
today.  Thanks Dave!

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)