linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Darren Hart <dvhart@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Philippe Coval <philippe.coval@open.eurogiciel.org>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dmitry Tunin <hanipouspilot@gmail.com>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with Linus' tree
Date: Tue, 2 Jun 2015 20:27:50 -0700	[thread overview]
Message-ID: <20150603032750.GA49670@vmdeb7> (raw)
In-Reply-To: <20150602160723.3b519d63@canb.auug.org.au>

On Tue, Jun 02, 2015 at 04:07:23PM +1000, Stephen Rothwell wrote:
> Hi Darren,
> 
> Today's linux-next merge of the drivers-x86 tree got a conflict in
> drivers/platform/x86/ideapad-laptop.c between commit 9b071a43553d
> ("ideapad_laptop: Add Lenovo G40-30 to devices without radio switch")
> from Linus' tree and commit 4fa9dabcffc8 ("ideapad_laptop: Lenovo
> G50-30 fix rfkill reports wireless blocked") from the drivers-x86 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the heads' up. This happens because my -next branch is based on *-rc1
as I think was recommended at the last kernel summit. Since rc1 I sent Linus the
G50-30, but by rc6 I didn't feel good about sending the similar G50-30 fix, so
that is in my rc1 branch.

I am happy to rebase my -next on rc6 to avoid the conflict, but I believe the
rebase is considered poor practice.

You said no action required, but if there is something I can do to avoid this
kind of manual effort on your part (and a manual merge by Linus in the upcoming
merge window), I'm happy to update my process to accommodate.

Thanks,

-- 
Darren Hart
Intel Open Source Technology Center

  reply	other threads:[~2015-06-03  3:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-02  6:07 linux-next: manual merge of the drivers-x86 tree with Linus' tree Stephen Rothwell
2015-06-03  3:27 ` Darren Hart [this message]
2015-06-03  4:04   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-03-08  2:34 Stephen Rothwell
2024-03-08  2:19 Stephen Rothwell
2024-03-01  3:14 Stephen Rothwell
2024-02-08  1:57 Stephen Rothwell
2024-01-02  2:30 Stephen Rothwell
2018-10-29  3:29 Stephen Rothwell
2018-10-29  9:34 ` Andy Shevchenko
2016-01-15  1:56 Stephen Rothwell
2012-05-31  2:06 Stephen Rothwell
2011-04-08  5:26 Stephen Rothwell
2011-03-24  2:48 Stephen Rothwell
2011-03-24  2:52 ` Matthew Garrett
2010-08-25  1:22 Stephen Rothwell

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=20150603032750.GA49670@vmdeb7 \
    --to=dvhart@infradead.org \
    --cc=hanipouspilot@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=philippe.coval@open.eurogiciel.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).