Pull in v5.1-rc6 to resolve two conflicts. One is in BFQ, in just a comment, and is trivial. The other one is a conflict due to a later fix in the bio multi-page work, and needs a bit more care. * tag 'v5.1-rc6': (770 commits) Linux 5.1-rc6 block: make sure that bvec length can't be overflow block: kill all_q_node in request_queue x86/cpu/intel: Lower the "ENERGY_PERF_BIAS: Set to normal" message's log priority coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping mm/kmemleak.c: fix unused-function warning init: initialize jump labels before command line option parsing kernel/watchdog_hld.c: hard lockup message should end with a newline kcov: improve CONFIG_ARCH_HAS_KCOV help text mm: fix inactive list balancing between NUMA nodes and cgroups mm/hotplug: treat CMA pages as unmovable proc: fixup proc-pid-vm test proc: fix map_files test on F29 mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n mm/memory_hotplug: do not unlock after failing to take the device_hotplug_lock mm: swapoff: shmem_unuse() stop eviction without igrab() mm: swapoff: take notice of completion sooner mm: swapoff: remove too limiting SWAP_UNUSE_MAX_TRIES mm: swapoff: shmem_find_swap_entries() filter out other types slab: store tagged freelist for off-slab slabmgmt ...
Showing the changes to include/uapi/linux (2 of 777 files). Show all
Unified · Split
| @@ -1591,7 +1591,7 @@ enum ethtool_link_mode_bit_indices { · 1590 unmodified lines | |||
| 1591 | 1591 | ||
| 1592 | static inline int ethtool_validate_speed(__u32 speed) | 1592 | static inline int ethtool_validate_speed(__u32 speed) |
| 1593 | { | 1593 | { |
| 1594 | return speed <= INT_MAX || speed == SPEED_UNKNOWN; | 1594 | return speed <= INT_MAX || speed == (__u32)SPEED_UNKNOWN; |
| 1595 | } | 1595 | } |
| 1596 | 1596 | ||
| 1597 | /* Duplex, half or full. */ | 1597 | /* Duplex, half or full. */ |
| @@ -439,10 +439,12 @@ · 438 unmodified lines | |||
| 439 | #define KEY_TITLE 0x171 | 439 | #define KEY_TITLE 0x171 |
| 440 | #define KEY_SUBTITLE 0x172 | 440 | #define KEY_SUBTITLE 0x172 |
| 441 | #define KEY_ANGLE 0x173 | 441 | #define KEY_ANGLE 0x173 |
| 442 | #define KEY_ZOOM 0x174 | 442 | #define KEY_FULL_SCREEN 0x174 /* AC View Toggle */ |
| 443 | #define KEY_ZOOM KEY_FULL_SCREEN | ||
| 443 | #define KEY_MODE 0x175 | 444 | #define KEY_MODE 0x175 |
| 444 | #define KEY_KEYBOARD 0x176 | 445 | #define KEY_KEYBOARD 0x176 |
| 445 | #define KEY_SCREEN 0x177 | 446 | #define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */ |
| 447 | #define KEY_SCREEN KEY_ASPECT_RATIO | ||
| 446 | #define KEY_PC 0x178 /* Media Select Computer */ | 448 | #define KEY_PC 0x178 /* Media Select Computer */ |
| 447 | #define KEY_TV 0x179 /* Media Select TV */ | 449 | #define KEY_TV 0x179 /* Media Select TV */ |
| 448 | #define KEY_TV2 0x17a /* Media Select Cable */ | 450 | #define KEY_TV2 0x17a /* Media Select Cable */ |