From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Zhao Yakui <yakui.zhao@intel•com>, Eric Anholt <eric@anholt•net>
Subject: linux-next: manual merge of the acpi tree with Linus' tree
Date: Mon, 18 Jan 2010 13:56:24 +1100 [thread overview]
Message-ID: <20100118135624.011ee13b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 597 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-01-18 2:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-18 2:56 Stephen Rothwell [this message]
2010-01-20 6:12 ` linux-next: manual merge of the acpi tree with Linus' tree Len Brown
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=20100118135624.011ee13b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=eric@anholt$(echo .)net \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=yakui.zhao@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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