Cross-merge networking fixes after downstream PR. Conflicts: net/mac80211/rx.c 91535613b609 ("wifi: mac80211: don't drop all unprotected public action frames") 6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value") Adjacent changes: drivers/net/ethernet/apm/xgene/xgene_enet_main.c 61471264c018 ("net: ethernet: apm: Convert to platform remove callback returning void") d2ca43f30611 ("net: xgene: Fix unused xgene_enet_of_match warning for !CONFIG_OF") net/vmw_vsock/virtio_transport.c 64c99d2d6ada ("vsock/virtio: support to send non-linear skb") 53b08c498515 ("vsock/virtio: initialize the_virtio_vsock before using VQs")
Showing the changes to include/uapi (2 of 205 files). Show all
Unified · Split
| @@ -45,8 +45,8 @@ extern "C" { · 44 unmodified lines | |||
| 45 | #define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 | 45 | #define NOUVEAU_GETPARAM_HAS_BO_USAGE 15 |
| 46 | #define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 | 46 | #define NOUVEAU_GETPARAM_HAS_PAGEFLIP 16 |
| 47 | 47 | ||
| 48 | /** | 48 | /* |
| 49 | * @NOUVEAU_GETPARAM_EXEC_PUSH_MAX | 49 | * NOUVEAU_GETPARAM_EXEC_PUSH_MAX - query max pushes through getparam |
| 50 | * | 50 | * |
| 51 | * Query the maximum amount of IBs that can be pushed through a single | 51 | * Query the maximum amount of IBs that can be pushed through a single |
| 52 | * &drm_nouveau_exec structure and hence a single &DRM_IOCTL_NOUVEAU_EXEC | 52 | * &drm_nouveau_exec structure and hence a single &DRM_IOCTL_NOUVEAU_EXEC |
| @@ -33,6 +33,6 @@ enum gtp_attrs { · 32 unmodified lines | |||
| 33 | GTPA_PAD, | 33 | GTPA_PAD, |
| 34 | __GTPA_MAX, | 34 | __GTPA_MAX, |
| 35 | }; | 35 | }; |
| 36 | #define GTPA_MAX (__GTPA_MAX + 1) | 36 | #define GTPA_MAX (__GTPA_MAX - 1) |
| 37 | 37 | ||
| 38 | #endif /* _UAPI_LINUX_GTP_H_ */ | 38 | #endif /* _UAPI_LINUX_GTP_H_ */ |