From: "Darrick J. Wong" <djwong@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Chinner <david@fromorbit.com>,
linux-xfs@vger.kernel.org,
Allison Henderson <allison.henderson@oracle.com>,
Chandan Babu R <chandanrlinux@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: Signed-off-by missing for commits in the xfs tree
Date: Mon, 21 Jun 2021 14:51:59 -0700 [thread overview]
Message-ID: <20210621215159.GE3619569@locust> (raw)
In-Reply-To: <20210622072719.1d312bf0@canb.auug.org.au>
On Tue, Jun 22, 2021 at 07:27:19AM +1000, Stephen Rothwell wrote:
> Hi Darrick,
>
> On Mon, 21 Jun 2021 10:12:08 -0700 "Darrick J. Wong" <djwong@kernel.org> wrote:
> >
> > On Mon, Jun 21, 2021 at 08:26:56AM +1000, Stephen Rothwell wrote:
> > >
> > > Commits
> > >
> > > 742140d2a486 ("xfs: xfs_log_force_lsn isn't passed a LSN")
> > > e30fbb337045 ("xfs: Fix CIL throttle hang when CIL space used going backwards")
> > > feb616896031 ("xfs: journal IO cache flush reductions")
> > > 6a5c6f5ef0a4 ("xfs: remove need_start_rec parameter from xlog_write()")
> > > d7693a7f4ef9 ("xfs: CIL checkpoint flushes caches unconditionally")
> > > e45cc747a6fd ("xfs: async blkdev cache flush")
> > > 9b845604a4d5 ("xfs: remove xfs_blkdev_issue_flush")
> > > 25f25648e57c ("xfs: separate CIL commit record IO")
> > > a6a65fef5ef8 ("xfs: log stripe roundoff is a property of the log")
> > >
> > > are missing a Signed-off-by from their committers.
> >
> > <sigh> Ok, I'll rebase the branch again to fix the paperwork errors.
> >
> > For future reference, if I want to continue accepting pull requests from
> > other XFS developers, what are the applicable standards for adding the
> > tree maintainer's (aka my) S-o-B tags? I can't add my own S-o-Bs after
> > the fact without rewriting the branch history and changing the commit
> > ids (which would lose the signed tag), so I guess that means the person
> > sending the pull request has to add my S-o-B for me? Which also doesn't
> > make sense?
>
> If you want to take a pull request, then use "git pull" (or "git fetch"
> followed by "git merge") which will create a merge commit committed by
> you. The above commits were applied to your tree by you as patches (or
> rebased) and so need your sign off. The commits in a branch that you
> just merge into your tree only need the SOBs for their author(s) and
> committer.
I was about to point out all the complaints about when I actually /did/
merge Dave's branch, but I realized that those complaints were actually
because he wasn't consistently signing patches with the same email
address.
Um... do you know if there's a commit hook or something that all of us
can add to spot-check all this stuff? I would really like to spend my
worry beans on about algorithms and code design, not worrying about how
many signature rules can be bent before LT starts refusing pull requests.
> If you then rebase your tree (with merge commits in it), you need to
> use "git rebase -r" to preserve the merge commits. alternatively, you
> can rebase the commits you applied as patches and then redo the
> pulls/merges manually. You generally should not rebase other's work.
>
> Of course, you should not really rebase a published tree at all (unless
> vitally necessary) - see Documentation/maintainer/rebasing-and-merging.rst
Heh. That ship has sailed, unfortunately. If we /really/ care about
maintainers adding their own SoB tags to non-merge commits then I /have/
to rebase.
--D
>
> --
> Cheers,
> Stephen Rothwell
next prev parent reply other threads:[~2021-06-21 21:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 22:26 linux-next: Signed-off-by missing for commits in the xfs tree Stephen Rothwell
2021-06-21 17:12 ` Darrick J. Wong
2021-06-21 21:27 ` Stephen Rothwell
2021-06-21 21:51 ` Darrick J. Wong [this message]
2021-06-21 22:10 ` Stephen Rothwell
2021-06-21 23:06 ` Stephen Rothwell
2021-06-21 21:54 ` Dave Chinner
-- strict thread matches above, loose matches on Subject: below --
2021-08-10 21:49 Stephen Rothwell
2021-08-11 19:21 ` Darrick J. Wong
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=20210621215159.GE3619569@locust \
--to=djwong@kernel.org \
--cc=allison.henderson@oracle.com \
--cc=chandanrlinux@gmail.com \
--cc=david@fromorbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@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 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.