Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus

Konrad writes:

Please pull in your 'for-linus' branch two little fixes for Xen
block front:

One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB
on ARM for example) mishandling while the other is fixing
the accounting for the configuration changes.

path: root/Extra

# Targets that need extra treatment for now

curvetun: LDFLAGS += -L ${CONFIG_NACL_LIB_DIR}
mausezahn: CFLAGS = $(mausezahn-eflags)