All of lore.kernel.org
 help / color / mirror / Atom feed
From: CK Hu <ck.hu@mediatek.com>
To: Dave Airlie <airlied@gmail.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	 MatthiasBrugger <matthias.bgg@gmail.com>,
	<dri-devel@lists.freedesktop.org>,
	<linux-mediatek@lists.infradead.org>
Subject: Process identical patches in different tree
Date: Tue, 7 Jan 2020 10:56:30 +0800	[thread overview]
Message-ID: <1578365790.28495.13.camel@mtksdaap41> (raw)

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?

[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: CK Hu <ck.hu@mediatek.com>
To: Dave Airlie <airlied@gmail.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	 MatthiasBrugger <matthias.bgg@gmail.com>,
	<dri-devel@lists.freedesktop.org>,
	<linux-mediatek@lists.infradead.org>
Subject: Process identical patches in different tree
Date: Tue, 7 Jan 2020 10:56:30 +0800	[thread overview]
Message-ID: <1578365790.28495.13.camel@mtksdaap41> (raw)

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?

[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

             reply	other threads:[~2020-01-07  2:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-07  2:56 CK Hu [this message]
2020-01-07  2:56 ` Process identical patches in different tree CK Hu
2020-01-08 11:14 ` Matthias Brugger
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=1578365790.28495.13.camel@mtksdaap41 \
    --to=ck.hu@mediatek.com \
    --cc=airlied@gmail.com \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    /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.