Pull to get the thermal netlink multicast group name fix, otherwise the assertion added in net-next to netlink to detect that kind of bug makes systems unbootable for some folks.
Showing the changes to include/uapi/linux (2 of 22 files). Show all
Unified · Split
| @@ -33,9 +33,11 @@ enum { · 32 unmodified lines | ||
| 33 | 33 | PACKET_DIAG_TX_RING, |
| 34 | 34 | PACKET_DIAG_FANOUT, |
| 35 | 35 | |
| 36 | − PACKET_DIAG_MAX, | |
| 36 | + __PACKET_DIAG_MAX, | |
| 37 | 37 | }; |
| 38 | 38 | |
| 39 | +#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1) | |
| 40 | + | |
| 39 | 41 | struct packet_diag_info { |
| 40 | 42 | __u32 pdi_index; |
| 41 | 43 | __u32 pdi_version; |
| @@ -39,9 +39,11 @@ enum { · 38 unmodified lines | ||
| 39 | 39 | UNIX_DIAG_MEMINFO, |
| 40 | 40 | UNIX_DIAG_SHUTDOWN, |
| 41 | 41 | |
| 42 | − UNIX_DIAG_MAX, | |
| 42 | + __UNIX_DIAG_MAX, | |
| 43 | 43 | }; |
| 44 | 44 | |
| 45 | +#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1) | |
| 46 | + | |
| 45 | 47 | struct unix_diag_vfs { |
| 46 | 48 | __u32 udiag_vfs_ino; |
| 47 | 49 | __u32 udiag_vfs_dev; |