Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a9bf88a authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'pmem-api' into libnvdimm-for-next

parents a06a7576 67a3e8fe

Documentation/filesystems/Locking

+2 −1
Original line number Diff line number Diff line
@@ -397,7 +397,8 @@ prototypes: 
	int (*release) (struct gendisk *, fmode_t);

	int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);

	int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);

	int (*direct_access) (struct block_device *, sector_t, void **, unsigned long *);

	int (*direct_access) (struct block_device *, sector_t, void __pmem **,

				unsigned long *);

	int (*media_changed) (struct gendisk *);

	void (*unlock_native_capacity) (struct gendisk *);

	int (*revalidate_disk) (struct gendisk *);

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6161,6 +6161,7 @@ Q: https://patchwork.kernel.org/project/linux-nvdimm/list/ 
S:	Supported

F:	drivers/nvdimm/pmem.c

F:	include/linux/pmem.h

F:	arch/*/include/asm/pmem.h



LINUX FOR IBM pSERIES (RS/6000)

M:	Paul Mackerras <paulus@au.ibm.com>

arch/arm/mach-clps711x/board-cdb89712.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct physmap_flash_data cdb89712_bootrom_pdata __initdata = { 


static struct resource cdb89712_bootrom_resources[] __initdata = {

	DEFINE_RES_NAMED(CS7_PHYS_BASE, SZ_128, "BOOTROM", IORESOURCE_MEM |

			 IORESOURCE_CACHEABLE | IORESOURCE_READONLY),

			 IORESOURCE_READONLY),

};



static struct platform_device cdb89712_bootrom_pdev __initdata = {

arch/arm/mach-shmobile/pm-rcar.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/err.h>

#include <linux/mm.h>

#include <linux/spinlock.h>

#include <asm/io.h>

#include <linux/io.h>

#include "pm-rcar.h"



/* SYSC */

arch/ia64/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned lo 
{

	return ioremap(phys_addr, size);

}

#define ioremap_cache ioremap_cache





/*