* Please add fscrypt.git to linux-next
@ 2017-01-04 4:44 Theodore Ts'o
2017-01-04 11:51 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Theodore Ts'o @ 2017-01-04 4:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
Could you please add:
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git master
To the linux-next tree? I was previously feeding fscrypt changes by
merging them into the ext4.git dev branch, but it will make life
simpler if we have a separate git tree for it.
Linus has already accepted a pull request from the for-stable branch
of fscrypt.git. I plan to send a separate pull request for the master
branch of fscrypt.git during the next merge window.
Thanks!!
- Ted
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Please add fscrypt.git to linux-next
2017-01-04 4:44 Please add fscrypt.git to linux-next Theodore Ts'o
@ 2017-01-04 11:51 ` Stephen Rothwell
2017-01-04 15:01 ` Theodore Ts'o
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2017-01-04 11:51 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-next, linux-kernel
Hi Ted,
On Tue, 3 Jan 2017 23:44:24 -0500 Theodore Ts'o <tytso@mit•edu> wrote:
>
> Could you please add:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git master
>
> To the linux-next tree? I was previously feeding fscrypt changes by
> merging them into the ext4.git dev branch, but it will make life
> simpler if we have a separate git tree for it.
>
> Linus has already accepted a pull request from the for-stable branch
> of fscrypt.git. I plan to send a separate pull request for the master
> branch of fscrypt.git during the next merge window.
Added from tomorrow. Should I add the for-stable branch as well (as a
bug fixes tree)?
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.
--
Cheers,
Stephen Rothwell
sfr@canb•auug.org.au
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Please add fscrypt.git to linux-next
2017-01-04 11:51 ` Stephen Rothwell
@ 2017-01-04 15:01 ` Theodore Ts'o
2017-01-04 18:26 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Theodore Ts'o @ 2017-01-04 15:01 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Wed, Jan 04, 2017 at 10:51:01PM +1100, Stephen Rothwell wrote:
> > Linus has already accepted a pull request from the for-stable branch
> > of fscrypt.git. I plan to send a separate pull request for the master
> > branch of fscrypt.git during the next merge window.
>
> Added from tomorrow. Should I add the for-stable branch as well (as a
> bug fixes tree)?
The master branch should include the for-stable branch 99.9% of the
time (for my own testing sanity), but if it's not too much trouble,
sure, that would be great. If it would cause you too much extra work
on your end, it might not be worth it; I'll leave it up to you.
Thanks!!
- Ted
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Please add fscrypt.git to linux-next
2017-01-04 15:01 ` Theodore Ts'o
@ 2017-01-04 18:26 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2017-01-04 18:26 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: linux-next, linux-kernel
Hi Ted,
On Wed, 4 Jan 2017 10:01:08 -0500 Theodore Ts'o <tytso@mit•edu> wrote:
>
> On Wed, Jan 04, 2017 at 10:51:01PM +1100, Stephen Rothwell wrote:
> >
> > Added from tomorrow. Should I add the for-stable branch as well (as a
> > bug fixes tree)?
>
> The master branch should include the for-stable branch 99.9% of the
> time (for my own testing sanity), but if it's not too much trouble,
> sure, that would be great. If it would cause you too much extra work
> on your end, it might not be worth it; I'll leave it up to you.
Added. The bug fix trees all get merged together, so it is no problem
for me to add more.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-04 18:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-04 4:44 Please add fscrypt.git to linux-next Theodore Ts'o
2017-01-04 11:51 ` Stephen Rothwell
2017-01-04 15:01 ` Theodore Ts'o
2017-01-04 18:26 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox