History

Merge v6.2-rc6 into drm-next

Due to holidays we started -next with more -fixes in-flight than usual, and people have been asking where they are. Backmerge to get things better in sync. Conflicts: - Tiny conflict in drm_fbdev_generic.c between variable rename and missing error handling that got added. - Conflict in drm_fb_helper.c between the added call to vgaswitcheroo in drm_fb_helper_single_fb_probe and a refactor patch that extracted lots of helpers and incidentally removed the dev local variable. Readd it to make things compile.

Daniel Vetter committed 3 years ago

Commit aebd8f02 parents 155c6b1 6d796c51144 files · +15643 −8508Browse files

Showing the changes to include/uapi (6 of 1144 files). Show all

Unified · Split

6 files
  1. include/uapi/linux/atmbr2684.h +1 −1
  2. include/uapi/linux/netfilter/nf_conntrack_sctp.h +1 −2
  3. include/uapi/linux/netfilter/nfnetlink_cttimeout.h +1 −2
  4. include/uapi/linux/pktcdvd.h +112 −0
  5. include/uapi/linux/psci.h +2 −2
  6. include/uapi/linux/vdpa.h +1 −3
include/uapi/linux/atmbr2684.h+1−1
@@ -38,7 +38,7 @@ · 37 unmodified lines
38 */38 */
39#define BR2684_ENCAPS_VC (0) /* VC-mux */39#define BR2684_ENCAPS_VC (0) /* VC-mux */
40#define BR2684_ENCAPS_LLC (1)40#define BR2684_ENCAPS_LLC (1)
41#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */41#define BR2684_ENCAPS_AUTODETECT (2) /* Unsupported */
42 42
43/*43/*
44 * Is this VC bridged or routed?44 * Is this VC bridged or routed?
include/uapi/linux/netfilter/nf_conntrack_sctp.h+1−2
@@ -15,8 +15,7 @@ enum sctp_conntrack { · 14 unmodified lines
15 SCTP_CONNTRACK_SHUTDOWN_RECD,15 SCTP_CONNTRACK_SHUTDOWN_RECD,
16 SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,16 SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
17 SCTP_CONNTRACK_HEARTBEAT_SENT,17 SCTP_CONNTRACK_HEARTBEAT_SENT,
18 SCTP_CONNTRACK_HEARTBEAT_ACKED,18 SCTP_CONNTRACK_HEARTBEAT_ACKED, /* no longer used */
19 SCTP_CONNTRACK_DATA_SENT,
20 SCTP_CONNTRACK_MAX19 SCTP_CONNTRACK_MAX
21};20};
22 21
include/uapi/linux/netfilter/nfnetlink_cttimeout.h+1−2
@@ -94,8 +94,7 @@ enum ctattr_timeout_sctp { · 93 unmodified lines
94 CTA_TIMEOUT_SCTP_SHUTDOWN_RECD,94 CTA_TIMEOUT_SCTP_SHUTDOWN_RECD,
95 CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,95 CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,
96 CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,96 CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,
97 CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED,97 CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED, /* no longer used */
98 CTA_TIMEOUT_SCTP_DATA_SENT,
99 __CTA_TIMEOUT_SCTP_MAX98 __CTA_TIMEOUT_SCTP_MAX
100};99};
101#define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)100#define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)
include/uapi/linux/pktcdvd.h+112−0
@@ -0,0 +1,112 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2/*
3 * Copyright (C) 2000 Jens Axboe <axboe@suse.de>
4 * Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
5 *
6 * May be copied or modified under the terms of the GNU General Public
7 * License. See linux/COPYING for more information.
8 *
9 * Packet writing layer for ATAPI and SCSI CD-R, CD-RW, DVD-R, and
10 * DVD-RW devices.
11 *
12 */
13#ifndef _UAPI__PKTCDVD_H
14#define _UAPI__PKTCDVD_H
15
16#include <linux/types.h>
17
18/*
19 * 1 for normal debug messages, 2 is very verbose. 0 to turn it off.
20 */
21#define PACKET_DEBUG 1
22
23#define MAX_WRITERS 8
24
25#define PKT_RB_POOL_SIZE 512
26
27/*
28 * How long we should hold a non-full packet before starting data gathering.
29 */
30#define PACKET_WAIT_TIME (HZ * 5 / 1000)
31
32/*
33 * use drive write caching -- we need deferred error handling to be
34 * able to successfully recover with this option (drive will return good
35 * status as soon as the cdb is validated).
36 */
37#if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
38#define USE_WCACHING 1
39#else
40#define USE_WCACHING 0
41#endif
42
43/*
44 * No user-servicable parts beyond this point ->
45 */
46
47/*
48 * device types
49 */
50#define PACKET_CDR 1
51#define PACKET_CDRW 2
52#define PACKET_DVDR 3
53#define PACKET_DVDRW 4
54
55/*
56 * flags
57 */
58#define PACKET_WRITABLE 1 /* pd is writable */
59#define PACKET_NWA_VALID 2 /* next writable address valid */
60#define PACKET_LRA_VALID 3 /* last recorded address valid */
61#define PACKET_MERGE_SEGS 4 /* perform segment merging to keep */
62 /* underlying cdrom device happy */
63
64/*
65 * Disc status -- from READ_DISC_INFO
66 */
67#define PACKET_DISC_EMPTY 0
68#define PACKET_DISC_INCOMPLETE 1
69#define PACKET_DISC_COMPLETE 2
70#define PACKET_DISC_OTHER 3
71
72/*
73 * write type, and corresponding data block type
74 */
75#define PACKET_MODE1 1
76#define PACKET_MODE2 2
77#define PACKET_BLOCK_MODE1 8
78#define PACKET_BLOCK_MODE2 10
79
80/*
81 * Last session/border status
82 */
83#define PACKET_SESSION_EMPTY 0
84#define PACKET_SESSION_INCOMPLETE 1
85#define PACKET_SESSION_RESERVED 2
86#define PACKET_SESSION_COMPLETE 3
87
88#define PACKET_MCN "4a656e734178626f65323030300000"
89
90#undef PACKET_USE_LS
91
92#define PKT_CTRL_CMD_SETUP 0
93#define PKT_CTRL_CMD_TEARDOWN 1
94#define PKT_CTRL_CMD_STATUS 2
95
96struct pkt_ctrl_command {
97 __u32 command; /* in: Setup, teardown, status */
98 __u32 dev_index; /* in/out: Device index */
99 __u32 dev; /* in/out: Device nr for cdrw device */
100 __u32 pkt_dev; /* in/out: Device nr for packet device */
101 __u32 num_devices; /* out: Largest device index + 1 */
102 __u32 padding; /* Not used */
103};
104
105/*
106 * packet ioctls
107 */
108#define PACKET_IOCTL_MAGIC ('X')
109#define PACKET_CTRL_CMD _IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command)
110
111
112#endif /* _UAPI__PKTCDVD_H */
include/uapi/linux/psci.h+2−2
@@ -58,7 +58,7 @@ · 57 unmodified lines
58 58
59#define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18)59#define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18)
60#define PSCI_1_1_FN_MEM_PROTECT PSCI_0_2_FN(19)60#define PSCI_1_1_FN_MEM_PROTECT PSCI_0_2_FN(19)
61#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(19)61#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(20)
62 62
63#define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND PSCI_0_2_FN64(12)63#define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND PSCI_0_2_FN64(12)
64#define PSCI_1_0_FN64_NODE_HW_STATE PSCI_0_2_FN64(13)64#define PSCI_1_0_FN64_NODE_HW_STATE PSCI_0_2_FN64(13)
@@ -67,7 +67,7 @@ · 2 unmodified lines
67#define PSCI_1_0_FN64_STAT_COUNT PSCI_0_2_FN64(17)67#define PSCI_1_0_FN64_STAT_COUNT PSCI_0_2_FN64(17)
68 68
69#define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18)69#define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18)
70#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(19)70#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(20)
71 71
72/* PSCI v0.2 power state encoding for CPU_SUSPEND function */72/* PSCI v0.2 power state encoding for CPU_SUSPEND function */
73#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff73#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff
include/uapi/linux/vdpa.h+1−3
@@ -53,11 +53,9 @@ enum vdpa_attr { · 52 unmodified lines
53 VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */53 VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */
54 VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */54 VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */
55 55
56 /* virtio features that are provisioned to the vDPA device */
56 VDPA_ATTR_DEV_FEATURES, /* u64 */57 VDPA_ATTR_DEV_FEATURES, /* u64 */
57 58
58 /* virtio features that are supported by the vDPA device */
59 VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, /* u64 */
60
61 /* new attributes must be added above here */59 /* new attributes must be added above here */
62 VDPA_ATTR_MAX,60 VDPA_ATTR_MAX,
63};61};

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