Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/phy/aquantia/aquantia.h 219343755eae ("net: phy: aquantia: add missing include guards") 61578f679378 ("net: phy: aquantia: add support for PHY LEDs") drivers/net/ethernet/wangxun/libwx/wx_hw.c bd07a9817846 ("net: txgbe: remove separate irq request for MSI and INTx") b501d261a5b3 ("net: txgbe: add FDIR ATR support") https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/ include/linux/mlx5/mlx5_ifc.h 048a403648fc ("net/mlx5: IFC updates for changing max EQs") 99be56171fa9 ("net/mlx5e: SHAMPO, Re-enable HW-GRO") https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/ Adjacent changes: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 4130c67cd123 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference") 3f3126515fbe ("wifi: iwlwifi: mvm: add mvm-specific guard") include/net/mac80211.h 816c6bec09ed ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP") 5a009b42e041 ("wifi: mac80211: track changes in AP's TPE")
Showing the changes to include/uapi (2 of 348 files). Show all
Unified · Split
| @@ -737,7 +737,7 @@ __SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64) · 736 unmodified lines | |||
| 737 | #define __NR_ppoll_time64 414 | 737 | #define __NR_ppoll_time64 414 |
| 738 | __SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64) | 738 | __SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64) |
| 739 | #define __NR_io_pgetevents_time64 416 | 739 | #define __NR_io_pgetevents_time64 416 |
| 740 | __SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents) | 740 | __SC_COMP(__NR_io_pgetevents_time64, sys_io_pgetevents, compat_sys_io_pgetevents_time64) |
| 741 | #define __NR_recvmmsg_time64 417 | 741 | #define __NR_recvmmsg_time64 417 |
| 742 | __SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64) | 742 | __SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, compat_sys_recvmmsg_time64) |
| 743 | #define __NR_mq_timedsend_time64 418 | 743 | #define __NR_mq_timedsend_time64 418 |
| @@ -43,6 +43,6 @@ struct trace_buffer_meta { · 42 unmodified lines | |||
| 43 | __u64 Reserved2; | 43 | __u64 Reserved2; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | #define TRACE_MMAP_IOCTL_GET_READER _IO('T', 0x1) | 46 | #define TRACE_MMAP_IOCTL_GET_READER _IO('R', 0x20) |
| 47 | 47 | ||
| 48 | #endif /* _TRACE_MMAP_H_ */ | 48 | #endif /* _TRACE_MMAP_H_ */ |