From: Maxime Ripard <mripard@redhat.com>
To: Luben Tuikov <ltuikov89@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: Signed-off-by missing for commit in the drm-misc tree
Date: Wed, 22 Nov 2023 13:00:47 +0100 [thread overview]
Message-ID: <zuz7zpcjfqzeymfrn53tbhcsem5abqh2l4vcaqkxo5wbgoc742@bnxnkek3wv6t> (raw)
In-Reply-To: <ZVXSjt_1uWHuYXsq@phenom.ffwll.local>
[-- Attachment #1: Type: text/plain, Size: 2002 bytes --]
Hi Luben,
On Thu, Nov 16, 2023 at 09:27:58AM +0100, Daniel Vetter wrote:
> On Thu, Nov 16, 2023 at 09:11:43AM +0100, Maxime Ripard wrote:
> > On Tue, Nov 14, 2023 at 06:46:21PM -0500, Luben Tuikov wrote:
> > > On 2023-11-13 22:08, Stephen Rothwell wrote:
> > > > 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! :-)
> >
> > In this case, the best thing to do would indeed have been to ask the
> > drm-misc maintainers to merge drm-misc-fixes into drm-misc-next.
> >
> > We're doing that all the time, but we're not ubiquitous so you need to
> > ask us :)
> >
> > Also, dim should have caught that when you pushed the branch. Did you
> > use it?
>
> Yeah dim must be used, exactly to avoid these issues. Both for applying
> patches (so not git am directly, or cherry-picking from your own
> development branch), and for pushing. The latter is even checked for by
> the server (dim sets a special push flag which is very long and contains a
> very clear warning if you bypass it).
>
> If dim was used, this would be a bug in the dim script that we need to
> fix.
It would be very useful for you to explain what happened here so we
improve the tooling or doc and can try to make sure it doesn't happen
again
Maxime
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2023-11-22 12:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 20:55 linux-next: Signed-off-by missing for commit in the drm-misc tree Stephen Rothwell
2023-11-14 1:08 ` Luben Tuikov
2023-11-14 1:32 ` Luben Tuikov
2023-11-14 2:45 ` Stephen Rothwell
2023-11-14 2:56 ` Luben Tuikov
2023-11-14 3:08 ` Stephen Rothwell
2023-11-14 23:46 ` Luben Tuikov
2023-11-16 8:11 ` Maxime Ripard
2023-11-16 8:27 ` Daniel Vetter
2023-11-22 12:00 ` Maxime Ripard [this message]
2023-11-22 22:49 ` Luben Tuikov
2023-11-24 13:20 ` Jani Nikula
2023-11-24 22:08 ` Luben Tuikov
2023-11-16 9:22 ` Maxime Ripard
2023-11-17 3:25 ` Luben Tuikov
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=zuz7zpcjfqzeymfrn53tbhcsem5abqh2l4vcaqkxo5wbgoc742@bnxnkek3wv6t \
--to=mripard@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ltuikov89@gmail.com \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).