Linux 6.2-rc6
-----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmPW7E8eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGf7MIAI0JnHN9WvtEukSZ E6j6+cEGWxsvD6q0g3GPolaKOCw7hlv0pWcFJFcUAt0jebspMdxV2oUGJ8RYW7Lg nCcHvEVswGKLAQtQSWw52qotW6fUfMPsNYYB5l31sm1sKH4Cgss0W7l2HxO/1LvG TSeNHX53vNAZ8pVnFYEWCSXC9bzrmU/VALF2EV00cdICmfvjlgkELGXoLKJJWzUp s63fBHYGGURSgwIWOKStoO6HNo0j/F/wcSMx8leY8qDUtVKHj4v24EvSgxUSDBER ch3LiSQ6qf4sw/z7pqruKFthKOrlNmcc0phjiES0xwwGiNhLv0z3rAhc4OM2cgYh SDc/Y/c= =zpaD -----END PGP SIGNATURE----- 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. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
commit
aebd8f0c6f
1144 changed files with 15685 additions and 8550 deletions
|
|
@ -38,7 +38,7 @@
|
|||
*/
|
||||
#define BR2684_ENCAPS_VC (0) /* VC-mux */
|
||||
#define BR2684_ENCAPS_LLC (1)
|
||||
#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */
|
||||
#define BR2684_ENCAPS_AUTODETECT (2) /* Unsupported */
|
||||
|
||||
/*
|
||||
* Is this VC bridged or routed?
|
||||
|
|
|
|||
|
|
@ -15,8 +15,7 @@ enum sctp_conntrack {
|
|||
SCTP_CONNTRACK_SHUTDOWN_RECD,
|
||||
SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
|
||||
SCTP_CONNTRACK_HEARTBEAT_SENT,
|
||||
SCTP_CONNTRACK_HEARTBEAT_ACKED,
|
||||
SCTP_CONNTRACK_DATA_SENT,
|
||||
SCTP_CONNTRACK_HEARTBEAT_ACKED, /* no longer used */
|
||||
SCTP_CONNTRACK_MAX
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -94,8 +94,7 @@ enum ctattr_timeout_sctp {
|
|||
CTA_TIMEOUT_SCTP_SHUTDOWN_RECD,
|
||||
CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT,
|
||||
CTA_TIMEOUT_SCTP_HEARTBEAT_SENT,
|
||||
CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED,
|
||||
CTA_TIMEOUT_SCTP_DATA_SENT,
|
||||
CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED, /* no longer used */
|
||||
__CTA_TIMEOUT_SCTP_MAX
|
||||
};
|
||||
#define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)
|
||||
|
|
|
|||
112
include/uapi/linux/pktcdvd.h
Normal file
112
include/uapi/linux/pktcdvd.h
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||
/*
|
||||
* Copyright (C) 2000 Jens Axboe <axboe@suse.de>
|
||||
* Copyright (C) 2001-2004 Peter Osterlund <petero2@telia.com>
|
||||
*
|
||||
* May be copied or modified under the terms of the GNU General Public
|
||||
* License. See linux/COPYING for more information.
|
||||
*
|
||||
* Packet writing layer for ATAPI and SCSI CD-R, CD-RW, DVD-R, and
|
||||
* DVD-RW devices.
|
||||
*
|
||||
*/
|
||||
#ifndef _UAPI__PKTCDVD_H
|
||||
#define _UAPI__PKTCDVD_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/*
|
||||
* 1 for normal debug messages, 2 is very verbose. 0 to turn it off.
|
||||
*/
|
||||
#define PACKET_DEBUG 1
|
||||
|
||||
#define MAX_WRITERS 8
|
||||
|
||||
#define PKT_RB_POOL_SIZE 512
|
||||
|
||||
/*
|
||||
* How long we should hold a non-full packet before starting data gathering.
|
||||
*/
|
||||
#define PACKET_WAIT_TIME (HZ * 5 / 1000)
|
||||
|
||||
/*
|
||||
* use drive write caching -- we need deferred error handling to be
|
||||
* able to successfully recover with this option (drive will return good
|
||||
* status as soon as the cdb is validated).
|
||||
*/
|
||||
#if defined(CONFIG_CDROM_PKTCDVD_WCACHE)
|
||||
#define USE_WCACHING 1
|
||||
#else
|
||||
#define USE_WCACHING 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* No user-servicable parts beyond this point ->
|
||||
*/
|
||||
|
||||
/*
|
||||
* device types
|
||||
*/
|
||||
#define PACKET_CDR 1
|
||||
#define PACKET_CDRW 2
|
||||
#define PACKET_DVDR 3
|
||||
#define PACKET_DVDRW 4
|
||||
|
||||
/*
|
||||
* flags
|
||||
*/
|
||||
#define PACKET_WRITABLE 1 /* pd is writable */
|
||||
#define PACKET_NWA_VALID 2 /* next writable address valid */
|
||||
#define PACKET_LRA_VALID 3 /* last recorded address valid */
|
||||
#define PACKET_MERGE_SEGS 4 /* perform segment merging to keep */
|
||||
/* underlying cdrom device happy */
|
||||
|
||||
/*
|
||||
* Disc status -- from READ_DISC_INFO
|
||||
*/
|
||||
#define PACKET_DISC_EMPTY 0
|
||||
#define PACKET_DISC_INCOMPLETE 1
|
||||
#define PACKET_DISC_COMPLETE 2
|
||||
#define PACKET_DISC_OTHER 3
|
||||
|
||||
/*
|
||||
* write type, and corresponding data block type
|
||||
*/
|
||||
#define PACKET_MODE1 1
|
||||
#define PACKET_MODE2 2
|
||||
#define PACKET_BLOCK_MODE1 8
|
||||
#define PACKET_BLOCK_MODE2 10
|
||||
|
||||
/*
|
||||
* Last session/border status
|
||||
*/
|
||||
#define PACKET_SESSION_EMPTY 0
|
||||
#define PACKET_SESSION_INCOMPLETE 1
|
||||
#define PACKET_SESSION_RESERVED 2
|
||||
#define PACKET_SESSION_COMPLETE 3
|
||||
|
||||
#define PACKET_MCN "4a656e734178626f65323030300000"
|
||||
|
||||
#undef PACKET_USE_LS
|
||||
|
||||
#define PKT_CTRL_CMD_SETUP 0
|
||||
#define PKT_CTRL_CMD_TEARDOWN 1
|
||||
#define PKT_CTRL_CMD_STATUS 2
|
||||
|
||||
struct pkt_ctrl_command {
|
||||
__u32 command; /* in: Setup, teardown, status */
|
||||
__u32 dev_index; /* in/out: Device index */
|
||||
__u32 dev; /* in/out: Device nr for cdrw device */
|
||||
__u32 pkt_dev; /* in/out: Device nr for packet device */
|
||||
__u32 num_devices; /* out: Largest device index + 1 */
|
||||
__u32 padding; /* Not used */
|
||||
};
|
||||
|
||||
/*
|
||||
* packet ioctls
|
||||
*/
|
||||
#define PACKET_IOCTL_MAGIC ('X')
|
||||
#define PACKET_CTRL_CMD _IOWR(PACKET_IOCTL_MAGIC, 1, struct pkt_ctrl_command)
|
||||
|
||||
|
||||
#endif /* _UAPI__PKTCDVD_H */
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
#define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18)
|
||||
#define PSCI_1_1_FN_MEM_PROTECT PSCI_0_2_FN(19)
|
||||
#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(19)
|
||||
#define PSCI_1_1_FN_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN(20)
|
||||
|
||||
#define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND PSCI_0_2_FN64(12)
|
||||
#define PSCI_1_0_FN64_NODE_HW_STATE PSCI_0_2_FN64(13)
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
#define PSCI_1_0_FN64_STAT_COUNT PSCI_0_2_FN64(17)
|
||||
|
||||
#define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18)
|
||||
#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(19)
|
||||
#define PSCI_1_1_FN64_MEM_PROTECT_CHECK_RANGE PSCI_0_2_FN64(20)
|
||||
|
||||
/* PSCI v0.2 power state encoding for CPU_SUSPEND function */
|
||||
#define PSCI_0_2_POWER_STATE_ID_MASK 0xffff
|
||||
|
|
|
|||
|
|
@ -53,11 +53,9 @@ enum vdpa_attr {
|
|||
VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */
|
||||
VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */
|
||||
|
||||
/* virtio features that are provisioned to the vDPA device */
|
||||
VDPA_ATTR_DEV_FEATURES, /* u64 */
|
||||
|
||||
/* virtio features that are supported by the vDPA device */
|
||||
VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, /* u64 */
|
||||
|
||||
/* new attributes must be added above here */
|
||||
VDPA_ATTR_MAX,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue