linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: Re: linux-next: manual merge of the trivial tree with the mfd tree
Date: Tue, 2 Oct 2012 11:35:19 +0200	[thread overview]
Message-ID: <20121002093519.GI12231@sortiz-mobl> (raw)
In-Reply-To: <alpine.LNX.2.00.1210020018340.23544@pobox.suse.cz>

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/

      reply	other threads:[~2012-10-02  9:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20121002093519.GI12231@sortiz-mobl \
    --to=sameo@linux.intel.com \
    --cc=haojian.zhuang@gmail.com \
    --cc=jkosina@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).