Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>
2026-11-10 20:48:12 +00:00 · 2016-08-18 01:17:32 -04:00 · 2016-08-18 01:17:32 -04:00 · 60747ef4d1
commit 60747ef4d1
parent 484334198f 184ca82348
1754 changed files with 57415 additions and 78483 deletions
--- a/include/linux/backing-dev-defs.h
+++ b/include/linux/backing-dev-defs.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bvec.h
+++ b/include/linux/bvec.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/dma-attrs.h
+++ b/include/linux/dma-attrs.h
--- a/include/linux/dma-iommu.h
+++ b/include/linux/dma-iommu.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
--- a/include/linux/ds17287rtc.h
+++ b/include/linux/ds17287rtc.h
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
--- a/include/linux/extable.h
+++ b/include/linux/extable.h
--- a/include/linux/fence.h
+++ b/include/linux/fence.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/i8042.h
+++ b/include/linux/i8042.h
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
--- a/include/linux/mfd/cros_ec.h
+++ b/include/linux/mfd/cros_ec.h
--- a/include/linux/mfd/cros_ec_commands.h
+++ b/include/linux/mfd/cros_ec_commands.h
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
--- a/include/linux/mlx5/cq.h
+++ b/include/linux/mlx5/cq.h
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
--- a/include/linux/mlx5/srq.h
+++ b/include/linux/mlx5/srq.h
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/platform_data/rtc-ds2404.h
+++ b/include/linux/platform_data/rtc-ds2404.h
--- a/include/linux/platform_data/rtc-m48t86.h
+++ b/include/linux/platform_data/rtc-m48t86.h
--- a/include/linux/platform_data/rtc-v3020.h
+++ b/include/linux/platform_data/rtc-v3020.h
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
--- a/include/linux/rtc/ds1286.h
+++ b/include/linux/rtc/ds1286.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/serio.h
+++ b/include/linux/serio.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
--- a/include/linux/sunrpc/svc_xprt.h
+++ b/include/linux/sunrpc/svc_xprt.h
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
--- a/include/linux/ww_mutex.h
+++ b/include/linux/ww_mutex.h