History

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

Pull char/misc updates from Greg KH: "Here is the big set of char/misc driver patches for 4.17-rc1. There are a lot of little things in here, nothing huge, but all important to the different hardware types involved: - thunderbolt driver updates - parport updates (people still care...) - nvmem driver updates - mei updates (as always) - hwtracing driver updates - hyperv driver updates - extcon driver updates - ... and a handful of even smaller driver subsystem and individual driver updates All of these have been in linux-next with no reported issues" * tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (149 commits) hwtracing: Add HW tracing support menu intel_th: Add ACPI glue layer intel_th: Allow forcing host mode through drvdata intel_th: Pick up irq number from resources intel_th: Don't touch switch routing in host mode intel_th: Use correct method of finding hub intel_th: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate stm class: Make dummy's master/channel ranges configurable stm class: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate MAINTAINERS: Bestow upon myself the care for drivers/hwtracing hv: add SPDX license id to Kconfig hv: add SPDX license to trace Drivers: hv: vmbus: do not mark HV_PCIE as perf_device Drivers: hv: vmbus: respect what we get from hv_get_synint_state() /dev/mem: Avoid overwriting "err" in read_mem() eeprom: at24: use SPDX identifier instead of GPL boiler-plate eeprom: at24: simplify the i2c functionality checking eeprom: at24: fix a line break eeprom: at24: tweak newlines eeprom: at24: refactor at24_probe() ...

Linus Torvalds committed 8 years ago

Commit 06dd3df2 parents 38047d5 86f690e141 files · +3377 −1207Browse files

Showing the changes to include/uapi/linux (1 of 141 files). Show all

Unified · Split

include/uapi/linux/stm.h+4−9
@@ -3,15 +3,6 @@ · 2 unmodified lines
3 * System Trace Module (STM) userspace interfaces3 * System Trace Module (STM) userspace interfaces
4 * Copyright (c) 2014, Intel Corporation.4 * Copyright (c) 2014, Intel Corporation.
5 *5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License,
8 * version 2, as published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope it will be useful, but WITHOUT
11 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13 * more details.
14 *
15 * STM class implements generic infrastructure for System Trace Module devices6 * STM class implements generic infrastructure for System Trace Module devices
16 * as defined in MIPI STPv2 specification.7 * as defined in MIPI STPv2 specification.
17 */8 */
@@ -21,6 +12,10 @@ · 3 unmodified lines
21 12
22#include <linux/types.h>13#include <linux/types.h>
23 14
15/* Maximum allowed master and channel values */
16#define STP_MASTER_MAX 0xffff
17#define STP_CHANNEL_MAX 0xffff
18
24/**19/**
25 * struct stp_policy_id - identification for the STP policy20 * struct stp_policy_id - identification for the STP policy
26 * @size: size of the structure including real id[] length21 * @size: size of the structure including real id[] length