From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jason Wessel <jason.wessel@windriver•com>
Subject: linux-next: manual merge of the drm tree with the kgdb tree
Date: Wed, 13 Oct 2010 13:13:03 +1100 [thread overview]
Message-ID: <20101013131303.c044aa88.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 967 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/drm_fb_helper.c, drivers/gpu/drm/i915/intel_display.c,
drivers/gpu/drm/nouveau/nv04_crtc.c, drivers/gpu/drm/nouveau/nv50_crtc.c,
drivers/gpu/drm/radeon/atombios_crtc.c,
drivers/gpu/drm/radeon/radeon_legacy_crtc.c,
drivers/gpu/drm/radeon/radeon_mode.h and include/drm/drm_crtc_helper.h
between commit 92b182171492dc1ac626e6f24ff3a7c917217aa0 ("drm,kdb,kms:
Add an enter argument to mode_set_base_atomic() API") from the kgdb tree
and commit 413d45d3627be4748058dea697718ed6fb88bd01 ("drm, kdb, kms: Add
an enter argument to mode_set_base_atomic() API") from the drm tree.
Supposedly the same patch, but not :-(. I fixed it up by using the
version from the drm tree (since that has slightly later author date).
Hope I got it right :-)
Please sort this out.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-10-13 2:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-13 2:13 Stephen Rothwell [this message]
2010-10-13 12:25 ` linux-next: manual merge of the drm tree with the kgdb tree Jason Wessel
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=20101013131303.c044aa88.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=jason.wessel@windriver$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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