* linus: (1465 commits) ARM: tegra30: clocks: Fix pciex clock registration lseek(fd, n, SEEK_END) does *not* go to eof - n Linux 3.10-rc6 smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu(). powerpc: Fix missing/delayed calls to irq_work powerpc: Fix emulation of illegal instructions on PowerNV platform powerpc: Fix stack overflow crash in resume_kernel when ftracing snd_pcm_link(): fix a leak... use can_lookup() instead of direct checks of ->i_op->lookup move exit_task_namespaces() outside of exit_notify() fput: task_work_add() can fail if the caller has passed exit_task_work() xfs: don't shutdown log recovery on validation errors xfs: ensure btree root split sets blkno correctly xfs: fix implicit padding in directory and attr CRC formats xfs: don't emit v5 superblock warnings on write mei: me: clear interrupts on the resume path mei: nfc: fix nfc device freeing mei: init: Flush scheduled work before resetting the device sctp: fully initialize sctp_outq in sctp_outq_init netiucv: Hold rtnl between name allocation and device registration. ...
Showing the changes to include/uapi/linux (2 of 1479 files). Show all
Unified · Split
| @@ -783,6 +783,7 @@ struct kvm_dirty_tlb { · 782 unmodified lines | ||
| 783 | 783 | #define KVM_REG_IA64 0x3000000000000000ULL |
| 784 | 784 | #define KVM_REG_ARM 0x4000000000000000ULL |
| 785 | 785 | #define KVM_REG_S390 0x5000000000000000ULL |
| 786 | +#define KVM_REG_MIPS 0x7000000000000000ULL | |
| 786 | 787 | |
| 787 | 788 | #define KVM_REG_SIZE_SHIFT 52 |
| 788 | 789 | #define KVM_REG_SIZE_MASK 0x00f0000000000000ULL |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | ||
| 39 | 39 | #define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */ |
| 40 | 40 | #define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */ |
| 41 | 41 | |
| 42 | −#define VIRTIO_CONSOLE_BAD_ID (~(u32)0) | |
| 42 | +#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0) | |
| 43 | 43 | |
| 44 | 44 | struct virtio_console_config { |
| 45 | 45 | /* colums of the screens */ |