linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Zhao Yakui <yakui.zhao@intel.com>, Eric Anholt <eric@anholt.net>
Subject: Re: linux-next: manual merge of the acpi tree with Linus' tree
Date: Wed, 20 Jan 2010 01:12:08 -0500 (EST)	[thread overview]
Message-ID: <alpine.LFD.2.00.1001200111250.4265@localhost.localdomain> (raw)
In-Reply-To: <20100118135624.011ee13b.sfr@canb.auug.org.au>

Thanks Stephen,
I was carrying it because it was originally filed against ACPI,
but now that Eric has it, I can drop my version.

cheers,
Len Brown, Intel Open Source Technology Center

On Mon, 18 Jan 2010, Stephen Rothwell wrote:

> Hi Len,
> 
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/gpu/drm/i915/intel_lvds.c between commit
> 40f33a92100f4d9b6e85ad642100cfe42d7ff57d ("drm/i915: Add HP
> nx9020/SamsungSX20S to ACPI LID quirk list") from Linus' tree and commit
> 25fbdd0b66c193607ed058662e06d29345766c17 ("drm/i915: Add HP
> nx9020/Samsung SX20S to ACPI LID quirk list") from the acpi tree.
> 
> Clearly two (slightly different) versions of the same change.  I used the
> version from the drm tree.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 

  reply	other threads:[~2010-01-20  6:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-18  2:56 linux-next: manual merge of the acpi tree with Linus' tree Stephen Rothwell
2010-01-20  6:12 ` Len Brown [this message]
2010-01-20  6:29   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2012-10-07 23:49 Stephen Rothwell
2012-10-04  1:40 Stephen Rothwell
2012-03-30  0:46 Stephen Rothwell
2010-05-12  1:21 Stephen Rothwell
2009-12-23 22:11 Stephen Rothwell
2009-12-23 22:39 ` Stephen Rothwell
2009-12-24  0:02   ` Stephen Rothwell
2009-12-24  5:02   ` Len Brown
2009-12-24 12:26     ` Stephen Rothwell
2009-12-24 20:05       ` Len Brown
2009-12-25  0:19         ` Stephen Rothwell
2009-12-16  2:00 Stephen Rothwell
2009-03-30  3:20 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=alpine.LFD.2.00.1001200111250.4265@localhost.localdomain \
    --to=lenb@kernel.org \
    --cc=eric@anholt.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=yakui.zhao@intel.com \
    /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).