summaryrefslogtreecommitdiff
path: root/net/xfrm
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-11-01 20:05:14 -0700
committerJakub Kicinski <kuba@kernel.org>2021-11-01 20:05:14 -0700
commit8a33dcc2f6d5cf60cc77b72c277d1eba8e4ac8fb (patch)
tree83f899fd5d970d220e04da03b045fd46261437f1 /net/xfrm
parentb7b98f868987cd3e86c9bd9a6db048614933d7a0 (diff)
parent6b278c0cb378079f3c0c61ae4a369c09ff1a4188 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the fixes we had queued in case there was another -rc. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions