diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-01 12:16:14 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 12:16:14 +0900 |
| commit | 26a8ba2c8b36840da8e068d551e1578b684dcd33 (patch) | |
| tree | 01aff82966f3c2600efc53f995296a6d1b565420 /net/8021q | |
| parent | 28ef7de70dde7762cb81eecf411e2c78a25c457d (diff) | |
| parent | eee12df5a0bd5769af5efb72fa95dd1f633a266c (diff) | |
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 2017-10-30
1) Change some variables that can't be negative
from int to unsigned int. From Alexey Dobriyan.
2) Remove a redundant header initialization in esp6.
From Colin Ian King.
3) Some BUG to BUG_ON conversions.
From Gustavo A. R. Silva.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
0 files changed, 0 insertions, 0 deletions