History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Trivial conflict in net/core/filter.c, a locally computed 'sdif' is now an argument to the function.

David S. Miller committed 7 years ago

Commit e561bb22 parents 62e3a93 60b5482121 files · +2189 −1064Browse files

Showing the changes to include/uapi/linux (1 of 121 files). Show all

Unified · Split

include/uapi/linux/input-event-codes.h+0−10
@@ -716,7 +716,6 @@ · 715 unmodified lines
716 * the situation described above.716 * the situation described above.
717 */717 */
718#define REL_RESERVED 0x0a718#define REL_RESERVED 0x0a
719#define REL_WHEEL_HI_RES 0x0b
720#define REL_MAX 0x0f719#define REL_MAX 0x0f
721#define REL_CNT (REL_MAX+1)720#define REL_CNT (REL_MAX+1)
722 721
@@ -753,15 +752,6 @@ · 30 unmodified lines
753 752
754#define ABS_MISC 0x28753#define ABS_MISC 0x28
755 754
756/*
757 * 0x2e is reserved and should not be used in input drivers.
758 * It was used by HID as ABS_MISC+6 and userspace needs to detect if
759 * the next ABS_* event is correct or is just ABS_MISC + n.
760 * We define here ABS_RESERVED so userspace can rely on it and detect
761 * the situation described above.
762 */
763#define ABS_RESERVED 0x2e
764
765#define ABS_MT_SLOT 0x2f /* MT slot being modified */755#define ABS_MT_SLOT 0x2f /* MT slot being modified */
766#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */756#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */
767#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */757#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t