From: Jan Kara <jack@suse.cz>
To: Jens Axboe <axboe@kernel.dk>
Cc: Jan Kara <jack@suse.cz>, Paolo Valente <paolo.valente@linaro.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Jia Cheng Hu <jia.jiachenghu@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: Fixes tag needs some work in the block tree
Date: Tue, 26 Jan 2021 17:01:56 +0100 [thread overview]
Message-ID: <20210126160156.GF10966@quack2.suse.cz> (raw)
In-Reply-To: <a2d6399c-ba61-472b-1bf2-aa261d7dbbbe@kernel.dk>
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
On Tue 26-01-21 08:47:55, Jens Axboe wrote:
> On 1/26/21 6:29 AM, Jan Kara wrote:
> > On Mon 25-01-21 11:39:50, Jens Axboe wrote:
> >> On 1/25/21 11:35 AM, Paolo Valente wrote:
> >>>
> >>>
> >>>> Il giorno 25 gen 2021, alle ore 10:40, Stephen Rothwell <sfr@canb.auug.org.au> ha scritto:
> >>>>
> >>>> Hi all,
> >>>>
> >>>> In commit
> >>>>
> >>>> d4fc3640ff36 ("block, bfq: set next_rq to waker_bfqq->next_rq in waker injection")
> >>>>
> >>>> Fixes tag
> >>>>
> >>>> Fixes: c5089591c3ba ("block, bfq: detect wakers and unconditionally inject their I/O")
> >>>>
> >>>> has these problem(s):
> >>>>
> >>>> - Target SHA1 does not exist
> >>>>
> >>>> Maybe you meant
> >>>>
> >>>> Fixes: 13a857a4c4e8 ("block, bfq: detect wakers and unconditionally inject their I/O")
> >>>>
> >>>
> >>> Hi Jens,
> >>> how to proceed in such a case (with patches already applied by you)?
> >>> Shall I send you a v2 with only this change?
> >>
> >> We just have to ignore it... But in the future, always double check that
> >> you are using the right shas, not some sha from an internal tree.
> >
> > FWIW I have a commit hook in my git tree that just refuses a commit with
> > unknown Fixes tag SHA. Exactly to catch such mishaps in the patches I
> > merge...
>
> That's not a bad idea, would help catch it upfront. Can you share the
> hook?
Sure, attached. Note that the hook just gets commit ID from the Fixes tag
and formats it with 12 commit ID digits and appropriate commit subject.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
[-- Attachment #2: commit-msg --]
[-- Type: text/plain, Size: 700 bytes --]
#!/bin/sh
#
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
# Process all Fixes tags, check commit IDs and set appropriate commit titles.
for COMMIT in $(sed -n -e 's/^Fixes: \([0-9a-z]*\).*/\1/p' "$1"); do
GOOD=$(git show -s --abbrev-commit --abbrev=12 --pretty=format:"%h (\"%s\")%n" $COMMIT -- 2>/dev/null)
if [ -z "$GOOD" ]; then
echo "Unknown commit: $COMMIT"
exit 1
fi
echo "Setting fixes tag: $GOOD"
sed -i -e "s/^Fixes: $COMMIT.*/Fixes: $GOOD/" "$1"
done
exit 0
next prev parent reply other threads:[~2021-01-26 16:05 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 9:40 linux-next: Fixes tag needs some work in the block tree Stephen Rothwell
2021-01-25 18:35 ` Paolo Valente
2021-01-25 18:39 ` Jens Axboe
2021-01-26 13:29 ` Jan Kara
2021-01-26 15:47 ` Jens Axboe
2021-01-26 16:01 ` Jan Kara [this message]
2021-01-26 16:05 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2023-11-22 21:51 Stephen Rothwell
2023-08-14 23:19 Stephen Rothwell
2023-08-15 3:21 ` Yu Kuai
2023-08-15 15:08 ` Jens Axboe
2023-08-15 15:58 ` Song Liu
2023-08-15 16:07 ` Jens Axboe
2023-08-15 16:17 ` Song Liu
2023-08-15 16:20 ` Jens Axboe
2023-08-15 16:26 ` Song Liu
2023-08-15 16:31 ` Jens Axboe
2023-08-15 16:51 ` Song Liu
2023-08-15 16:59 ` Jens Axboe
2023-06-18 22:22 Stephen Rothwell
2023-06-20 5:41 ` Chaitanya Kulkarni
2023-06-13 22:33 Stephen Rothwell
2023-03-20 21:28 Stephen Rothwell
2023-03-20 21:30 ` Jens Axboe
2022-11-28 21:27 Stephen Rothwell
2022-11-28 23:39 ` Damien Le Moal
2022-11-29 2:30 ` Jens Axboe
2022-11-29 2:50 ` Damien Le Moal
2022-07-27 22:06 Stephen Rothwell
2022-06-22 23:21 Stephen Rothwell
2022-06-22 23:44 ` Jens Axboe
2022-06-23 8:11 ` Dylan Yudaken
2022-04-28 1:44 Stephen Rothwell
2022-03-28 21:02 Stephen Rothwell
2022-03-22 20:49 Stephen Rothwell
2022-03-23 1:45 ` Jens Axboe
2022-01-03 21:25 Stephen Rothwell
2021-10-19 21:46 Stephen Rothwell
2021-08-22 3:24 Stephen Rothwell
2021-05-18 22:01 Stephen Rothwell
2021-05-19 19:25 ` Sergey Shtylyov
2021-05-19 21:55 ` Jens Axboe
2021-05-05 22:23 Stephen Rothwell
2021-05-09 1:49 ` Minwoo Im
2021-03-04 23:52 Stephen Rothwell
2021-03-05 0:26 ` Jens Axboe
2021-03-05 7:46 ` Christoph Hellwig
2021-03-05 15:53 ` Jens Axboe
2021-02-22 21:01 Stephen Rothwell
2021-02-22 21:15 ` Chaitanya Kulkarni
2021-02-20 4:51 Stephen Rothwell
2021-02-20 4:57 ` Jens Axboe
2021-02-04 20:13 Stephen Rothwell
2020-12-17 20:38 Stephen Rothwell
2020-12-17 20:42 ` Jens Axboe
2020-12-01 21:02 Stephen Rothwell
2020-12-01 21:09 ` Jens Axboe
2020-12-01 21:44 ` Stephen Rothwell
2020-12-01 21:52 ` Jens Axboe
2020-11-30 21:28 Stephen Rothwell
2020-09-24 22:38 Stephen Rothwell
2020-07-29 22:08 Stephen Rothwell
2020-07-29 22:12 ` Stephen Rothwell
2020-07-30 15:04 ` Jens Axboe
2020-06-28 22:05 Stephen Rothwell
2020-06-29 16:21 ` Pavel Begunkov
2020-06-29 16:25 ` Jens Axboe
2020-06-29 22:36 ` Stephen Rothwell
2020-06-29 22:45 ` Jens Axboe
2020-06-26 23:07 Stephen Rothwell
2020-06-27 1:32 ` Jens Axboe
2020-06-27 1:56 ` Konstantin Ryabitsev
2020-06-27 2:25 ` Jens Axboe
2020-06-27 5:12 ` Stephen Rothwell
2020-06-28 13:38 ` Jens Axboe
2020-06-27 5:01 ` Stephen Rothwell
2020-06-27 11:18 ` Pavel Begunkov
2020-05-28 21:10 Stephen Rothwell
2020-03-22 14:08 Stephen Rothwell
2019-10-24 6:16 Stephen Rothwell
2019-10-07 20:16 Stephen Rothwell
2019-10-10 17:36 ` Bart Van Assche
2019-10-11 0:42 ` Stephen Rothwell
2019-09-10 14:57 Stephen Rothwell
2019-07-11 21:35 Stephen Rothwell
2019-07-11 22:03 ` Jens Axboe
2019-07-12 8:47 ` Minwoo Im
2019-02-21 20:39 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=20210126160156.GF10966@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=jia.jiachenghu@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paolo.valente@linaro.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 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).