Cross-merge networking fixes after downstream PR. Conflicts: net/ipv4/udp.c f796feabb9f5 ("udp: add local "peek offset enabled" flag") 56667da7399e ("net: implement lockless setsockopt(SO_PEEK_OFF)") Adjacent changes: net/unix/garbage.c aa82ac51d633 ("af_unix: Drop oob_skb ref before purging queue in GC.") 11498715f266 ("af_unix: Remove io_uring code for GC.")
Showing the changes to include/uapi (1 of 395 files). Show all
Unified · Split
| @@ -91,8 +91,6 @@ enum iio_modifier { · 90 unmodified lines | |||
| 91 | IIO_MOD_CO2, | 91 | IIO_MOD_CO2, |
| 92 | IIO_MOD_VOC, | 92 | IIO_MOD_VOC, |
| 93 | IIO_MOD_LIGHT_UV, | 93 | IIO_MOD_LIGHT_UV, |
| 94 | IIO_MOD_LIGHT_UVA, | ||
| 95 | IIO_MOD_LIGHT_UVB, | ||
| 96 | IIO_MOD_LIGHT_DUV, | 94 | IIO_MOD_LIGHT_DUV, |
| 97 | IIO_MOD_PM1, | 95 | IIO_MOD_PM1, |
| 98 | IIO_MOD_PM2P5, | 96 | IIO_MOD_PM2P5, |
| @@ -107,6 +105,8 @@ enum iio_modifier { · 8 unmodified lines | |||
| 107 | IIO_MOD_PITCH, | 105 | IIO_MOD_PITCH, |
| 108 | IIO_MOD_YAW, | 106 | IIO_MOD_YAW, |
| 109 | IIO_MOD_ROLL, | 107 | IIO_MOD_ROLL, |
| 108 | IIO_MOD_LIGHT_UVA, | ||
| 109 | IIO_MOD_LIGHT_UVB, | ||
| 110 | }; | 110 | }; |
| 111 | 111 | ||
| 112 | enum iio_event_type { | 112 | enum iio_event_type { |