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

Two AF_* families adding entries to the lockdep tables
at the same time.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2017-01-11 14:43:39 -05:00
101 changed files with 778 additions and 415 deletions

View File

@@ -2485,7 +2485,7 @@ static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
static inline void skb_free_frag(void *addr)
{
__free_page_frag(addr);
page_frag_free(addr);
}
void *napi_alloc_frag(unsigned int fragsz);