archive mirror
 help / color / mirror / Atom feed
* linus-next: update to the drm-intel-fixes tree
@ 2013-09-03 23:45 Stephen Rothwell
  2013-09-04  9:05 ` Daniel Vetter
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-09-03 23:45 UTC (permalink / raw)
  To: Daniel Vetter, intel-gfx, dri-devel; +Cc: Dave Airlie, linux-next

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

Hi Daniel,

This morning after fetching the drm-intel-fixes tree, I have discovered
that you have just added a whole set of patches on top of Dave's drm tree
and made that the drm-intel-fixes tree.  I understood that this tree was
for fixes to Linus' tree for the current release cycle.  Given that
Dave's tree has not been merged by Linus (yet), this is a bit
inconsistent.  Not only that, but now if I merge your tree early (which
is what I do with the -fixes trees), I will also merge all of Dave's
tree.  That in turn would mean that I would have missed the (what would
have been automatically applied) merge for I am carrying for Dave's
tree.  :-(

I am going to have to drop your -fixes tree for today.

If these are fixes for stuff in Linus' tree, then they should have been
based on Linus' tree - if they are fixes for Dave's tree, then they
should have been in your drm-intel tree, right?

(fetches more trees ...)
And now, I discover that they are the latter :-)

So your -fixes tree will be dropped, but all those patches will still be
merged via you drm-intel tree.
Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-09-05 12:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-03 23:45 linus-next: update to the drm-intel-fixes tree Stephen Rothwell
2013-09-04  9:05 ` Daniel Vetter
2013-09-05 12:57   ` Daniel Vetter

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).