History

Merge 5.1-rc6 into tty-next

We want the serial/tty fixes in here as well.

Greg Kroah-Hartman committed 7 years ago

Commit 3b8a1f42 parents c7a6b9e 085b775777 files · +8115 −4467Browse files

Showing the changes to include/uapi/linux (2 of 777 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/ethtool.h +1 −1
  2. include/uapi/linux/input-event-codes.h +4 −2
include/uapi/linux/ethtool.h+1−1
@@ -1591,7 +1591,7 @@ enum ethtool_link_mode_bit_indices { · 1590 unmodified lines
1591 1591
1592static inline int ethtool_validate_speed(__u32 speed)1592static 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. */
include/uapi/linux/input-event-codes.h+4−2
@@ -439,10 +439,12 @@ · 438 unmodified lines
439#define KEY_TITLE 0x171439#define KEY_TITLE 0x171
440#define KEY_SUBTITLE 0x172440#define KEY_SUBTITLE 0x172
441#define KEY_ANGLE 0x173441#define KEY_ANGLE 0x173
442#define KEY_ZOOM 0x174442#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */
443#define KEY_ZOOM KEY_FULL_SCREEN
443#define KEY_MODE 0x175444#define KEY_MODE 0x175
444#define KEY_KEYBOARD 0x176445#define KEY_KEYBOARD 0x176
445#define KEY_SCREEN 0x177446#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 */