diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-17 23:05:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-17 23:05:14 +0200 |
| commit | c87acb2558db7a870575dd8e14ded2e5acbdc295 (patch) | |
| tree | 4119970d68cb35db62c11bf503bf025d4e516d8e /drivers/idle/intel_idle.c | |
| parent | net: fix endian check warning in etherdevice.h (diff) | |
| parent | net: Document xfrm4_gc_thresh and xfrm6_gc_thresh (diff) | |
| download | linux-c87acb2558db7a870575dd8e14ded2e5acbdc295.tar.xz linux-c87acb2558db7a870575dd8e14ded2e5acbdc295.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2015-08-17
1) Fix IPv6 ECN decapsulation for IPsec interfamily tunnels.
From Thomas Egerer.
2) Use kmemdup instead of duplicating it in xfrm_dump_sa().
From Andrzej Hajda.
3) Pass oif to the xfrm lookups so that it gets set on the flow
and the resolver routines can match based on oif.
From David Ahern.
4) Add documentation for the new xfrm garbage collector threshold.
From Alexander Duyck.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/idle/intel_idle.c')
0 files changed, 0 insertions, 0 deletions