Several cases of overlapping changes, except the packet scheduler conflicts which deal with the addition of the free list parameter to qdisc_enqueue().
Showing the changes to include/uapi (5 of 725 files). Show all
Unified · Split
| @@ -118,7 +118,7 @@ struct btrfs_ioctl_vol_args_v2 { · 117 unmodified lines | |||
| 118 | }; | 118 | }; |
| 119 | union { | 119 | union { |
| 120 | char name[BTRFS_SUBVOL_NAME_MAX + 1]; | 120 | char name[BTRFS_SUBVOL_NAME_MAX + 1]; |
| 121 | u64 devid; | 121 | __u64 devid; |
| 122 | }; | 122 | }; |
| 123 | }; | 123 | }; |
| 124 | 124 | ||
| @@ -611,6 +611,37 @@ · 610 unmodified lines | |||
| 611 | #define KEY_KBDINPUTASSIST_ACCEPT 0x264 | 611 | #define KEY_KBDINPUTASSIST_ACCEPT 0x264 |
| 612 | #define KEY_KBDINPUTASSIST_CANCEL 0x265 | 612 | #define KEY_KBDINPUTASSIST_CANCEL 0x265 |
| 613 | 613 | ||
| 614 | /* Diagonal movement keys */ | ||
| 615 | #define KEY_RIGHT_UP 0x266 | ||
| 616 | #define KEY_RIGHT_DOWN 0x267 | ||
| 617 | #define KEY_LEFT_UP 0x268 | ||
| 618 | #define KEY_LEFT_DOWN 0x269 | ||
| 619 | |||
| 620 | #define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */ | ||
| 621 | /* Show Top Menu of the Media (e.g. DVD) */ | ||
| 622 | #define KEY_MEDIA_TOP_MENU 0x26b | ||
| 623 | #define KEY_NUMERIC_11 0x26c | ||
| 624 | #define KEY_NUMERIC_12 0x26d | ||
| 625 | /* | ||
| 626 | * Toggle Audio Description: refers to an audio service that helps blind and | ||
| 627 | * visually impaired consumers understand the action in a program. Note: in | ||
| 628 | * some countries this is referred to as "Video Description". | ||
| 629 | */ | ||
| 630 | #define KEY_AUDIO_DESC 0x26e | ||
| 631 | #define KEY_3D_MODE 0x26f | ||
| 632 | #define KEY_NEXT_FAVORITE 0x270 | ||
| 633 | #define KEY_STOP_RECORD 0x271 | ||
| 634 | #define KEY_PAUSE_RECORD 0x272 | ||
| 635 | #define KEY_VOD 0x273 /* Video on Demand */ | ||
| 636 | #define KEY_UNMUTE 0x274 | ||
| 637 | #define KEY_FASTREVERSE 0x275 | ||
| 638 | #define KEY_SLOWREVERSE 0x276 | ||
| 639 | /* | ||
| 640 | * Control a data application associated with the currently viewed channel, | ||
| 641 | * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) | ||
| 642 | */ | ||
| 643 | #define KEY_DATA 0x275 | ||
| 644 | |||
| 614 | #define BTN_TRIGGER_HAPPY 0x2c0 | 645 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 615 | #define BTN_TRIGGER_HAPPY1 0x2c0 | 646 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 616 | #define BTN_TRIGGER_HAPPY2 0x2c1 | 647 | #define BTN_TRIGGER_HAPPY2 0x2c1 |
| @@ -247,6 +247,7 @@ struct input_mask { · 246 unmodified lines | |||
| 247 | #define BUS_ATARI 0x1B | 247 | #define BUS_ATARI 0x1B |
| 248 | #define BUS_SPI 0x1C | 248 | #define BUS_SPI 0x1C |
| 249 | #define BUS_RMI 0x1D | 249 | #define BUS_RMI 0x1D |
| 250 | #define BUS_CEC 0x1E | ||
| 250 | 251 | ||
| 251 | /* | 252 | /* |
| 252 | * MT_TOOL types | 253 | * MT_TOOL types |
| @@ -33,6 +33,7 @@ header-y += xt_NFLOG.h · 32 unmodified lines | |||
| 33 | header-y += xt_NFQUEUE.h | 33 | header-y += xt_NFQUEUE.h |
| 34 | header-y += xt_RATEEST.h | 34 | header-y += xt_RATEEST.h |
| 35 | header-y += xt_SECMARK.h | 35 | header-y += xt_SECMARK.h |
| 36 | header-y += xt_SYNPROXY.h | ||
| 36 | header-y += xt_TCPMSS.h | 37 | header-y += xt_TCPMSS.h |
| 37 | header-y += xt_TCPOPTSTRIP.h | 38 | header-y += xt_TCPOPTSTRIP.h |
| 38 | header-y += xt_TEE.h | 39 | header-y += xt_TEE.h |
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _XT_SYNPROXY_H | 1 | #ifndef _XT_SYNPROXY_H |
| 2 | #define _XT_SYNPROXY_H | 2 | #define _XT_SYNPROXY_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 5 | |||
| 4 | #define XT_SYNPROXY_OPT_MSS 0x01 | 6 | #define XT_SYNPROXY_OPT_MSS 0x01 |
| 5 | #define XT_SYNPROXY_OPT_WSCALE 0x02 | 7 | #define XT_SYNPROXY_OPT_WSCALE 0x02 |
| 6 | #define XT_SYNPROXY_OPT_SACK_PERM 0x04 | 8 | #define XT_SYNPROXY_OPT_SACK_PERM 0x04 |