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  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:	Mon, 24 Dec 2012 09:56:14 +1100
From:	Stephen Rothwell <>
To:	Greg KH <>
	Bill Pemberton <>,
	Wolfram Sang <>,
	Jean Delvare <>
Subject: Re: linux-next: manual merge of the driver-core.current tree with
 Linus' tree

Hi Greg,

On Mon, 24 Dec 2012 09:52:00 +1100 Stephen Rothwell <> wrote:
> Today's linux-next merge of the driver-core.current tree got conflicts
> in 21 files in drivers/i2c between commit 0b255e927d47 ("i2c: remove
> __dev* attributes from subsystem") from Linus' tree and commit
> eeb30d064414 ("Drivers: i2c: remove __dev* attributes") from the
> driver-core.current tree.
> I fixed it up (taking a mixture of both commits) and can carry the fix as
> necessary (no action is required).

BTW, Greg, the patch in your tree to drivers/i2c/busses/i2c-au1550.c is
incorrect and would not build.

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists