From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthew Wilcox <willy@infradead•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Dan Williams <dan.j.williams@intel•com>,
Dave Jiang <dave.jiang@intel•com>
Subject: Re: linux-next: Signed-off-by missing for commit in the xarray tree
Date: Thu, 26 Jul 2018 10:03:52 +1000 [thread overview]
Message-ID: <20180726100352.2d7c9c21@canb.auug.org.au> (raw)
In-Reply-To: <20180725233621.GA20272@bombadil.infradead.org>
[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]
Hi Matthew,
On Wed, 25 Jul 2018 16:36:21 -0700 Matthew Wilcox <willy@infradead•org> wrote:
>
> On Thu, Jul 26, 2018 at 07:28:14AM +1000, Stephen Rothwell wrote:
> >
> > Commits
> >
> > 890e537e2b42 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
> > aaf149902c79 ("filesystem-dax: Set page->index")
> >
> > are missing a Signed-off-by from their committers.
>
> Oh, hah. I assume this is an automated email?
Well, semi-automatic :-)
> These two commits I cherry-picked from the nvdimm tree so that XArray can
> be rebased on top of it. Is there some other way I should be doing this,
> like rebasing on top of the nvdimm tree?
Ideally, the nvdimm tree would have just those two commits in a branch
that you could merge (so that you both have the same commits (as
opposed to patches)) that way these changes cannot cause conflicts when
the files are further modifed in either tree. Alternatively, if you do
have to cherry-pick them, then you need to add your Signed-off-by to
the copy that you commit.
As things are now, you could merge commit
c2a7d2a11552 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
from the nvdimm tree into your tree before the conflicting commits in
your tree (or just rebase your tree on top of that commit). You need
to make sure that Dan and/or Dave (cc'd) will never rebase that part of
their tree. Also, you will pick up some other commits (which may not
be a problem for you).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-07-26 0:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 21:28 linux-next: Signed-off-by missing for commit in the xarray tree Stephen Rothwell
2018-07-25 23:36 ` Matthew Wilcox
2018-07-26 0:03 ` Stephen Rothwell [this message]
2018-07-26 0:08 ` Dave Jiang
-- strict thread matches above, loose matches on Subject: below --
2021-11-30 20: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=20180726100352.2d7c9c21@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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