History

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

Minor comment conflict in mac80211.

David S. Miller committed 6 years ago

Commit f0b59892 parents 1a147b7 7111951123 files · +842 −435Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/input-event-codes.h +3 −0
  2. include/uapi/linux/serio.h +5 −5
include/uapi/linux/input-event-codes.h+3−0
@@ -652,6 +652,9 @@ · 651 unmodified lines
652/* Electronic privacy screen control */652/* Electronic privacy screen control */
653#define KEY_PRIVACY_SCREEN_TOGGLE 0x279653#define KEY_PRIVACY_SCREEN_TOGGLE 0x279
654 654
655/* Select an area of screen to be copied */
656#define KEY_SELECTIVE_SCREENSHOT 0x27a
657
655/*658/*
656 * Some keyboards have keys which do not have a defined meaning, these keys659 * Some keyboards have keys which do not have a defined meaning, these keys
657 * are intended to be programmed / bound to macros by the user. For most660 * are intended to be programmed / bound to macros by the user. For most
include/uapi/linux/serio.h+5−5
@@ -9,7 +9,7 @@ · 8 unmodified lines
9#ifndef _UAPI_SERIO_H9#ifndef _UAPI_SERIO_H
10#define _UAPI_SERIO_H10#define _UAPI_SERIO_H
11 11
12 12#include <linux/const.h>
13#include <linux/ioctl.h>13#include <linux/ioctl.h>
14 14
15#define SPIOCSTYPE _IOW('q', 0x01, unsigned long)15#define SPIOCSTYPE _IOW('q', 0x01, unsigned long)
@@ -18,10 +18,10 @@ · 2 unmodified lines
18/*18/*
19 * bit masks for use in "interrupt" flags (3rd argument)19 * bit masks for use in "interrupt" flags (3rd argument)
20 */20 */
21#define SERIO_TIMEOUT BIT(0)21#define SERIO_TIMEOUT _BITUL(0)
22#define SERIO_PARITY BIT(1)22#define SERIO_PARITY _BITUL(1)
23#define SERIO_FRAME BIT(2)23#define SERIO_FRAME _BITUL(2)
24#define SERIO_OOB_DATA BIT(3)24#define SERIO_OOB_DATA _BITUL(3)
25 25
26/*26/*
27 * Serio types27 * Serio types

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