public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: f.fainelli@gmail.com (Florian Fainelli)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: Signed-off-by missing for commits in the arm-soc tree
Date: Mon, 16 Jul 2018 04:55:50 -0700	[thread overview]
Message-ID: <6a6d47fa-cc7f-b977-339e-ea215bc40541@gmail.com> (raw)
In-Reply-To: <20180716095700.GC17271@n2100.armlinux.org.uk>



On 07/16/2018 02:57 AM, Russell King - ARM Linux wrote:
> On Mon, Jul 16, 2018 at 05:24:08PM +0800, Chen-Yu Tsai wrote:
>> On Mon, Jul 16, 2018 at 5:13 PM, Florian Fainelli <f.fainelli@gmail.com> wrote:
>>>
>>>
>>> On 07/15/2018 03:50 PM, Olof Johansson wrote:
>>>> Thanks Stephen, I keep saying every time you catch these that I need
>>>> to run the same script. :(
>>>>
>>>> Florian, I wonder if this happened when you rebased to squash in the fix?
>>>
>>> Humm, could be, all I did (and it was not the first time) was to do an
>>> interactive rebase with --preserve-merges. AFAICT, all of these commits
>>> came from Eric's pull request, so what I typically do is just sign off
>>> on the merge commit, but do not apply my SoB to all commits coming from
>>> that pull request if that makes sense?
>>
>> When you rebase, if the commit is re-applied, the committer changes to
>> you, so you need to add your SoB to all commits you rebased.
>>
>> I suppose you could override it with GIT_COMMITTER_NAME and
>> GIT_COMMITTER_EMAIL environment variables, but that sort of distorts
>> the SoB if any changes were added due to rebasing, such as resolution
>> of merge conflicts.
> 
> A different point: should *anyone* be rebasing commits that they did not
> themselves commit.  Discuss.
> 
> IMHO no - the commits were made public, and anyone could pull the tree
> from which they came in order to do further work before submitting that.
> Rebasing changes the commit IDs, which can lead to duplicate commits
> ending up in mainline.  With other changes on top, this causes totally
> unnecessary conflicts.
> 

Well in that case, I thought it would be cleaner to just squash Arnd's
build fix since the commit had not been merged into arm-soc, but I will
keep in mind not to do that anymore.
-- 
Florian

  reply	other threads:[~2018-07-16 11:55 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-15 21:57 linux-next: Signed-off-by missing for commits in the arm-soc tree Stephen Rothwell
2018-07-15 22:50 ` Olof Johansson
2018-07-16  9:13   ` Florian Fainelli
2018-07-16  9:24     ` Chen-Yu Tsai
2018-07-16  9:54       ` Florian Fainelli
2018-07-16  9:57       ` Russell King - ARM Linux
2018-07-16 11:55         ` Florian Fainelli [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-10-02 21:21 Stephen Rothwell
2018-10-04 19:37 ` Maxime Ripard
2020-07-26 21:35 Stephen Rothwell
2020-07-27  7:27 ` Arnd Bergmann
2021-10-27 11:53 Stephen Rothwell
2022-02-27 20:45 Stephen Rothwell
2022-02-28 11:53 ` Arnd Bergmann

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=6a6d47fa-cc7f-b977-339e-ea215bc40541@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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