Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking.
Showing the changes to include/uapi/linux (3 of 252 files). Show all
Unified · Split
| @@ -645,7 +645,7 @@ union bpf_attr { · 644 unmodified lines | |||
| 645 | * @map: pointer to sockmap | 645 | * @map: pointer to sockmap |
| 646 | * @key: key to lookup sock in map | 646 | * @key: key to lookup sock in map |
| 647 | * @flags: reserved for future use | 647 | * @flags: reserved for future use |
| 648 | * Return: SK_REDIRECT | 648 | * Return: SK_PASS |
| 649 | * | 649 | * |
| 650 | * int bpf_sock_map_update(skops, map, key, flags) | 650 | * int bpf_sock_map_update(skops, map, key, flags) |
| 651 | * @skops: pointer to bpf_sock_ops | 651 | * @skops: pointer to bpf_sock_ops |
| @@ -887,8 +887,8 @@ struct xdp_md { · 235 unmodified lines | |||
| 887 | }; | 887 | }; |
| 888 | 888 | ||
| 889 | enum sk_action { | 889 | enum sk_action { |
| 890 | SK_ABORTED = 0, | 890 | SK_DROP = 0, |
| 891 | SK_DROP, | 891 | SK_PASS, |
| 892 | SK_REDIRECT, | 892 | SK_REDIRECT, |
| 893 | }; | 893 | }; |
| 894 | 894 | ||
| @@ -378,7 +378,7 @@ struct sctp_remote_error { · 377 unmodified lines | |||
| 378 | __u16 sre_type; | 378 | __u16 sre_type; |
| 379 | __u16 sre_flags; | 379 | __u16 sre_flags; |
| 380 | __u32 sre_length; | 380 | __u32 sre_length; |
| 381 | __u16 sre_error; | 381 | __be16 sre_error; |
| 382 | sctp_assoc_t sre_assoc_id; | 382 | sctp_assoc_t sre_assoc_id; |
| 383 | __u8 sre_data[0]; | 383 | __u8 sre_data[0]; |
| 384 | }; | 384 | }; |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #define SPIDEV_H | 23 | #define SPIDEV_H |
| 24 | 24 | ||
| 25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 26 | #include <linux/ioctl.h> | ||
| 26 | 27 | ||
| 27 | /* User space versions of kernel symbols for SPI clocking modes, | 28 | /* User space versions of kernel symbols for SPI clocking modes, |
| 28 | * matching <linux/spi/spi.h> | 29 | * matching <linux/spi/spi.h> |