From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>
Subject: linux-next: manual merge of the drm tree
Date: Thu, 10 Jul 2008 16:10:56 +1000 [thread overview]
Message-ID: <20080710161056.6e65c8b9.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in include/Kbuild
between commit 4896a02e1e6d4f0ae5b23c24eff0ba10e26caab4 ("kbuild: only
one call for include/ in make headers_*") from the kbuild tree and commit
ae74c0f7f4abab0cf1e943c562b52df8868dc1ee ("drm: reorganise drm tree to be
more future proof") from the drm tree.
The former removes a line just where the latter is adding one. I fixed it
up and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-10 6:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-10 6:10 Stephen Rothwell [this message]
2008-10-17 5:56 linux-next: manual merge of the drm tree Stephen Rothwell
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the drm tree Thierry Reding
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=20080710161056.6e65c8b9.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=linux-next@vger.kernel.org \
--cc=sam@ravnborg.org \
/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).