History

Merge tag 'v6.16-rc7' into tty-next

We need the tty/serial fixes in here as well.

Greg Kroah-Hartman committed 1 year ago

Commit bcbef1e2 parents 103f5d8 89be9a8886 files · +9420 −4441Browse files

Showing the changes to include/uapi (4 of 886 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/bits.h +2 −2
  2. include/uapi/linux/kvm.h +4 −0
  3. include/uapi/linux/netfilter/nf_tables.h +0 −10
  4. include/uapi/linux/netfilter/nfnetlink.h +0 −2
include/uapi/linux/bits.h+2−2
@@ -4,9 +4,9 @@ · 3 unmodified lines
4#ifndef _UAPI_LINUX_BITS_H4#ifndef _UAPI_LINUX_BITS_H
5#define _UAPI_LINUX_BITS_H5#define _UAPI_LINUX_BITS_H
6 6
7#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))7#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))
8 8
9#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))9#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))
10 10
11#define __GENMASK_U128(h, l) \11#define __GENMASK_U128(h, l) \
12 ((_BIT128((h)) << 1) - (_BIT128(l)))12 ((_BIT128((h)) << 1) - (_BIT128(l)))
include/uapi/linux/kvm.h+4−0
@@ -467,6 +467,10 @@ struct kvm_run { · 466 unmodified lines
467 __u64 leaf;467 __u64 leaf;
468 __u64 r11, r12, r13, r14;468 __u64 r11, r12, r13, r14;
469 } get_tdvmcall_info;469 } get_tdvmcall_info;
470 struct {
471 __u64 ret;
472 __u64 vector;
473 } setup_event_notify;
470 };474 };
471 } tdx;475 } tdx;
472 /* Fix the size of the union. */476 /* Fix the size of the union. */
include/uapi/linux/netfilter/nf_tables.h+0−10
@@ -142,8 +142,6 @@ enum nf_tables_msg_types { · 141 unmodified lines
142 NFT_MSG_DESTROYOBJ,142 NFT_MSG_DESTROYOBJ,
143 NFT_MSG_DESTROYFLOWTABLE,143 NFT_MSG_DESTROYFLOWTABLE,
144 NFT_MSG_GETSETELEM_RESET,144 NFT_MSG_GETSETELEM_RESET,
145 NFT_MSG_NEWDEV,
146 NFT_MSG_DELDEV,
147 NFT_MSG_MAX,145 NFT_MSG_MAX,
148};146};
149 147
@@ -1786,18 +1784,10 @@ enum nft_synproxy_attributes { · 1636 unmodified lines
1786 * enum nft_device_attributes - nf_tables device netlink attributes1784 * enum nft_device_attributes - nf_tables device netlink attributes
1787 *1785 *
1788 * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)1786 * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)
1789 * @NFTA_DEVICE_TABLE: table containing the flowtable or chain hooking into the device (NLA_STRING)
1790 * @NFTA_DEVICE_FLOWTABLE: flowtable hooking into the device (NLA_STRING)
1791 * @NFTA_DEVICE_CHAIN: chain hooking into the device (NLA_STRING)
1792 * @NFTA_DEVICE_SPEC: hook spec matching the device (NLA_STRING)
1793 */1787 */
1794enum nft_devices_attributes {1788enum nft_devices_attributes {
1795 NFTA_DEVICE_UNSPEC,1789 NFTA_DEVICE_UNSPEC,
1796 NFTA_DEVICE_NAME,1790 NFTA_DEVICE_NAME,
1797 NFTA_DEVICE_TABLE,
1798 NFTA_DEVICE_FLOWTABLE,
1799 NFTA_DEVICE_CHAIN,
1800 NFTA_DEVICE_SPEC,
1801 __NFTA_DEVICE_MAX1791 __NFTA_DEVICE_MAX
1802};1792};
1803#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)1793#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)
include/uapi/linux/netfilter/nfnetlink.h+0−2
@@ -25,8 +25,6 @@ enum nfnetlink_groups { · 24 unmodified lines
25#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA25#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA
26 NFNLGRP_NFTRACE,26 NFNLGRP_NFTRACE,
27#define NFNLGRP_NFTRACE NFNLGRP_NFTRACE27#define NFNLGRP_NFTRACE NFNLGRP_NFTRACE
28 NFNLGRP_NFT_DEV,
29#define NFNLGRP_NFT_DEV NFNLGRP_NFT_DEV
30 __NFNLGRP_MAX,28 __NFNLGRP_MAX,
31};29};
32#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)30#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)