From: Mauro Carvalho Chehab <mchehab@kernel.org>
To: Sean Young <sean@mess.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Subject: Re: linux-next: Fixes tag needs some work in the v4l-dvb-next tree
Date: Sun, 23 May 2021 11:30:26 +0200 [thread overview]
Message-ID: <20210523113026.4a3a7f4f@coco.lan> (raw)
In-Reply-To: <20210523083636.GA15522@gofer.mess.org>
Em Sun, 23 May 2021 09:36:36 +0100
Sean Young <sean@mess.org> escreveu:
> Hi Mauro,
>
> On Sun, May 23, 2021 at 12:49:53PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > In commit
> >
> > 7c8a36e1fb30 ("media: rc: i2c: Fix an error message")
> >
> > Fixes tag
> >
> > Fixes: acaa34bf06e9 ('media: rc: implement zilog transmitter")
> >
> > has these problem(s):
> >
> > - Subject has leading but no trailing quotes
> > - Subject does not match target commit subject
> > Just use
> > git log -1 --format='Fixes: %h ("%s")'
>
> Now that we have media-staging, can the commit message be ammended?
If the patch didn't reach media_tree, yes, but this patch can't
be fixed anymore, as it is too old:
commit acaa34bf06e963f0b9481a3c16bfd6867e2369a0
Author: Sean Young <sean@mess.org>
AuthorDate: Sat Oct 21 08:16:47 2017 -0400
Commit: Mauro Carvalho Chehab <mchehab@kernel.org>
CommitDate: Thu Dec 14 09:58:20 2017 -0500
media: rc: implement zilog transmitter
We need to double-check why linux-next is detecting it as a new one.
-
Linux-next should be pulling media work from those tree branches:
- v4l-dvb-fixes/fixes, e. g.:
git://linuxtv.org/media_tree.git fixes
- v4l-dvb/master, e. g.:
git://linuxtv.org/media_tree.git master
- v4l-dvb-next/master, e. g.:
git://linuxtv.org/mchehab/media-next.git master
In the past, I was using media-next (a.k.a. v4l-dvb-next at linux-next
nomenclature) to solve some special cases like when I need to deal with
patches that depends on other trees, or when I want to submit a separate
PR for some patches.
-
After the last merge window, I modified my workflow in order to:
1. be able of correcting problems on media patches, if pointed after
being merged at linux-next;
2. keep picking patches during the merge window.
The change is simple: I'm now pushing non-fixes stuff initially at
media-next master branch. Outside the merge window, the contents of
this branch is identical to the contents of the media stage tree:
git://linuxtv.org/media_stage.git
But I'll freeze changes there at the end of -rc6.
A couple of days after media-stage is merged at linux-next
(via media-next/linux-next tree), if no issues, I merge the
patches back at media_tree.
If something gets wrong in the mean time, I simply rebase
media-stage, fixing the issue again and push it back to the
media-next/linux-next tree.
-
Now, I can't understand why this specific patch had a trouble
detected today, as it was this patch is already upstream:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=acaa34bf06e9
Apparently since 4.15-rc1:
$ git describe acaa34bf06e9
v4.15-rc1-204-gacaa34bf06e9
Thanks,
Mauro
next prev parent reply other threads:[~2021-05-23 9:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-23 2:49 linux-next: Fixes tag needs some work in the v4l-dvb-next tree Stephen Rothwell
2021-05-23 8:36 ` Sean Young
2021-05-23 9:30 ` Mauro Carvalho Chehab [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-30 21:55 Stephen Rothwell
2023-07-31 22:29 ` Sakari Ailus
2023-07-16 21:53 Stephen Rothwell
2023-03-20 21:23 Stephen Rothwell
2023-03-20 21:50 ` Sakari Ailus
2023-02-06 21:08 Stephen Rothwell
2022-05-13 8:49 Stephen Rothwell
2022-05-08 22:26 Stephen Rothwell
2022-05-08 22:54 ` Laurent Pinchart
2021-12-06 9:06 Stephen Rothwell
2021-12-06 9:27 ` Mauro Carvalho Chehab
2021-10-18 20:40 Stephen Rothwell
2021-07-22 22:51 Stephen Rothwell
2021-07-23 0:38 ` Yizhuo Zhai
2021-07-23 0:58 ` Stephen Rothwell
2021-07-23 2:19 ` Yizhuo Zhai
2021-07-23 7:04 ` Mauro Carvalho Chehab
2021-06-17 10:54 Stephen Rothwell
2020-06-11 21:17 Stephen Rothwell
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=20210523113026.4a3a7f4f@coco.lan \
--to=mchehab@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=sean@mess.org \
--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 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.