linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org,
	Thomas Hellstrom <thellstrom@vmware.com>,
	Richard Purdie <rpurdie@linux.intel.com>,
	Ben Gamari <bgamari@gmail.com>, Eric Anholt <eric@anholt.net>,
	Dave Airlie <airlied@linux.ie>
Subject: Re: linux-next: manual merge of the staging tree with the drm tree
Date: Thu, 19 Mar 2009 22:15:01 -0700	[thread overview]
Message-ID: <20090320051501.GB3698@kroah.com> (raw)
In-Reply-To: <20090320153826.e6f1d760.sfr@canb.auug.org.au>

On Fri, Mar 20, 2009 at 03:38:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/gpu/drm/Makefile between commit
> 955b12def42e83287c1bdb1411d99451753c1391 ("drm: Convert proc files to
> seq_file and introduce debugfs") from the drm tree and commit
> 69a914df73e04807248f21b6738dab9cf9e3c094 ("drm: Add a tracker for global
> objects") from the staging tree.
> 
> Just trivial overlapping additions.  I fixed it up (see below) and can
> carry the fix as necessary.
> 
> However, I do need to wonder why changes to drivers/gpu are appearing in
> the staging tree - I assumed that its updates would be restricted to the
> drivers/staging directory (as much as possible).

There is a driver in the staging directory that needs these drm core
changes.  I've posted these to David and the drm list and lkml, and we
are currently discussing their future.  If David ends up rejecting them,
I'll drop them from my tree.

thanks,

greg k-h

  reply	other threads:[~2009-03-20  5:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-20  4:38 linux-next: manual merge of the staging tree with the drm tree Stephen Rothwell
2009-03-20  5:15 ` Greg KH [this message]
2009-03-20  5:42   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2014-03-19  4:22 Stephen Rothwell
2016-06-20  4:33 Stephen Rothwell
2016-07-25  6:29 ` Stephen Rothwell
2018-11-20  2:16 Stephen Rothwell
2018-11-20  8:54 ` Greg KH

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=20090320051501.GB3698@kroah.com \
    --to=greg@kroah.com \
    --cc=airlied@linux.ie \
    --cc=bgamari@gmail.com \
    --cc=eric@anholt.net \
    --cc=linux-next@vger.kernel.org \
    --cc=rpurdie@linux.intel.com \
    --cc=sfr@canb.auug.org.au \
    --cc=thellstrom@vmware.com \
    /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).