netdev - [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 for Android: free password hash cracker in your pocket

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

Message-Id: <20120507.234113.2269441747611427613.davem@davemloft.net>
Date:	Mon, 07 May 2012 23:41:13 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	netdev@...r.kernel.org
CC:	sfr@...b.auug.org.au, linville@...driver.com,
	jeffrey.t.kirsher@...el.com
Subject: [README] net --> net-next merge

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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html