From: Matthias Brugger <matthias.bgg@gmail.com>
To: CK Hu <ck.hu@mediatek.com>, Dave Airlie <airlied@gmail.com>,
Daniel Vetter <daniel.vetter@intel.com>,
dri-devel@lists.freedesktop.org,
linux-mediatek@lists.infradead.org
Subject: Re: Process identical patches in different tree
Date: Wed, 8 Jan 2020 12:14:03 +0100 [thread overview]
Message-ID: <e7c8313f-13cd-67b7-ad48-9f1d341bfcb6@gmail.com> (raw)
In-Reply-To: <1578365790.28495.13.camel@mtksdaap41>
Hi CK,
On 07/01/2020 03:56, CK Hu wrote:
> Hi, Dave, Daniel, Matthias:
>
> In mediatek-drm-next-5.6 [1], I've cherry-pick 3 patches from
> v5.5-next/soc [2] because some drm patches depend on these cmdq patches.
> So these cmdq patches exist in both tree now. I want to know how to
> process this case. I think we could choose one of below way:
>
> 1. Because these cmdq patches are identical in both tree, so each tree
> could do its own upstream and the there would be nothing happen when
> merge.
> 2. Let soc upstream first, and mediatek drm rebase on the latest
> mainline then upstream.
>
> Which one do you prefer?
>
What we would need is a stable branch with this commits that get merged by both
trees. If I understand correctly that otherwise the SHA of the commits would be
different and that would provoke merge conflicts.
We should not rely on one tree being merged before the other. AFAIK there is no
hard merge order between trees.
Regards,
Matthias
> [1]
> https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6
> [2]
> https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/log/?h=v5.5-next/soc
>
> Regards,
> CK
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
WARNING: multiple messages have this Message-ID (diff)
From: Matthias Brugger <matthias.bgg@gmail.com>
To: CK Hu <ck.hu@mediatek.com>, Dave Airlie <airlied@gmail.com>,
Daniel Vetter <daniel.vetter@intel.com>,
dri-devel@lists.freedesktop.org,
linux-mediatek@lists.infradead.org
Subject: Re: Process identical patches in different tree
Date: Wed, 8 Jan 2020 12:14:03 +0100 [thread overview]
Message-ID: <e7c8313f-13cd-67b7-ad48-9f1d341bfcb6@gmail.com> (raw)
In-Reply-To: <1578365790.28495.13.camel@mtksdaap41>
Hi CK,
On 07/01/2020 03:56, CK Hu wrote:
> Hi, Dave, Daniel, Matthias:
>
> In mediatek-drm-next-5.6 [1], I've cherry-pick 3 patches from
> v5.5-next/soc [2] because some drm patches depend on these cmdq patches.
> So these cmdq patches exist in both tree now. I want to know how to
> process this case. I think we could choose one of below way:
>
> 1. Because these cmdq patches are identical in both tree, so each tree
> could do its own upstream and the there would be nothing happen when
> merge.
> 2. Let soc upstream first, and mediatek drm rebase on the latest
> mainline then upstream.
>
> Which one do you prefer?
>
What we would need is a stable branch with this commits that get merged by both
trees. If I understand correctly that otherwise the SHA of the commits would be
different and that would provoke merge conflicts.
We should not rely on one tree being merged before the other. AFAIK there is no
hard merge order between trees.
Regards,
Matthias
> [1]
> https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-next-5.6
> [2]
> https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/log/?h=v5.5-next/soc
>
> Regards,
> CK
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-01-08 11:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 2:56 Process identical patches in different tree CK Hu
2020-01-07 2:56 ` CK Hu
2020-01-08 11:14 ` Matthias Brugger [this message]
2020-01-08 11:14 ` Matthias Brugger
2020-01-08 12:05 ` Matthias Brugger
2020-01-08 12:05 ` Matthias Brugger
2020-01-09 1:53 ` CK Hu
2020-01-09 1:53 ` CK Hu
2020-01-10 9:59 ` Matthias Brugger
2020-01-10 9:59 ` Matthias Brugger
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=e7c8313f-13cd-67b7-ad48-9f1d341bfcb6@gmail.com \
--to=matthias.bgg@gmail.com \
--cc=airlied@gmail.com \
--cc=ck.hu@mediatek.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-mediatek@lists.infradead.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.