diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
| commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
| tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /include | |
| parent | 62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff) | |
| parent | 6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/core.h | 7 | ||||
| -rw-r--r-- | include/linux/fscache-cache.h | 1 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 29 | ||||
| -rw-r--r-- | include/linux/nfs4.h | 3 | ||||
| -rw-r--r-- | include/linux/percpu-refcount.h | 4 | ||||
| -rw-r--r-- | include/linux/sunrpc/clnt.h | 1 | ||||
| -rw-r--r-- | include/net/ipv6.h | 5 | ||||
| -rw-r--r-- | include/soc/arc/mcip.h | 16 | ||||
| -rw-r--r-- | include/uapi/linux/ethtool.h | 4 |
9 files changed, 40 insertions, 30 deletions
diff --git a/include/linux/can/core.h b/include/linux/can/core.h |