[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f1b21cbd-5bb6-4030-ae7d-a0ca2fbc76a9@gmail.com>
Date: Tue, 14 Nov 2023 18:46:21 -0500
From: Luben Tuikov <ltuikov89@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@...ll.ch>,
Intel Graphics <intel-gfx@...ts.freedesktop.org>,
DRI <dri-devel@...ts.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: Signed-off-by missing for commit in the drm-misc tree
On 2023-11-13 22:08, Stephen Rothwell wrote:
> Hi Luben,
>
> BTW, cherry picking commits does not avoid conflicts - in fact it can
> cause conflicts if there are further changes to the files affected by
> the cherry picked commit in either the tree/branch the commit was
> cheery picked from or the destination tree/branch (I have to deal with
> these all the time when merging the drm trees in linux-next). Much
> better is to cross merge the branches so that the patch only appears
> once or have a shared branches that are merged by any other branch that
> needs the changes.
>
> I understand that things are not done like this in the drm trees :-(
Hi Stephen,
Thank you for the clarification--understood. I'll be more careful in the future.
Thanks again! :-)
--
Regards,
Luben
Download attachment "OpenPGP_0x4C15479431A334AF.asc" of type "application/pgp-keys" (665 bytes)
Download attachment "OpenPGP_signature.asc" of type "application/pgp-signature" (237 bytes)
Powered by blists - more mailing lists