diff options
| author | David S. Miller | 2015-11-03 19:41:45 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-11-03 19:41:45 +0100 |
| commit | 73186df8d7fa574345f0ad626ebe89649f8308a5 (patch) | |
| tree | 9e6ed2c499cb5cbbcc79415602f9114503bb6931 /include/crypto/lrw.h | |
| parent | switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion (diff) | |
| parent | ipv6: fix tunnel error handling (diff) | |
| download | kernel-qcow2-linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.gz kernel-qcow2-linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.xz kernel-qcow2-linux-73186df8d7fa574345f0ad626ebe89649f8308a5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/crypto/lrw.h')
0 files changed, 0 insertions, 0 deletions