+ Tvrtko
Quoting Christoph Hellwig (2022-04-21 08:47:38)
On Thu, Apr 21, 2022 at 04:57:34AM +0000, Wang, Zhi A wrote:
Is it possible that I can send two different pull based on the same branch? I was thinking I can remove this line in the original patch and then add a small patch to add this line back on the top. Then make two different tags before and after that small patch, send one pull with tag that includes that small patch to i915 and the other pull with tag that doesn't includes it to VFIO?
Yes, you can do that as long as the small fixup commit is the very last one.
On Thu, Apr 21, 2022 at 09:41:30AM +0300, Joonas Lahtinen wrote:
- Tvrtko
Quoting Christoph Hellwig (2022-04-21 08:47:38)
On Thu, Apr 21, 2022 at 04:57:34AM +0000, Wang, Zhi A wrote:
Is it possible that I can send two different pull based on the same branch? I was thinking I can remove this line in the original patch and then add a small patch to add this line back on the top. Then make two different tags before and after that small patch, send one pull with tag that includes that small patch to i915 and the other pull with tag that doesn't includes it to VFIO?
Yes, you can do that as long as the small fixup commit is the very last one.
Keep in mind when doing this that best practice is for every commit to compile.
So if you add a commit with a new #include to this topic branch that commit will not compile.
Best practice is to fix the compilation breakage in a merge commit, either created by you or created by your upstream.
Jason
On 4/21/22 1:14 PM, Jason Gunthorpe wrote:
On Thu, Apr 21, 2022 at 09:41:30AM +0300, Joonas Lahtinen wrote:
- Tvrtko
Quoting Christoph Hellwig (2022-04-21 08:47:38)
On Thu, Apr 21, 2022 at 04:57:34AM +0000, Wang, Zhi A wrote:
Is it possible that I can send two different pull based on the same branch? I was thinking I can remove this line in the original patch and then add a small patch to add this line back on the top. Then make two different tags before and after that small patch, send one pull with tag that includes that small patch to i915 and the other pull with tag that doesn't includes it to VFIO?
Yes, you can do that as long as the small fixup commit is the very last one.
Keep in mind when doing this that best practice is for every commit to compile.
So if you add a commit with a new #include to this topic branch that commit will not compile.
Best practice is to fix the compilation breakage in a merge commit, either created by you or created by your upstream.
I see. Let me update it.
Jason
dri-devel@lists.freedesktop.org
-
Jason Gunthorpe -
Joonas Lahtinen -
Wang, Zhi A