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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPcyv4h7byf2O0YHDhKKtynGQ3cGb3sDoZZPerZe13VSLd35jg@mail.gmail.com>
Date:	Mon, 9 Nov 2015 18:42:31 -0800
From:	Dan Williams <dan.j.williams@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Christoph Hellwig <hch@....de>, Jens Axboe <axboe@...com>
Subject: Re: linux-next: manual merge of the nvdimm tree with Linus' tree

On Mon, Nov 9, 2015 at 5:24 PM, Stephen Rothwell <sfr@...b.auug.org.au> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/