Re: XArray -next inclusion request
From: Matthew Wilcox
Date: Wed Jul 04 2018 - 18:54:48 EST
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@xxxxxxxxxxxxx> 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.