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

Message-Id: <20121003141219.529f565dc7950ea12257026b@canb.auug.org.au>
Date:	Wed, 3 Oct 2012 14:12:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Samuel Ortiz <sameo@...ux.intel.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiri Kosina <jkosina@...e.cz>,
	Haojian Zhuang <haojian.zhuang@...il.com>
Subject: linux-next: manual merge of the mfd tree with Linus' tree

Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
drivers/video/backlight/88pm860x_bl.c between commit e1c9ac420ef1
("Revert "backlight: fix memory leak on obscure error path"") from Linus'
tree and commit a6ccdcd98c39 ("mfd: 88pm860x: Use REG resource for
backlight") from the mfd tree.

I used 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