From: Russell King <rmk@armlinux.org.uk>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
intel-gfx <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
linux-next <linux-next@vger.kernel.org>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the arm tree
Date: Wed, 22 Jun 2016 09:21:11 +0100 [thread overview]
Message-ID: <20160622082110.GM22276@flint.armlinux.org.uk> (raw)
In-Reply-To: <CAKMK7uFDQPdUinsDQaFxCW31k5T9qXoiNkzQ-CuqYQPPbz99pA@mail.gmail.com>
On Wed, Jun 22, 2016 at 09:31:18AM +0200, Daniel Vetter wrote:
> On Wed, Jun 22, 2016 at 3:47 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> > drivers/gpu/drm/sti/sti_drv.c
> >
> > between commit:
> >
> > 062993b15e8e ("drm: convert DT component matching to component_match_add_release()")
>
> Why did that one end up in the arm tree? Should it go in through
> drm-misc instead?
Mine is part of a three part patch series which is part of the component
helper updates (which I'm the author and maintainer of).
Then someone came up with an alternative way of some of part of it.
You can't merge the above DRM part, because that means you also need to
merge patch 1, which is core component stuff.
--
Russell King
ARM architecture Linux Kernel maintainer
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-06-22 8:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 1:47 linux-next: manual merge of the drm-misc tree with the arm tree Stephen Rothwell
2016-06-22 7:31 ` Daniel Vetter
2016-06-22 8:21 ` Russell King [this message]
2016-06-22 8:23 ` Daniel Vetter
2016-06-22 8:43 ` Russell King
2016-06-22 12:11 ` [Intel-gfx] " Daniel Vetter
-- strict thread matches above, loose matches on Subject: below --
2016-07-13 2:35 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=20160622082110.GM22276@flint.armlinux.org.uk \
--to=rmk@armlinux.org.uk \
--cc=benjamin.gaignard@linaro.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).