linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* XArray -next inclusion request
@ 2018-06-17  2:15 Matthew Wilcox
  2018-06-17  3:41 ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Matthew Wilcox @ 2018-06-17  2:15 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-mm, linux-fsdevel, linux-kernel


Hi Stephen,

Please add

git://git.infradead.org/users/willy/linux-dax.git xarray

to linux-next.  It is based on -rc1.  You will find some conflicts
against Dan's current patches to DAX; these are all resolved correctly
in the xarray-20180615 branch which is based on next-20180615.

In a masterstroke of timing, I'm going to be on a plane to Tokyo on
Monday.  If this causes any problems, please just ignore the request
for now and we'll resolve it when I'm available to fix problems.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: XArray -next inclusion request
  2018-06-17  2:15 XArray -next inclusion request Matthew Wilcox
@ 2018-06-17  3:41 ` Stephen Rothwell
  2018-07-04 22:54   ` Matthew Wilcox
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2018-06-17  3:41 UTC (permalink / raw)
  To: Matthew Wilcox; +Cc: linux-mm, linux-fsdevel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1637 bytes --]

Hi Willy,

On Sat, 16 Jun 2018 19:15:22 -0700 Matthew Wilcox <willy@infradead.org> wrote:
>
> Please add
> 
> git://git.infradead.org/users/willy/linux-dax.git xarray
> 
> to linux-next.  It is based on -rc1.  You will find some conflicts
> against Dan's current patches to DAX; these are all resolved correctly
> in the xarray-20180615 branch which is based on next-20180615.

Added from tomorrow.

> In a masterstroke of timing, I'm going to be on a plane to Tokyo on
> Monday.  If this causes any problems, please just ignore the request
> for now and we'll resolve it when I'm available to fix problems.

No worries, I will check your other branch and if things are still to
difficult, you will get an email and I will just drop it for a few days.

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: XArray -next inclusion request
  2018-06-17  3:41 ` Stephen Rothwell
@ 2018-07-04 22:54   ` Matthew Wilcox
  2018-07-05  4:37     ` Stephen Rothwell
  0 siblings, 1 reply; 4+ messages in thread
From: Matthew Wilcox @ 2018-07-04 22:54 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-mm, linux-fsdevel, linux-kernel

On Sun, Jun 17, 2018 at 01:41:04PM +1000, Stephen Rothwell wrote:
> Hi Willy,
> 
> On Sat, 16 Jun 2018 19:15:22 -0700 Matthew Wilcox <willy@infradead.org> wrote:
> >
> > Please add
> > 
> > git://git.infradead.org/users/willy/linux-dax.git xarray
> > 
> > to linux-next.  It is based on -rc1.  You will find some conflicts
> > against Dan's current patches to DAX; these are all resolved correctly
> > in the xarray-20180615 branch which is based on next-20180615.
> 
> Added from tomorrow.

Thanks!  I have some additional patches for the IDA that I'd like to
send to Linus as a separate pull request.  Unfortunately, they conflict with
the XArray patches, so I've done them as a separate branch in the same tree:

git://git.infradead.org/users/willy/linux-dax.git ida

Would you prefer to add them as a separate branch to linux-next (to be
pulled after xarray), or would you prefer to replace the xarray pull
with the ida pull?  Either way, you'll get the same commits as the ida
branch is based off the xarray branch.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: XArray -next inclusion request
  2018-07-04 22:54   ` Matthew Wilcox
@ 2018-07-05  4:37     ` Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2018-07-05  4:37 UTC (permalink / raw)
  To: Matthew Wilcox; +Cc: linux-mm, linux-fsdevel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1557 bytes --]

Hi Willy,

On Wed, 4 Jul 2018 15:54:31 -0700 Matthew Wilcox <willy@infradead.org> wrote:
>
> I have some additional patches for the IDA that I'd like to
> send to Linus as a separate pull request.  Unfortunately, they conflict with
> the XArray patches, so I've done them as a separate branch in the same tree:
> 
> git://git.infradead.org/users/willy/linux-dax.git ida
> 
> Would you prefer to add them as a separate branch to linux-next (to be
> pulled after xarray), or would you prefer to replace the xarray pull
> with the ida pull?  Either way, you'll get the same commits as the ida
> branch is based off the xarray branch.

I have added that as a new tree 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.

-- 
Cheers,
Stephen Rothwell 
sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-07-05  4:37 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-17  2:15 XArray -next inclusion request Matthew Wilcox
2018-06-17  3:41 ` Stephen Rothwell
2018-07-04 22:54   ` Matthew Wilcox
2018-07-05  4:37     ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).