History

Merge tag 'v6.4-rc5' into media_stage

Linux 6.4-rc5 * tag 'v6.4-rc5': (919 commits) Linux 6.4-rc5 leds: qcom-lpg: Fix PWM period limits selftests/ftrace: Choose target function for filter test from samples KVM: selftests: Add test for race in kvm_recalculate_apic_map() KVM: x86: Bail from kvm_recalculate_phys_map() if x2APIC ID is out-of-bounds KVM: x86: Account fastpath-only VM-Exits in vCPU stats KVM: SVM: vNMI pending bit is V_NMI_PENDING_MASK not V_NMI_BLOCKING_MASK KVM: x86/mmu: Grab memslot for correct address space in NX recovery worker tpm, tpm_tis: correct tpm_tis_flags enumeration values Revert "ext4: remove ac->ac_found > sbi->s_mb_min_to_scan dead check in ext4_mb_check_limits" media: uvcvideo: Don't expose unsupported formats to userspace media: v4l2-subdev: Fix missing kerneldoc for client_caps media: staging: media: imx: initialize hs_settle to avoid warning media: v4l2-mc: Drop subdev check in v4l2_create_fwnode_links_to_pad() riscv: Implement missing huge_ptep_get riscv: Fix huge_ptep_set_wrprotect when PTE is a NAPOT module/decompress: Fix error checking on zstd decompression fork, vhost: Use CLONE_THREAD to fix freezer/ps regression dt-bindings: serial: 8250_omap: add rs485-rts-active-high selinux: don't use make's grouped targets feature yet ...

Mauro Carvalho Chehab committed 3 years ago

Commit be9aac12 parents aafeeaf 9561de31127 files · +9405 −4897Browse files

Showing the changes to include/uapi (4 of 1127 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/handshake.h +1 −0
  2. include/uapi/linux/in.h +1 −0
  3. include/uapi/sound/skl-tplg-interface.h +2 −1
  4. include/uapi/sound/sof/tokens.h +2 −1
include/uapi/linux/handshake.h+1−0
@@ -44,6 +44,7 @@ enum { · 43 unmodified lines
4444 HANDSHAKE_A_ACCEPT_AUTH_MODE,
4545 HANDSHAKE_A_ACCEPT_PEER_IDENTITY,
4646 HANDSHAKE_A_ACCEPT_CERTIFICATE,
47+ HANDSHAKE_A_ACCEPT_PEERNAME,
4748
4849 __HANDSHAKE_A_ACCEPT_MAX,
4950 HANDSHAKE_A_ACCEPT_MAX = (__HANDSHAKE_A_ACCEPT_MAX - 1)
include/uapi/linux/in.h+1−0
@@ -163,6 +163,7 @@ struct in_addr { · 162 unmodified lines
163163 #define IP_MULTICAST_ALL 49
164164 #define IP_UNICAST_IF 50
165165 #define IP_LOCAL_PORT_RANGE 51
166+#define IP_PROTOCOL 52
166167
167168 #define MCAST_EXCLUDE 0
168169 #define MCAST_INCLUDE 1
include/uapi/sound/skl-tplg-interface.h+2−1
@@ -66,7 +66,8 @@ enum skl_ch_cfg { · 65 unmodified lines
6666 SKL_CH_CFG_DUAL_MONO = 9,
6767 SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10,
6868 SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11,
69− SKL_CH_CFG_4_CHANNEL = 12,
69+ SKL_CH_CFG_7_1 = 12,
70+ SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1,
7071 SKL_CH_CFG_INVALID
7172 };
7273
include/uapi/sound/sof/tokens.h+2−1
@@ -183,7 +183,7 @@ · 182 unmodified lines
183183 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE 1906
184184 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG 1907
185185 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE 1908
186−#define SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX 1909
186+#define SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX 1909
187187 /* intentional token numbering discontinuity, reserved for future use */
188188 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE 1930
189189 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH 1931
@@ -194,6 +194,7 @@ · 4 unmodified lines
194194 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_INTERLEAVING_STYLE 1936
195195 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG 1937
196196 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_SAMPLE_TYPE 1938
197+#define SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX 1939
197198 /* intentional token numbering discontinuity, reserved for future use */
198199 #define SOF_TKN_CAVS_AUDIO_FORMAT_IBS 1970
199200 #define SOF_TKN_CAVS_AUDIO_FORMAT_OBS 1971

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