linux/include/uapi
David S. Miller 42e8e6d906 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:

====================
1) Refactor selftests to use an array of structs in xfrm_fill_key().
   From Gautam Menghani.

2) Drop an unused argument from xfrm_policy_match.
   From Hongbin Wang.

3) Support collect metadata mode for xfrm interfaces.
   From Eyal Birger.

4) Add netlink extack support to xfrm.
   From Sabrina Dubroca.

Please note, there is a merge conflict in:

include/net/dst_metadata.h

between commit:

0a28bfd497 ("net/macsec: Add MACsec skb_metadata_dst Tx Data path support")

from the net-next tree and commit:

5182a5d48c ("net: allow storing xfrm interface metadata in metadata_dst")

from the ipsec-next tree.

Can be solved as done in linux-next.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2022-10-03 07:52:13 +01:00
..
asm-generic TTY / Serial driver changes for 6.0-rc1 2022-08-08 11:31:40 -07:00
drm drm for 5.20/6.0 2022-08-03 19:52:08 -07:00
linux Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 2022-10-03 07:52:13 +01:00
misc habanalabs: add status of reset after device release 2022-07-12 09:09:31 +03:00
mtd mtdchar: prevent integer overflow in a safety check 2022-06-09 15:03:32 +02:00
rdma v5.20 pull request 2022-08-04 19:54:32 -07:00
scsi treewide: uapi: Replace zero-length arrays with flexible-array members 2022-06-28 21:26:05 +02:00
sound sound updates for 6.0-rc1 2022-08-06 10:19:51 -07:00
video
xen
Kbuild