Subject: Re: linux-next: Fixes tag needs some work in the usb-gadget tree

From: Felipe Balbi <[email-masked]>
Date: Thu, 16 Jan 2020 15:07:24 +0200

Hi

Stephen Rothwell <[email-masked]> writes:
> Hi Bryan,
>
> On Thu, 16 Jan 2020 02:08:55 +0000 Bryan O'Donoghue <[email-masked]> wrote:
>>
>> On 16/01/2020 01:58, Stephen Rothwell wrote:
>> > 
>> > On Thu, 16 Jan 2020 01:45:25 +0000 Bryan O'Donoghue <[email-masked]> wrote:  
>> >>
>> >> On 16/01/2020 01:41, Stephen Rothwell wrote:  
>> >>> Hi Bryan,
>> >>>
>> >>> On Thu, 16 Jan 2020 01:19:22 +0000 Bryan O'Donoghue <[email-masked]> 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