Hi Dan,
On Mon, 9 Nov 2015 18:42:31 -0800 Dan Williams wrote:
>
> On Mon, Nov 9, 2015 at 5:24 PM, Stephen Rothwell
> wrote:
> >
> > 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
On Mon, Nov 9, 2015 at 5:24 PM, Stephen Rothwell 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")
>
> fr
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
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
arch/x86/kvm/mmu.c
between commit:
cd1872f02855 ("KVM: x86: MMU: Make force_pt_level bool")
fd1369021878 ("KVM: x86: MMU: Move mapping_level_dirty_bitmap() call in
mapping_level()")
from Linus' tree and commit:
8d
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
drivers/acpi/nfit.c
between commit:
de4a196c02a2 ("nfit, nd_blk: BLK status register is only 32 bits")
from Linus' tree and commit:
67a3e8fe9015 ("nd_blk: change aperture mapping from WC to WB")
from the nvdimm tree
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
drivers/block/Kconfig
between commit:
b6f2098fb708 ("block: pmem: Add dependency on HAS_IOMEM")
from Linus' tree and commit:
1ffe3c5dc311 ("libnvdimm, pmem: move pmem to drivers/nvdimm/")
from the nvdimm tree.
I fi
6 matches
Mail list logo
