Cross-merge networking fixes after downstream PR. No conflicts. Adjacent changes: drivers/net/ethernet/stmicro/stmmac/common.h 38cc3c6dcc09 ("net: stmmac: protect updates of 64-bit statistics counters") fd5a6a71313e ("net: stmmac: est: Per Tx-queue error count for HLBF") c5c3e1bfc9e0 ("net: stmmac: Offload queueMaxSDU from tc-taprio") drivers/net/wireless/microchip/wilc1000/netdev.c c9013880284d ("wifi: fill in MODULE_DESCRIPTION()s for wilc1000") 328efda22af8 ("wifi: wilc1000: do not realloc workqueue everytime an interface is added") net/unix/garbage.c 11498715f266 ("af_unix: Remove io_uring code for GC.") 1279f9d9dec2 ("af_unix: Call kfree_skb() for dead unix_(sk)->oob_skb in GC.")
Showing the changes to include/uapi (2 of 427 files). Show all
Unified · Split
| @@ -289,9 +289,11 @@ enum nft_rule_attributes { · 288 unmodified lines | |||
| 289 | /** | 289 | /** |
| 290 | * enum nft_rule_compat_flags - nf_tables rule compat flags | 290 | * enum nft_rule_compat_flags - nf_tables rule compat flags |
| 291 | * | 291 | * |
| 292 | * @NFT_RULE_COMPAT_F_UNUSED: unused | ||
| 292 | * @NFT_RULE_COMPAT_F_INV: invert the check result | 293 | * @NFT_RULE_COMPAT_F_INV: invert the check result |
| 293 | */ | 294 | */ |
| 294 | enum nft_rule_compat_flags { | 295 | enum nft_rule_compat_flags { |
| 296 | NFT_RULE_COMPAT_F_UNUSED = (1 << 0), | ||
| 295 | NFT_RULE_COMPAT_F_INV = (1 << 1), | 297 | NFT_RULE_COMPAT_F_INV = (1 << 1), |
| 296 | NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV, | 298 | NFT_RULE_COMPAT_F_MASK = NFT_RULE_COMPAT_F_INV, |
| 297 | }; | 299 | }; |
| @@ -145,12 +145,13 @@ struct serial_rs485 { · 144 unmodified lines | |||
| 145 | #define SER_RS485_ENABLED _BITUL(0) | 145 | #define SER_RS485_ENABLED _BITUL(0) |
| 146 | #define SER_RS485_RTS_ON_SEND _BITUL(1) | 146 | #define SER_RS485_RTS_ON_SEND _BITUL(1) |
| 147 | #define SER_RS485_RTS_AFTER_SEND _BITUL(2) | 147 | #define SER_RS485_RTS_AFTER_SEND _BITUL(2) |
| 148 | #define SER_RS485_RX_DURING_TX _BITUL(3) | 148 | /* Placeholder for bit 3: SER_RS485_RTS_BEFORE_SEND, which isn't used anymore */ |
| 149 | #define SER_RS485_TERMINATE_BUS _BITUL(4) | 149 | #define SER_RS485_RX_DURING_TX _BITUL(4) |
| 150 | #define SER_RS485_ADDRB _BITUL(5) | 150 | #define SER_RS485_TERMINATE_BUS _BITUL(5) |
| 151 | #define SER_RS485_ADDR_RECV _BITUL(6) | 151 | #define SER_RS485_ADDRB _BITUL(6) |
| 152 | #define SER_RS485_ADDR_DEST _BITUL(7) | 152 | #define SER_RS485_ADDR_RECV _BITUL(7) |
| 153 | #define SER_RS485_MODE_RS422 _BITUL(8) | 153 | #define SER_RS485_ADDR_DEST _BITUL(8) |
| 154 | #define SER_RS485_MODE_RS422 _BITUL(9) | ||
| 154 | 155 | ||
| 155 | __u32 delay_rts_before_send; | 156 | __u32 delay_rts_before_send; |
| 156 | __u32 delay_rts_after_send; | 157 | __u32 delay_rts_after_send; |