History

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

Documentation/bpf/bpf_devel_QA.rst b7abcd9c656b ("bpf, doc: Link to submitting-patches.rst for general patch submission info") d56b0c461d19 ("bpf, docs: Fix link to netdev-FAQ target") https://lore.kernel.org/all/20230307095812.236eb1be@canb.auug.org.au/

Jakub Kicinski committed 3 years ago

Commit d0ddf502 parents db47fa2 44889ba726 files · +13911 −6601Browse files

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

Unified · Split

6 files
  1. include/uapi/drm/amdgpu_drm.h +11 −0
  2. include/uapi/linux/elf.h +2 −0
  3. include/uapi/linux/fou.h +1 −1
  4. include/uapi/linux/netdev.h +1 −1
  5. include/uapi/linux/sed-opal.h +1 −0
  6. include/uapi/scsi/scsi_bsg_mpi3mr.h +1 −7
include/uapi/drm/amdgpu_drm.h+11−0
@@ -715,6 +715,7 @@ struct drm_amdgpu_cs_chunk_data { · 714 unmodified lines
715715 #define AMDGPU_IDS_FLAGS_FUSION 0x1
716716 #define AMDGPU_IDS_FLAGS_PREEMPTION 0x2
717717 #define AMDGPU_IDS_FLAGS_TMZ 0x4
718+#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD 0x8
718719
719720 /* indicate if acceleration can be working */
720721 #define AMDGPU_INFO_ACCEL_WORKING 0x00
@@ -1115,6 +1116,16 @@ struct drm_amdgpu_info_device { · 394 unmodified lines
11151116 __u64 tcc_disabled_mask;
11161117 __u64 min_engine_clock;
11171118 __u64 min_memory_clock;
1119+ /* The following fields are only set on gfx11+, older chips set 0. */
1120+ __u32 tcp_cache_size; /* AKA GL0, VMEM cache */
1121+ __u32 num_sqc_per_wgp;
1122+ __u32 sqc_data_cache_size; /* AKA SMEM cache */
1123+ __u32 sqc_inst_cache_size;
1124+ __u32 gl1c_cache_size;
1125+ __u32 gl2c_cache_size;
1126+ __u64 mall_size; /* AKA infinity cache */
1127+ /* high 32 bits of the rb pipes mask */
1128+ __u32 enabled_rb_pipes_mask_hi;
11181129 };
11191130
11201131 struct drm_amdgpu_info_hw_ip {
include/uapi/linux/elf.h+2−0
@@ -445,6 +445,8 @@ typedef struct elf64_shdr { · 444 unmodified lines
445445 #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */
446446 #define NT_LOONGARCH_LASX 0xa03 /* LoongArch Loongson Advanced SIMD Extension registers */
447447 #define NT_LOONGARCH_LBT 0xa04 /* LoongArch Loongson Binary Translation registers */
448+#define NT_LOONGARCH_HW_BREAK 0xa05 /* LoongArch hardware breakpoint registers */
449+#define NT_LOONGARCH_HW_WATCH 0xa06 /* LoongArch hardware watchpoint registers */
448450
449451 /* Note types with note name "GNU" */
450452 #define NT_GNU_PROPERTY_TYPE_0 5
include/uapi/linux/fou.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
22 /* Do not edit directly, auto-generated from: */
33 /* Documentation/netlink/specs/fou.yaml */
44 /* YNL-GEN uapi header */
include/uapi/linux/netdev.h+1−1
@@ -1,4 +1,4 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
22 /* Do not edit directly, auto-generated from: */
33 /* Documentation/netlink/specs/netdev.yaml */
44 /* YNL-GEN uapi header */
include/uapi/linux/sed-opal.h+1−0
@@ -144,6 +144,7 @@ struct opal_read_write_table { · 143 unmodified lines
144144 #define OPAL_FL_LOCKED 0x00000008
145145 #define OPAL_FL_MBR_ENABLED 0x00000010
146146 #define OPAL_FL_MBR_DONE 0x00000020
147+#define OPAL_FL_SUM_SUPPORTED 0x00000040
147148
148149 struct opal_status {
149150 __u32 flags;
include/uapi/scsi/scsi_bsg_mpi3mr.h+1−7
@@ -455,12 +455,6 @@ struct mpi3mr_bsg_packet { · 454 unmodified lines
455455 } cmd;
456456 };
457457
458−
459−/* MPI3: NVMe Encasulation related definitions */
460−#ifndef MPI3_NVME_ENCAP_CMD_MAX
461−#define MPI3_NVME_ENCAP_CMD_MAX (1)
462−#endif
463−
464458 struct mpi3_nvme_encapsulated_request {
465459 __le16 host_tag;
466460 __u8 ioc_use_only02;
@@ -474,7 +468,7 @@ struct mpi3_nvme_encapsulated_request { · 7 unmodified lines
474468 __le16 flags;
475469 __le32 data_length;
476470 __le32 reserved14[3];
477− __le32 command[MPI3_NVME_ENCAP_CMD_MAX];
471+ __le32 command[];
478472 };
479473
480474 struct mpi3_nvme_encapsulated_error_reply {

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