Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes.
Showing the changes to include/uapi/linux (2 of 457 files). Show all
Unified · Split
| @@ -98,6 +98,7 @@ struct can_ctrlmode { · 97 unmodified lines | ||
| 98 | 98 | #define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ |
| 99 | 99 | #define CAN_CTRLMODE_FD 0x20 /* CAN FD mode */ |
| 100 | 100 | #define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ |
| 101 | +#define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ | |
| 101 | 102 | |
| 102 | 103 | /* |
| 103 | 104 | * CAN device statistics |
| @@ -82,7 +82,7 @@ struct uinput_ff_erase { · 81 unmodified lines | ||
| 82 | 82 | * The complete sysfs path is then /sys/devices/virtual/input/--NAME-- |
| 83 | 83 | * Usually, it is in the form "inputN" |
| 84 | 84 | */ |
| 85 | −#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) | |
| 85 | +#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len) | |
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | 88 | * UI_GET_VERSION - Return version of uinput protocol |
| @@ -91,7 +91,7 @@ struct uinput_ff_erase { · 2 unmodified lines | ||
| 91 | 91 | * the integer pointed to by the ioctl argument. The protocol version |
| 92 | 92 | * is hard-coded in the kernel and is independent of the uinput device. |
| 93 | 93 | */ |
| 94 | −#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) | |
| 94 | +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 45, unsigned int) | |
| 95 | 95 | |
| 96 | 96 | /* |
| 97 | 97 | * To write a force-feedback-capable driver, the upload_effect |