Pablo Neira 753a2ad54e net: reallocate new socket option number for IPV6_AUTOFLOWLABEL ... cb1ce2e ("ipv6: Implement automatic flow label generation on transmit") accidentally uses socket option 64, which is already used by ip6tables: IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64 IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65 There is comment include/uapi/linux/in6.h warning about that. Allocate 70 for this, which seems to be unused instead. Cc: Tom Herbert <therbert@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-06 15:25:01 -07:00
..
acpi	…
asm-generic	Char / Misc driver patches for 3.17-rc1	2014-08-04 17:32:24 -07:00
clocksource	…
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2014-08-06 08:06:39 -07:00
drm	…
dt-bindings	USB patches for 3.17-rc1	2014-08-04 20:11:28 -07:00
keys	…
kvm	…
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-08-06 09:38:14 -07:00
math-emu	…
media	[media] media: atmel-isi: add v4l2 async probe support	2014-07-30 19:35:06 -03:00
memory	…
misc	…
net	net-timestamp: sock_tx_timestamp() fix	2014-08-06 12:38:07 -07:00
pcmcia	…
ras	…
rdma	…
rxrpc	…
scsi	…
sound	…
target	…
trace	Merge tag 'for-f2fs-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs	2014-08-04 20:30:07 -07:00
uapi	net: reallocate new socket option number for IPV6_AUTOFLOWLABEL	2014-08-06 15:25:01 -07:00
video	…
xen	Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-08-04 17:13:50 -07:00
Kbuild	…