David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ...

All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-07-20 21:17:12 -07:00

..

af_packet.c

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux

2018-07-20 21:17:12 -07:00

diag.c

packet: pdiag_put_ring() should return TX_RING info for TPACKET_V3

2017-01-10 21:02:42 -05:00

internal.h

packet: fix bitfield update race

2018-04-24 13:17:08 -04:00

Kconfig

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00

Makefile

packet: Diag core and basic socket info dumping

2012-08-14 16:56:33 -07:00