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

Just several instances of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
2026-11-13 07:31:07 +00:00 · 2016-07-23 19:31:37 -04:00 · 2016-07-23 19:31:37 -04:00 · de0ba9a0d8
commit de0ba9a0d8
parent d95a93a9b7 107df03203
276 changed files with 2475 additions and 1313 deletions
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h