History

Merge tag 'v6.9-rc2' into media_stage

Linux 6.9-rc2 This is needed to pull in commit 11763a8598f88 ("fs/9p: fix uaf in in v9fs_stat2inode_dotl"), which fixes the broken virtme. With this fix the media regression tests can be run again without crashing.

Hans Verkuil committed 2 years ago

Commit b8277962 parents fe19aab 39cd87c403 files · +3472 −1890Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/kfd_ioctl.h +14 −3
  2. include/uapi/scsi/scsi_bsg_mpi3mr.h +1 −1
include/uapi/linux/kfd_ioctl.h+14−3
@@ -913,14 +913,25 @@ enum kfd_dbg_trap_exception_code { · 912 unmodified lines
913 KFD_EC_MASK(EC_DEVICE_NEW))913 KFD_EC_MASK(EC_DEVICE_NEW))
914#define KFD_EC_MASK_PROCESS (KFD_EC_MASK(EC_PROCESS_RUNTIME) | \914#define KFD_EC_MASK_PROCESS (KFD_EC_MASK(EC_PROCESS_RUNTIME) | \
915 KFD_EC_MASK(EC_PROCESS_DEVICE_REMOVE))915 KFD_EC_MASK(EC_PROCESS_DEVICE_REMOVE))
916#define KFD_EC_MASK_PACKET (KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_DIM_INVALID) | \
917 KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_GROUP_SEGMENT_SIZE_INVALID) | \
918 KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_CODE_INVALID) | \
919 KFD_EC_MASK(EC_QUEUE_PACKET_RESERVED) | \
920 KFD_EC_MASK(EC_QUEUE_PACKET_UNSUPPORTED) | \
921 KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_WORK_GROUP_SIZE_INVALID) | \
922 KFD_EC_MASK(EC_QUEUE_PACKET_DISPATCH_REGISTER_INVALID) | \
923 KFD_EC_MASK(EC_QUEUE_PACKET_VENDOR_UNSUPPORTED))
916 924
917/* Checks for exception code types for KFD search */925/* Checks for exception code types for KFD search */
926#define KFD_DBG_EC_IS_VALID(ecode) (ecode > EC_NONE && ecode < EC_MAX)
918#define KFD_DBG_EC_TYPE_IS_QUEUE(ecode) \927#define KFD_DBG_EC_TYPE_IS_QUEUE(ecode) \
919 (!!(KFD_EC_MASK(ecode) & KFD_EC_MASK_QUEUE))928 (KFD_DBG_EC_IS_VALID(ecode) && !!(KFD_EC_MASK(ecode) & KFD_EC_MASK_QUEUE))
920#define KFD_DBG_EC_TYPE_IS_DEVICE(ecode) \929#define KFD_DBG_EC_TYPE_IS_DEVICE(ecode) \
921 (!!(KFD_EC_MASK(ecode) & KFD_EC_MASK_DEVICE))930 (KFD_DBG_EC_IS_VALID(ecode) && !!(KFD_EC_MASK(ecode) & KFD_EC_MASK_DEVICE))
922#define KFD_DBG_EC_TYPE_IS_PROCESS(ecode) \931#define KFD_DBG_EC_TYPE_IS_PROCESS(ecode) \
923 (!!(KFD_EC_MASK(ecode) & KFD_EC_MASK_PROCESS))932 (KFD_DBG_EC_IS_VALID(ecode) && !!(KFD_EC_MASK(ecode) & KFD_EC_MASK_PROCESS))
933#define KFD_DBG_EC_TYPE_IS_PACKET(ecode) \
934 (KFD_DBG_EC_IS_VALID(ecode) && !!(KFD_EC_MASK(ecode) & KFD_EC_MASK_PACKET))
924 935
925 936
926/* Runtime enable states */937/* Runtime enable states */
include/uapi/scsi/scsi_bsg_mpi3mr.h+1−1
@@ -382,7 +382,7 @@ struct mpi3mr_bsg_in_reply_buf { · 381 unmodified lines
382 __u8 mpi_reply_type;382 __u8 mpi_reply_type;
383 __u8 rsvd1;383 __u8 rsvd1;
384 __u16 rsvd2;384 __u16 rsvd2;
385 __u8 reply_buf[1];385 __u8 reply_buf[];
386};386};
387 387
388/**388/**