From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
"open list:DMA BUFFER SHARING FRAMEWORK"
<linux-media@vger.kernel.org>
Subject: Re: [PATCH v3 0/8] R-Car DU: Support CRC calculation
Date: Sun, 06 May 2018 15:48:24 +0300 [thread overview]
Message-ID: <190704872.I3Z8hYgVki@avalon> (raw)
In-Reply-To: <20180505120513.59e05e93@vento.lan>
Hi Mauro,
On Saturday, 5 May 2018 18:05:13 EEST Mauro Carvalho Chehab wrote:
> Em Sat, 05 May 2018 17:06:50 +0300 Laurent Pinchart escreveu:
> > On Thursday, 3 May 2018 16:45:36 EEST Daniel Vetter wrote:
> >> On Thu, May 3, 2018 at 2:06 PM, Laurent Pinchart wrote:
> >>> Hi Dave,
> >>>
> >>> Ping ?
> >>
> >> Not aware of any crc core work going on in drm, so has my ack.
> >
> > Thank you.
> >
> >> Worst case we do a topic branch or something like that (since I guess
> >> you'll do a pull request anyway on the v4l side).
> >
> > That would unfortunately not be possible, as Mauro cherry-picks patches
> > instead of merging pull requests. In rare cases I can ask for a
> > pull-request to be merged as-is, but it's too late in this case as the
> > previous pull request that this series is based on has been
> > cherry-picked, not merged.
>
> I probably missed something, but I fail to see what's the problem.
>
> If DRM needs a patch that was already merged on our tree, I can gladly
> create a stable branch/tag for it - well, media master branch is stable,
> but I can add a tag there just after the patch DRM needs, in order
> to avoid them to merge from us at some random point.
>
> If otherwise we need a patch applied at DRM, they can do the same:
> create a branch/tag, and I can pull from it.
Well, my assumption is that Dave would rather not pull the whole linux-media
tree in the DRM tree. That's easily prevented when handling pull requests
through a merge instead of a cherry-pick operation, in that case I can just
base a patch series on top of -rc1 and send a pull request to both of you. The
linux-media and DRM tree will merge cleanly in Linus' tree as they will both
contain the same branch.
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Daniel Vetter <daniel@ffwll.ch>, Dave Airlie <airlied@gmail.com>,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
dri-devel <dri-devel@lists.freedesktop.org>,
"open list:DMA BUFFER SHARING FRAMEWORK"
<linux-media@vger.kernel.org>
Subject: Re: [PATCH v3 0/8] R-Car DU: Support CRC calculation
Date: Sun, 06 May 2018 15:48:24 +0300 [thread overview]
Message-ID: <190704872.I3Z8hYgVki@avalon> (raw)
In-Reply-To: <20180505120513.59e05e93@vento.lan>
Hi Mauro,
On Saturday, 5 May 2018 18:05:13 EEST Mauro Carvalho Chehab wrote:
> Em Sat, 05 May 2018 17:06:50 +0300 Laurent Pinchart escreveu:
> > On Thursday, 3 May 2018 16:45:36 EEST Daniel Vetter wrote:
> >> On Thu, May 3, 2018 at 2:06 PM, Laurent Pinchart wrote:
> >>> Hi Dave,
> >>>
> >>> Ping ?
> >>
> >> Not aware of any crc core work going on in drm, so has my ack.
> >
> > Thank you.
> >
> >> Worst case we do a topic branch or something like that (since I guess
> >> you'll do a pull request anyway on the v4l side).
> >
> > That would unfortunately not be possible, as Mauro cherry-picks patches
> > instead of merging pull requests. In rare cases I can ask for a
> > pull-request to be merged as-is, but it's too late in this case as the
> > previous pull request that this series is based on has been
> > cherry-picked, not merged.
>
> I probably missed something, but I fail to see what's the problem.
>
> If DRM needs a patch that was already merged on our tree, I can gladly
> create a stable branch/tag for it - well, media master branch is stable,
> but I can add a tag there just after the patch DRM needs, in order
> to avoid them to merge from us at some random point.
>
> If otherwise we need a patch applied at DRM, they can do the same:
> create a branch/tag, and I can pull from it.
Well, my assumption is that Dave would rather not pull the whole linux-media
tree in the DRM tree. That's easily prevented when handling pull requests
through a merge instead of a cherry-pick operation, in that case I can just
base a patch series on top of -rc1 and send a pull request to both of you. The
linux-media and DRM tree will merge cleanly in Linus' tree as they will both
contain the same branch.
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2018-05-06 12:48 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-28 20:50 [PATCH v3 0/8] R-Car DU: Support CRC calculation Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-04-28 20:50 ` [PATCH v3 1/8] v4l: vsp1: Use SPDX license headers Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-04-28 20:50 ` [PATCH v3 2/8] v4l: vsp1: Share the CLU, LIF and LUT set_fmt pad operation code Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-04-28 20:50 ` [PATCH v3 3/8] v4l: vsp1: Reset the crop and compose rectangles in the set_fmt helper Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-04-28 20:50 ` [PATCH v3 4/8] v4l: vsp1: Document the vsp1_du_atomic_config structure Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-04-28 20:50 ` [PATCH v3 5/8] v4l: vsp1: Extend the DU API to support CRC computation Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-05-02 7:20 ` jacopo mondi
2018-05-02 7:20 ` jacopo mondi
2018-04-28 20:50 ` [PATCH v3 6/8] v4l: vsp1: Add support for the DISCOM entity Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-04-28 20:50 ` [PATCH v3 7/8] v4l: vsp1: Integrate DISCOM in display pipeline Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-05-02 7:22 ` jacopo mondi
2018-05-02 7:22 ` jacopo mondi
2018-04-28 20:50 ` [PATCH v3 8/8] drm: rcar-du: Add support for CRC computation Laurent Pinchart
2018-04-28 20:50 ` Laurent Pinchart
2018-05-03 12:06 ` [PATCH v3 0/8] R-Car DU: Support CRC calculation Laurent Pinchart
2018-05-03 12:06 ` Laurent Pinchart
2018-05-03 13:45 ` Daniel Vetter
2018-05-03 13:45 ` Daniel Vetter
2018-05-04 0:02 ` Dave Airlie
2018-05-04 0:02 ` Dave Airlie
2018-05-05 14:06 ` Laurent Pinchart
2018-05-05 14:06 ` Laurent Pinchart
2018-05-05 15:05 ` Mauro Carvalho Chehab
2018-05-05 15:05 ` Mauro Carvalho Chehab
2018-05-06 12:48 ` Laurent Pinchart [this message]
2018-05-06 12:48 ` Laurent Pinchart
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=190704872.I3Z8hYgVki@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kieran.bingham@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.