History

Merge tag 'char-misc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc and other driver subsystem updates from Greg KH: "Here is the large set of driver changes for char/misc drivers and other smaller driver subsystems that flow through this git tree. Included in here are: - New IIO drivers and features and improvments in that subsystem - New hwtracing drivers and additions to that subsystem - lots of interconnect changes and new drivers as that subsystem seems under very active development recently. This required also merging in the icc subsystem changes through this tree. - FPGA driver updates - counter subsystem and driver updates - MHI driver updates - nvmem driver updates - documentation updates - Other smaller driver updates and fixes, full details in the shortlog All of these have been in linux-next for a while with no reported problems" * tag 'char-misc-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (223 commits) scripts/tags.sh: fix incompatibility with PCRE2 firmware: coreboot: Remove GOOGLE_COREBOOT_TABLE_ACPI/OF Kconfig entries mei: lower the log level for non-fatal failed messages mei: bus: disallow driver match while dismantling device misc: vmw_balloon: fix memory leak with using debugfs_lookup() nvmem: stm32: fix OPTEE dependency dt-bindings: nvmem: qfprom: add IPQ8074 compatible nvmem: qcom-spmi-sdam: register at device init time nvmem: rave-sp-eeprm: fix kernel-doc bad line warning nvmem: stm32: detect bsec pta presence for STM32MP15x nvmem: stm32: add OP-TEE support for STM32MP13x nvmem: core: use nvmem_add_one_cell() in nvmem_add_cells_from_of() nvmem: core: add nvmem_add_one_cell() nvmem: core: drop the removal of the cells in nvmem_add_cells() nvmem: core: move struct nvmem_cell_info to nvmem-provider.h nvmem: core: add an index parameter to the cell of: property: add #nvmem-cell-cells property of: property: make #.*-cells optional for simple props of: base: add of_parse_phandle_with_optional_args() net: add helper eth_addr_add() ...

Linus Torvalds committed 3 years ago

Commit 693fed92 parents 0601f25 6ec363f290 files · +12531 −1959Browse files

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

Unified · Split

2 files
  1. include/uapi/linux/android/binder.h +6 −1
  2. include/uapi/linux/uuid.h +4 −8
include/uapi/linux/android/binder.h+6−1
@@ -450,7 +450,7 @@ enum binder_driver_return_protocol { · 449 unmodified lines
450450
451451 BR_FROZEN_REPLY = _IO('r', 18),
452452 /*
453− * The target of the last transaction (either a bcTRANSACTION or
453+ * The target of the last sync transaction (either a bcTRANSACTION or
454454 * a bcATTEMPT_ACQUIRE) is frozen. No parameters.
455455 */
456456
@@ -460,6 +460,11 @@ enum binder_driver_return_protocol { · 3 unmodified lines
460460 * asynchronous transaction makes the allocated async buffer size exceed
461461 * detection threshold. No parameters.
462462 */
463+
464+ BR_TRANSACTION_PENDING_FROZEN = _IO('r', 20),
465+ /*
466+ * The target of the last async transaction is frozen. No parameters.
467+ */
463468 };
464469
465470 enum binder_driver_command_protocol {
include/uapi/linux/uuid.h+4−8
@@ -1,7 +1,7 @@
11 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 /* DO NOT USE in new code! This is solely for MEI due to legacy reasons */
33 /*
4− * UUID/GUID definition
4+ * MEI UUID definition
55 *
66 * Copyright (C) 2010, Intel Corp.
77 * Huang Ying <ying.huang@intel.com>
@@ -14,19 +14,15 @@ · 6 unmodified lines
1414
1515 typedef struct {
1616 __u8 b[16];
17−} guid_t;
17+} uuid_le;
1818
19−#define GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
20−((guid_t) \
19+#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
20+((uuid_le) \
2121 {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
2222 (b) & 0xff, ((b) >> 8) & 0xff, \
2323 (c) & 0xff, ((c) >> 8) & 0xff, \
2424 (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
2525
26−/* backwards compatibility, don't use in new code */
27−typedef guid_t uuid_le;
28−#define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
29− GUID_INIT(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7)
3026 #define NULL_UUID_LE \
3127 UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \
3228 0x00, 0x00, 0x00, 0x00)