Skip to contentSkip to conversation

dax-misc branch for linux-next

DISCUSSION Verma, Vishal L 3 participants 3 messages May 17, 2016 – May 18, 2016

Subsystems (2)
lore
Share & tools
lore

Verma, Vishal L

author maintainer
#0 lore raw

Hi Stephen,

I understand this is a bit out of the norm, but:

Could you please merge

https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git dax-misc

into linux-next for some coverage.

It is a bit late to the ready-before-merge-window deadline, due to having to coordinate dependencies between trees/patchsets. I'm hoping to send a pull request for this later in the merge window (once ext4 is merged).

Thanks,
-Vishal

#1 lore raw

Hi Vishal,

Quoted 5 lines · Vishal L

I understand this is a bit out of the norm, but:

Could you please merge

Quoted 8 lines

https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git dax-misc

into linux-next for some coverage.

It is a bit late to the ready-before-merge-window deadline, due to having to coordinate dependencies between trees/patchsets. I'm hoping to send a pull request for this later in the merge window (once ext4 is merged).

Added from today.

Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgement of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window.

You will need to ensure that the patches/commits in your tree/series have been:
* submitted under GPL v2 (or later) and include the Contributor's Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.

Signature · 7 lines
Cheers,
Stephen Rothwell 
[email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 35 lines · Stephen Rothwell

Hi Vishal,

Quoted 6 lines · Vishal L

I understand this is a bit out of the norm, but:

Could you please merge

https://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git

dax-misc

Quoted 7 lines

into linux-next for some coverage.

It is a bit late to the ready-before-merge-window deadline, due to having to coordinate dependencies between trees/patchsets. I'm hoping to send a pull request for this later in the merge window (once ext4 is merged).

Added from today.

Thanks for adding your subsystem tree as a participant of linux-next. As you may know, this is not a judgement of your code. The purpose of linux-next is for integration testing and to lower the impact of conflicts between subsystems in the next merge window.

You will need to ensure that the patches/commits in your tree/series have been:
* submitted under GPL v2 (or later) and include the Contributor's Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.

Quoted 3 lines

Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary.

Thanks for merging, Stephen, and also for resolving the conflicts. I meant to post a branch with the example resolution for the nvdimm tree, but somehow it completely slipped my mind.