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>] [day] [month] [year] [list]
Date:	Wed, 23 Jul 2014 18:18:59 +1000
From:	Stephen Rothwell <>
To:	Andrew Morton <>,
	David Miller <>, <>
	Hariprasad Shenai <>
Subject: linux-next: manual merge of the akpm tree with the net-next tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/infiniband/hw/cxgb4/device.c between commit da388973d4a1
("iw_cxgb4: fix for 64-bit integer division") from the net-next tree
and commit "drivers/infiniband/hw/cxgb4/device.c: fix 32-bit builds"
from the akpm tree.

I fixed it up (the patches have the same intent, so I just kept the one
in the net-next tree) and can carry the fix as necessary (no action is

Stephen Rothwell          

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

Powered by blists - more mailing lists