diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-16 04:37:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-16 04:37:03 +0200 |
| commit | a9be22425e767d936105679fdc9f568b97bd47cf (patch) | |
| tree | 37a63136da83dcf272668462f96eed1e96f37de3 /kernel/power/main.c | |
| parent | Merge tag 'clk-for-linus-3.16-part2' of git://git.linaro.org/people/mike.turq... (diff) | |
| parent | net: sctp: fix permissions for rto_alpha and rto_beta knobs (diff) | |
| download | linux-a9be22425e767d936105679fdc9f568b97bd47cf.tar.xz linux-a9be22425e767d936105679fdc9f568b97bd47cf.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) Fix checksumming regressions, from Tom Herbert.
2) Undo unintentional permissions changes for SCTP rto_alpha and
rto_beta sysfs knobs, from Denial Borkmann.
3) VXLAN, like other IP tunnels, should advertize it's encapsulation
size using dev->needed_headroom instead of dev->hard_header_len.
From Cong Wang.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: sctp: fix permissions for rto_alpha and rto_beta knobs
vxlan: Checksum fixes
net: add skb_pop_rcv_encapsulation
udp: call __skb_checksum_complete when doing full checksum
net: Fix save software checksum complete
net: Fix GSO constants to match NETIF flags
udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup
vxlan: use dev->needed_headroom instead of dev->hard_header_len
MAINTAINERS: update cxgb4 maintainer
Diffstat (limited to 'kernel/power/main.c')
0 files changed, 0 insertions, 0 deletions