From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
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: linux-next: manual merge of the staging tree with the drm tree
Date: Fri, 20 Mar 2009 15:38:26 +1100 [thread overview]
Message-ID: <20090320153826.e6f1d760.sfr@canb.auug.org.au> (raw)
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).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/gpu/drm/Makefile
index 4ec5061,9186cfd..0000000
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -11,7 -11,7 +11,7 @@@ drm-y := drm_auth.o drm_bufs.o dr
drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \
drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
drm_crtc.o drm_crtc_helper.o drm_modes.o drm_edid.o \
- drm_info.o drm_debugfs.o
- drm_global.o
++ drm_info.o drm_debugfs.o drm_global.o
drm-$(CONFIG_COMPAT) += drm_ioc32.o
next reply other threads:[~2009-03-20 4:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 4:38 Stephen Rothwell [this message]
2009-03-20 5:15 ` linux-next: manual merge of the staging tree with the drm tree Greg KH
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=20090320153826.e6f1d760.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=bgamari@gmail$(echo .)com \
--cc=eric@anholt$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rpurdie@linux$(echo .)intel.com \
--cc=thellstrom@vmware$(echo .)com \
/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