* linux-next: manual merge of the trivial tree with the mfd tree
@ 2012-09-12 3:43 Stephen Rothwell
2012-10-01 22:21 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-09-12 3:43 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel, Haojian Zhuang, Samuel Ortiz
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the mfd tree
2012-09-12 3:43 linux-next: manual merge of the trivial tree with the mfd tree Stephen Rothwell
@ 2012-10-01 22:21 ` Jiri Kosina
2012-10-02 9:35 ` Samuel Ortiz
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Kosina @ 2012-10-01 22:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Haojian Zhuang, Samuel Ortiz
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the mfd tree
2012-10-01 22:21 ` Jiri Kosina
@ 2012-10-02 9:35 ` Samuel Ortiz
0 siblings, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2012-10-02 9:35 UTC (permalink / raw)
To: Jiri Kosina; +Cc: Stephen Rothwell, linux-next, linux-kernel, Haojian Zhuang
Hi Jiri,
On Tue, Oct 02, 2012 at 12:21:16AM +0200, Jiri Kosina wrote:
> 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.
Thanks for the heads up.
I usually fix the merge conflicts in a specific branch for-next-merge and
give the URL to Linus, in case he needs it.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-02 9:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-12 3:43 linux-next: manual merge of the trivial tree with the mfd tree Stephen Rothwell
2012-10-01 22:21 ` Jiri Kosina
2012-10-02 9:35 ` Samuel Ortiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).