Re: linux-next: manual merge of the nvdimm tree with Linus' tree

[Dan Williams]

On Mon, Nov 9, 2015 at 5:24 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Dan,
>
> Today's linux-next merge of the nvdimm tree got a conflict in:
>
>   block/ioctl.c
>
> between commits:
>
>   d8e4bb8103df ("block: cleanup blkdev_ioctl")
>   bbd3e064362e ("block: add an API for Persistent Reservations")
>
> from Linus' tree and commit:
>
>   49bfa9c5511e ("block: enable dax for raw block devices")
>   abcc9ebd68ab ("block, dax: opt-in control for raw block dax support")
>
> from the nvdimm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> Is that new stuff in the nvdimm tree really meant for v4.4?  If not,
> please remove it until -rc1 has been released.

Done.  I was indeed squeezing things into this window that I
shouldn't.  I have postponed these conflicting patches to post 4.4.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/