Nicolas Dichtel
870a2df4ca
xfrm: rename struct xfrm_filter
...
iproute2 already defines a structure with that name, let's use another one to
avoid any conflict.
CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
2014-03-07 08:12:37 +01:00
..
acpi
asm-generic
mm: Use ptep/pmdp_set_numa() for updating _PAGE_NUMA bit
2014-02-17 11:19:36 +11:00
clocksource
crypto
drm
Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes
2014-02-19 08:21:26 +10:00
dt-bindings
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-30 17:07:18 -08:00
keys
kvm
linux
UAPI: add MPLS label stack definition
2014-03-04 13:51:06 -05:00
math-emu
media
memory
misc
net
xfrm: rename struct xfrm_filter
2014-03-07 08:12:37 +01:00
pcmcia
ras
rdma
IB: Report using RoCE IP based gids in port caps
2014-02-13 14:46:03 -08:00
rxrpc
scsi
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2014-01-31 15:31:23 -08:00
sound
target
target: Simplify command completion by removing CMD_T_FAILED flag
2014-02-12 15:14:30 -08:00
trace
intel_pstate: Remove energy reporting from pstate_sample tracepoint
2014-02-13 02:11:18 +01:00
uapi
xfrm: rename struct xfrm_filter
2014-03-07 08:12:37 +01:00
video
xen
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2014-02-14 10:45:18 -08:00
Kbuild