git.maquefel.me Git - linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 11 Apr 2016 16:30:50 +0000 (09:30 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 11 Apr 2016 16:30:50 +0000 (09:30 -0700)
commit	5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b
tree	f43f81ab67d152c148bd3dfc1a0683d2c8306014	tree \| snapshot
parent	148e45dc87cb76ba89e80da264bc692cc91a5149	commit \| diff
parent	bf16200689118d19de1b8d2a3c314fc21f5dc7bb	commit \| diff

Merge 4.6-rc3 into staging-next

This resolves a lot of merge issues with PAGE_CACHE_* changes, and an
iio driver merge issue.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

45 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/bmc150-accel-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/gyro/bmg160_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/libcfs/tracefile.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/lnet/lib-move.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/brw_test.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/conctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/conrpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/framework.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/rpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/selftest.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/lu_object.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/obd.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ldlm/ldlm_request.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/dir.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_mmap.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/lproc_llite.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw26.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_io.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lmv/lmv_obd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lov/lov_offset.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lov/lov_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/mdc/mdc_request.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/cl_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/class_obd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/lu_object.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdecho/echo_client.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/lproc_osc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_cache.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_io.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_request.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ptlrpc/client.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/bmc150-accel-core.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/gyro/bmg160_core.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/libcfs/tracefile.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/lnet/lib-move.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/brw_test.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/conctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/conrpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/framework.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/rpc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lnet/selftest/selftest.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/lu_object.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/include/obd.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ldlm/ldlm_request.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/dir.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_internal.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_lib.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/llite_mmap.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/lproc_llite.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/rw26.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_dev.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_io.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/llite/vvp_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lmv/lmv_obd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lov/lov_offset.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/lov/lov_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/mdc/mdc_request.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/cl_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/class_obd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdclass/lu_object.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/obdecho/echo_client.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/lproc_osc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_cache.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_io.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_page.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/osc/osc_request.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ptlrpc/client.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history