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 tools/include/uapi/linux (1 of 252 files). Show all
Unified · Split
| @@ -887,8 +887,8 @@ struct xdp_md { · 886 unmodified lines | ||
| 887 | 887 | }; |
| 888 | 888 | |
| 889 | 889 | enum sk_action { |
| 890 | − SK_ABORTED = 0, | |
| 891 | − SK_DROP, | |
| 890 | + SK_DROP = 0, | |
| 891 | + SK_PASS, | |
| 892 | 892 | SK_REDIRECT, |
| 893 | 893 | }; |
| 894 | 894 | |