linux-kernel - Re: linux-next: manual merge of the trivial 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LNX.2.00.1210020018340.23544@pobox.suse.cz>
Date:	Tue, 2 Oct 2012 00:21:16 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Haojian Zhuang <haojian.zhuang@...il.com>,
	Samuel Ortiz <sameo@...ux.intel.com>
Subject: Re: linux-next: manual merge of the trivial tree with the mfd tree

On Wed, 12 Sep 2012, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd:
> 88pm860x: Use REG resource for backlight") from the mfd tree and commit
> e1c9ac420ef1 ("Revert "backlight: fix memory leak on obscure error
> path"") from the trivial tree.
> 
> I just used the version from the mfd tree and can carry the fix as
> necessary (no action is required).

Samuel,

Linus has just pulled from trivial.git, so could you please make sure this 
is taken care of (*) in your next pull request? Thanks a lot!

(*) either by resolving the conflict in your tree first, or mentioning it 
explicitly in your pull request to Linus.

-- 
Jiri Kosina
SUSE Labs
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/