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,
David Howells <dhowells@redhat.com>,
Ben Skeggs <bskeggs@redhat.com>,
Martin Peres <martin.peres@labri.fr>,
Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Subject: linux-next: manual merge of the drm tree with the tree
Date: Thu, 4 Oct 2012 12:21:25 +1000 [thread overview]
Message-ID: <20121004122125.a501fc314016f967fd914c55@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau (lots of files) between commit 760285e7e7ab
("UAPI: (Scripted) Convert #include "..." to #include <path/...> in
drivers/gpu/") from Linus' tree and various commits from the drm tree.
There is a large reorganisation under drivers/gpu/nouveau in the drm
tree (which only appeared in linux-next today :-().
I used the drm tree versions of the files and but this needs to be done
properly.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-10-04 2:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 2:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-12-03 14:41 linux-next: manual merge of the drm tree with the tree Mark Brown
2014-01-08 1:50 Stephen Rothwell
2010-03-02 3:36 Stephen Rothwell
2009-09-30 1:58 Stephen Rothwell
2009-08-20 5:27 Stephen Rothwell
2009-08-10 5:14 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=20121004122125.a501fc314016f967fd914c55@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=dhowells@redhat.com \
--cc=dmitry_eremin@mentor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.peres@labri.fr \
/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).