lkml.org 
[lkml]   [2012]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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


\
 
 \ /
  Last update: 2012-10-02 01:01    [W:0.035 / U:0.716 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site