Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next.
Showing the changes to include/uapi/linux (3 of 181 files). Show all
Unified · Split
| @@ -357,7 +357,7 @@ enum { · 356 unmodified lines | ||
| 357 | 357 | #define AUDIT_ARCH_MIPS64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|\ |
| 358 | 358 | __AUDIT_ARCH_CONVENTION_MIPS64_N32) |
| 359 | 359 | #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) |
| 360 | −#define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE\ | |
| 360 | +#define AUDIT_ARCH_MIPSEL64N32 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE|\ | |
| 361 | 361 | __AUDIT_ARCH_CONVENTION_MIPS64_N32) |
| 362 | 362 | #define AUDIT_ARCH_OPENRISC (EM_OPENRISC) |
| 363 | 363 | #define AUDIT_ARCH_PARISC (EM_PARISC) |
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | # UAPI Header export list |
| 2 | 2 | header-y += audio.h |
| 3 | 3 | header-y += cdc.h |
| 4 | +header-y += cdc-wdm.h | |
| 4 | 5 | header-y += ch11.h |
| 5 | 6 | header-y += ch9.h |
| 6 | 7 | header-y += functionfs.h |
| @@ -9,6 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | #ifndef _UAPI__LINUX_USB_CDC_WDM_H |
| 10 | 10 | #define _UAPI__LINUX_USB_CDC_WDM_H |
| 11 | 11 | |
| 12 | +#include <linux/types.h> | |
| 13 | + | |
| 12 | 14 | /* |
| 13 | 15 | * This IOCTL is used to retrieve the wMaxCommand for the device, |
| 14 | 16 | * defining the message limit for both reading and writing. |