History

Merge tag 'v5.9-rc4' into drm-next

Backmerge 5.9-rc4 as there is a nasty qxl conflict that needs to be resolved.

Dave Airlie committed 6 years ago

Commit ce5c2072 parents 3393649 f4d51df1709 files · +9099 −6031Browse files

Showing the changes to include/uapi (2 of 1709 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/in.h +1 −1
  2. include/uapi/linux/netfilter/nf_tables.h +1 −1
include/uapi/linux/in.h+1−1
@@ -135,7 +135,7 @@ struct in_addr { · 134 unmodified lines
135 * this socket to prevent accepting spoofed ones.135 * this socket to prevent accepting spoofed ones.
136 */136 */
137#define IP_PMTUDISC_INTERFACE 4137#define IP_PMTUDISC_INTERFACE 4
138/* weaker version of IP_PMTUDISC_INTERFACE, which allos packets to get138/* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
139 * fragmented if they exeed the interface mtu139 * fragmented if they exeed the interface mtu
140 */140 */
141#define IP_PMTUDISC_OMIT 5141#define IP_PMTUDISC_OMIT 5
include/uapi/linux/netfilter/nf_tables.h+1−1
@@ -133,7 +133,7 @@ enum nf_tables_msg_types { · 132 unmodified lines
133 * @NFTA_LIST_ELEM: list element (NLA_NESTED)133 * @NFTA_LIST_ELEM: list element (NLA_NESTED)
134 */134 */
135enum nft_list_attributes {135enum nft_list_attributes {
136 NFTA_LIST_UNPEC,136 NFTA_LIST_UNSPEC,
137 NFTA_LIST_ELEM,137 NFTA_LIST_ELEM,
138 __NFTA_LIST_MAX138 __NFTA_LIST_MAX
139};139};