linux-kernel - linux-next: manual merge of the driver-core tree with the mfd 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-next>] [day] [month] [year] [list]

Message-Id: <20121129150044.3795f21cd3913abc0c10f45c@canb.auug.org.au>
Date:	Thu, 29 Nov 2012 15:00:44 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the driver-core tree with the mfd tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/mfd/tps65090.c between various commits from the mfd tree and
commits 84449216b01f ("mfd: remove use of __devexit_p"), f791be492f76
("mfd: remove use of __devinit") and 4740f73fe538 ("mfd: remove use of
__devexit") from the driver-core tree.

I fixed it up (by using the mfd tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped