Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

linux-next: manual merge of the acpi tree with Linus' tree

1 view
Skip to first unread message

Stephen Rothwell

unread,
Jan 17, 2010, 10:00:02 PM1/17/10
to
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 s...@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Len Brown

unread,
Jan 20, 2010, 1:20:02 AM1/20/10
to
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Stephen Rothwell

unread,
Jan 20, 2010, 1:30:02 AM1/20/10
to
Hi Len,

On Wed, 20 Jan 2010 01:12:08 -0500 (EST) Len Brown <le...@kernel.org> wrote:
>
> I was carrying it because it was originally filed against ACPI,
> but now that Eric has it, I can drop my version.

OK, thanks.

0 new messages