From: Felipe Balbi <balbi@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Fixes tag needs some work in the usb-gadget tree
Date: Thu, 16 Jan 2020 15:07:24 +0200 [thread overview]
Message-ID: <87d0bj5z3n.fsf@kernel.org> (raw)
In-Reply-To: <20200116133930.74afaa91@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1956 bytes --]
Hi
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Bryan,
>
> On Thu, 16 Jan 2020 02:08:55 +0000 Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote:
>>
>> On 16/01/2020 01:58, Stephen Rothwell wrote:
>> >
>> > On Thu, 16 Jan 2020 01:45:25 +0000 Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote:
>> >>
>> >> On 16/01/2020 01:41, Stephen Rothwell wrote:
>> >>> Hi Bryan,
>> >>>
>> >>> On Thu, 16 Jan 2020 01:19:22 +0000 Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote:
>> >>>>
>> >>>> How should extra long fixes like this be divided up ?
>> >>>
>> >>> Just let them run on even if they are too long i.e. don't split them at all.
>> >>
>> >> That's what's in the git commit log though isn't it ?
>> >
>> > When you add a Fixes: tag to a commit, you quote the subject line of
>> > the commit you are fixing which, by definition, is a single line. We
>> > want to keep it that way so it can be searched for easily.
>> >
>> > So to create a fixes line you can use this:
>> >
>> > git log -1 --format='Fixes: %h ("%s")' <commit being fixed>
>> >
>> > i.e. in this case:
>> >
>> > $ git log -1 --format='Fixes: %h (\"%s\")' 40d133d7f5426
>> > Fixes: 40d133d7f542 ("usb: gadget: f_ncm: convert to new function interface with backward compatibility")
>> >
>>
>> doh sorry still not seeing it
>>
>> git remote -v
>> usb-next git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
>> (fetch)
>>
>> git fetch usb-next
>> git show 5b24c28cfe13
>>
>> that's a correctly formatted fixes right i.e. the same one as above
>>
>> :(
>>
>> not seeing the difference...
>
> Now I see our confusion. There is another version of this patch in
> Felipe's tree as a different commit (6a6ae4e8e926) which has the Fixes
> tag split ...
Right, Greg applied my tree as patches to fix this problem. I need to
rebase my tree on Greg's to get rid of this problem.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2020-01-16 13:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 20:07 linux-next: Fixes tag needs some work in the usb-gadget tree Stephen Rothwell
2020-01-16 1:19 ` Bryan O'Donoghue
2020-01-16 1:41 ` Stephen Rothwell
2020-01-16 1:45 ` Bryan O'Donoghue
2020-01-16 1:58 ` Stephen Rothwell
2020-01-16 2:08 ` Bryan O'Donoghue
2020-01-16 2:39 ` Stephen Rothwell
2020-01-16 13:07 ` Felipe Balbi [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-15 20:12 Stephen Rothwell
2019-05-03 5:31 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=87d0bj5z3n.fsf@kernel.org \
--to=balbi@kernel.org \
--cc=bryan.odonoghue@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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).