* linux-next: Signed-off-by missing for commit in the xarray tree
@ 2018-07-25 21:28 Stephen Rothwell
2018-07-25 23:36 ` Matthew Wilcox
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2018-07-25 21:28 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
Hi Matthew,
Commits
890e537e2b42 ("filesystem-dax: Introduce dax_lock_mapping_entry()")
aaf149902c79 ("filesystem-dax: Set page->index")
are missing a Signed-off-by from their committers.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: Signed-off-by missing for commit in the xarray tree
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
0 siblings, 1 reply; 5+ messages in thread
From: Matthew Wilcox @ 2018-07-25 23:36 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
On Thu, Jul 26, 2018 at 07:28:14AM +1000, Stephen Rothwell wrote:
> Hi Matthew,
>
> 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?
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?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: Signed-off-by missing for commit in the xarray tree
2018-07-25 23:36 ` Matthew Wilcox
@ 2018-07-26 0:03 ` Stephen Rothwell
2018-07-26 0:08 ` Dave Jiang
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2018-07-26 0:03 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Dan Williams,
Dave Jiang
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: Signed-off-by missing for commit in the xarray tree
2018-07-26 0:03 ` Stephen Rothwell
@ 2018-07-26 0:08 ` Dave Jiang
0 siblings, 0 replies; 5+ messages in thread
From: Dave Jiang @ 2018-07-26 0:08 UTC (permalink / raw)
To: Stephen Rothwell, Matthew Wilcox
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Dan Williams
On 07/25/2018 05:03 PM, Stephen Rothwell wrote:
> 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).
>
I have all the acks I need for that branch for Dan's patches. So that
branch shouldn't change anymore AFAIK.
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: Signed-off-by missing for commit in the xarray tree
@ 2021-11-30 20:31 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2021-11-30 20:31 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
Hi all,
Commit
74cb8d1851c5 ("stash")
is missing a Signed-off-by from its author and committer.
Please don't do this :-(
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-30 20:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2018-07-26 0:08 ` Dave Jiang
-- strict thread matches above, loose matches on Subject: below --
2021-11-30 20:31 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox