Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66caeeb9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rhashtables-cleanups' 



NeilBrown says:

====================
Assorted rhashtables cleanups.

Following 7 patches are selections from a recent RFC series I posted
that have all received suitable Acks.

The most visible changes are that rhashtable-types.h is now preferred
for inclusion in include/linux/*.h rather than rhashtable.h, and
that the full hash is used - no bits a reserved for a NULLS pointer.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e5ab564c c0690016

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -12162,7 +12162,9 @@ M: Herbert Xu <herbert@gondor.apana.org.au> 
L:	netdev@vger.kernel.org

S:	Maintained

F:	lib/rhashtable.c

F:	lib/test_rhashtable.c

F:	include/linux/rhashtable.h

F:	include/linux/rhashtable-types.h



RICOH R5C592 MEMORYSTICK DRIVER

M:	Maxim Levitsky <maximlevitsky@gmail.com>

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/spinlock.h>

#include <linux/timer.h>

#include <linux/vmalloc.h>

#include <linux/rhashtable.h>

#include <linux/etherdevice.h>

#include <linux/net_tstamp.h>

#include <linux/ptp_clock_kernel.h>

include/linux/ipc.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <linux/spinlock.h>

#include <linux/uidgid.h>

#include <linux/rhashtable.h>

#include <linux/rhashtable-types.h>

#include <uapi/linux/ipc.h>

#include <linux/refcount.h>

include/linux/ipc_namespace.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/nsproxy.h>

#include <linux/ns_common.h>

#include <linux/refcount.h>

#include <linux/rhashtable.h>

#include <linux/rhashtable-types.h>



struct user_namespace;

include/linux/mroute_base.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define __LINUX_MROUTE_BASE_H



#include <linux/netdevice.h>

#include <linux/rhashtable.h>

#include <linux/rhashtable-types.h>

#include <linux/spinlock.h>

#include <net/net_namespace.h>

#include <net/sock.h>