linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* drm pull waiting on other trees
@ 2014-12-12  5:28 Dave Airlie
  2014-12-12  7:13 ` Simon Horman
  0 siblings, 1 reply; 3+ messages in thread
From: Dave Airlie @ 2014-12-12  5:28 UTC (permalink / raw)
  To: Joerg Roedel, Simon Horman; +Cc: Linus Torvalds, LKML

Hey Simon, Joerg,

I've got merges from you guys in my tree that don't seem to be in
Linus's tree yet, I'm a bit concerned as the drm merge is a large one
and I'd like to have it in Linus' tree ASAP.

The rockchip iommu and bunch of shmobile/rcar changes are what I
believe is currently stopping me.

Dave.

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

* Re: drm pull waiting on other trees
  2014-12-12  5:28 drm pull waiting on other trees Dave Airlie
@ 2014-12-12  7:13 ` Simon Horman
  2014-12-13 22:27   ` Linus Torvalds
  0 siblings, 1 reply; 3+ messages in thread
From: Simon Horman @ 2014-12-12  7:13 UTC (permalink / raw)
  To: Dave Airlie
  Cc: Joerg Roedel, Linus Torvalds, LKML, Arnd Bergmann,
	Olof Johansson, Kevin Hilman

Hi Dave,

On Fri, Dec 12, 2014 at 03:28:06PM +1000, Dave Airlie wrote:
> Hey Simon, Joerg,
> 
> I've got merges from you guys in my tree that don't seem to be in
> Linus's tree yet, I'm a bit concerned as the drm merge is a large one
> and I'd like to have it in Linus' tree ASAP.
> 
> The rockchip iommu and bunch of shmobile/rcar changes are what I
> believe is currently stopping me.

If you give me a specific tag or commit id I can investigate further but
I'm assuming it is renesas-dt-du-for-v3.19 (0ee56d403549fd97d) then it has
been accepted by the by Arnd (CCed) and I believe he or one of the other
Arm SoC maintainers (also CCed) have a plan to submit it to Linus (most
likely as part of a larger pull-request).

FWIW, I would also very much like the shmobile/rcar changes in Linus's tree :)

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

* Re: drm pull waiting on other trees
  2014-12-12  7:13 ` Simon Horman
@ 2014-12-13 22:27   ` Linus Torvalds
  0 siblings, 0 replies; 3+ messages in thread
From: Linus Torvalds @ 2014-12-13 22:27 UTC (permalink / raw)
  To: Simon Horman
  Cc: Dave Airlie, Joerg Roedel, LKML, Arnd Bergmann, Olof Johansson,
	Kevin Hilman

On Thu, Dec 11, 2014 at 11:13 PM, Simon Horman <horms@verge.net.au> wrote:
>
> If you give me a specific tag or commit id I can investigate further but
> I'm assuming it is renesas-dt-du-for-v3.19 (0ee56d403549fd97d) then it has
> been accepted by the by Arnd (CCed) and I believe he or one of the other
> Arm SoC maintainers (also CCed) have a plan to submit it to Linus (most
> likely as part of a larger pull-request).

That commit is in my tree, and has been for a few days.

The IOMMU tree was also merged yesterday, so hopefully everything drm
needs is there now,

                   Linus

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

end of thread, other threads:[~2014-12-13 22:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-12  5:28 drm pull waiting on other trees Dave Airlie
2014-12-12  7:13 ` Simon Horman
2014-12-13 22:27   ` Linus Torvalds

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