Skip to content

Commit 5aafae8

Browse files
author
Ingo Molnar
committed
Merge tag 'perf-core-for-mingo-4.18-20180516' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: - Add '-e intel_pt//u' test to the 'parse-events' 'perf test' entry, to help avoiding regressions in the events parser such as one that caused a revert in v4.17-rc (Arnaldo Carvalho de Melo) - Fix NULL return handling in bpf__prepare_load() (YueHaibing) - Warn about 'perf buildid-cache --purge-all' failures (Ravi Bangoria) - Add infrastructure to help in writing eBPF C programs to be used with '-e name.c' type events in tools such as 'record' and 'trace', with headers for common constructs and an examples directory that will get populated as we add more such helpers and the 'perf bpf' branch that Jiri Olsa has been working on (Arnaldo Carvalho de Melo) - Handle uncore event aliases in small groups properly (Kan Liang) - Use the "_stest" symbol to identify the kernel map when loading kcore (Adrian Hunter) Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2 parents eaeb1f4 + 7a36a28 commit 5aafae8

File tree

591 files changed

+4747
-2410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

591 files changed

+4747
-2410
lines changed

Documentation/admin-guide/pm/intel_pstate.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ feature enabled.]
145145

146146
In this mode ``intel_pstate`` registers utilization update callbacks with the
147147
CPU scheduler in order to run a P-state selection algorithm, either
148-
``powersave`` or ``performance``, depending on the ``scaling_cur_freq`` policy
148+
``powersave`` or ``performance``, depending on the ``scaling_governor`` policy
149149
setting in ``sysfs``. The current CPU frequency information to be made
150150
available from the ``scaling_cur_freq`` policy attribute in ``sysfs`` is
151151
periodically updated by those utilization update callbacks too.

Documentation/admin-guide/pm/sleep-states.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Sleep States That Can Be Supported
1515
==================================
1616

1717
Depending on its configuration and the capabilities of the platform it runs on,
18-
the Linux kernel can support up to four system sleep states, includig
18+
the Linux kernel can support up to four system sleep states, including
1919
hibernation and up to three variants of system suspend. The sleep states that
2020
can be supported by the kernel are listed below.
2121

Documentation/bpf/bpf_devel_QA.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,14 @@ A: Although LLVM IR generation and optimization try to stay architecture
557557
pulls in some header files containing file scope host assembly codes.
558558
- You can add "-fno-jump-tables" to work around the switch table issue.
559559

560-
Otherwise, you can use bpf target.
560+
Otherwise, you can use bpf target. Additionally, you _must_ use bpf target
561+
when:
562+
563+
- Your program uses data structures with pointer or long / unsigned long
564+
types that interface with BPF helpers or context data structures. Access
565+
into these structures is verified by the BPF verifier and may result
566+
in verification failures if the native architecture is not aligned with
567+
the BPF architecture, e.g. 64-bit. An example of this is
568+
BPF_PROG_TYPE_SK_MSG require '-target bpf'
561569

562570
Happy BPF hacking!

Documentation/device-mapper/thin-provisioning.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,10 @@ i) Constructor
264264
data device, but just remove the mapping.
265265

266266
read_only: Don't allow any changes to be made to the pool
267-
metadata.
267+
metadata. This mode is only available after the
268+
thin-pool has been created and first used in full
269+
read/write mode. It cannot be specified on initial
270+
thin-pool creation.
268271

269272
error_if_no_space: Error IOs, instead of queueing, if no space.
270273

Documentation/devicetree/bindings/ata/ahci-platform.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ compatible:
3030
Optional properties:
3131
- dma-coherent : Present if dma operations are coherent
3232
- clocks : a list of phandle + clock specifier pairs
33-
- resets : a list of phandle + reset specifier pairs
3433
- target-supply : regulator for SATA target power
3534
- phys : reference to the SATA PHY node
3635
- phy-names : must be "sata-phy"

Documentation/devicetree/bindings/display/panel/panel-common.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Display Timings
3838
require specific display timings. The panel-timing subnode expresses those
3939
timings as specified in the timing subnode section of the display timing
4040
bindings defined in
41-
Documentation/devicetree/bindings/display/display-timing.txt.
41+
Documentation/devicetree/bindings/display/panel/display-timing.txt.
4242

4343

4444
Connectivity

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Required Properties:
2626
- "renesas,dmac-r8a7794" (R-Car E2)
2727
- "renesas,dmac-r8a7795" (R-Car H3)
2828
- "renesas,dmac-r8a7796" (R-Car M3-W)
29+
- "renesas,dmac-r8a77965" (R-Car M3-N)
2930
- "renesas,dmac-r8a77970" (R-Car V3M)
3031
- "renesas,dmac-r8a77980" (R-Car V3H)
3132

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ Required properties:
44
- compatible:
55
atmel,maxtouch
66

7+
The following compatibles have been used in various products but are
8+
deprecated:
9+
atmel,qt602240_ts
10+
atmel,atmel_mxt_ts
11+
atmel,atmel_mxt_tp
12+
atmel,mXT224
13+
714
- reg: The I2C address of the device
815

916
- interrupts: The sink for the touchpad's IRQ output

Documentation/devicetree/bindings/net/can/rcar_canfd.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ Required properties:
55
- compatible: Must contain one or more of the following:
66
- "renesas,rcar-gen3-canfd" for R-Car Gen3 compatible controller.
77
- "renesas,r8a7795-canfd" for R8A7795 (R-Car H3) compatible controller.
8-
- "renesas,r8a7796-canfd" for R8A7796 (R-Car M3) compatible controller.
8+
- "renesas,r8a7796-canfd" for R8A7796 (R-Car M3-W) compatible controller.
9+
- "renesas,r8a77970-canfd" for R8A77970 (R-Car V3M) compatible controller.
10+
- "renesas,r8a77980-canfd" for R8A77980 (R-Car V3H) compatible controller.
911

1012
When compatible with the generic version, nodes must list the
1113
SoC-specific version corresponding to the platform first, followed by the

Documentation/devicetree/bindings/net/renesas,ravb.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Required properties:
1818

1919
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
2020
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
21+
- "renesas,etheravb-r8a77965" for the R8A77965 SoC.
2122
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
2223
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
2324
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.

Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ pins it needs, and how they should be configured, with regard to muxer
5656
configuration, drive strength and pullups. If one of these options is
5757
not set, its actual value will be unspecified.
5858

59-
This driver supports the generic pin multiplexing and configuration
60-
bindings. For details on each properties, you can refer to
61-
./pinctrl-bindings.txt.
59+
Allwinner A1X Pin Controller supports the generic pin multiplexing and
60+
configuration bindings. For details on each properties, you can refer to
61+
./pinctrl-bindings.txt.
6262

6363
Required sub-node properties:
6464
- pins

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ Required properties:
4343
- "renesas,hscif-r8a7795" for R8A7795 (R-Car H3) HSCIF compatible UART.
4444
- "renesas,scif-r8a7796" for R8A7796 (R-Car M3-W) SCIF compatible UART.
4545
- "renesas,hscif-r8a7796" for R8A7796 (R-Car M3-W) HSCIF compatible UART.
46+
- "renesas,scif-r8a77965" for R8A77965 (R-Car M3-N) SCIF compatible UART.
47+
- "renesas,hscif-r8a77965" for R8A77965 (R-Car M3-N) HSCIF compatible UART.
4648
- "renesas,scif-r8a77970" for R8A77970 (R-Car V3M) SCIF compatible UART.
4749
- "renesas,hscif-r8a77970" for R8A77970 (R-Car V3M) HSCIF compatible UART.
4850
- "renesas,scif-r8a77980" for R8A77980 (R-Car V3H) SCIF compatible UART.

Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ karo Ka-Ro electronics GmbH
182182
keithkoep Keith & Koep GmbH
183183
keymile Keymile GmbH
184184
khadas Khadas
185+
kiebackpeter Kieback & Peter GmbH
185186
kinetic Kinetic Technologies
186187
kingnovel Kingnovel Technology Co., Ltd.
187188
kosagi Sutajio Ko-Usagi PTE Ltd.

Documentation/devicetree/overlay-notes.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ Finally, if you need to remove all overlays in one-go, just call
9898
of_overlay_remove_all() which will remove every single one in the correct
9999
order.
100100

101+
In addition, there is the option to register notifiers that get called on
102+
overlay operations. See of_overlay_notifier_register/unregister and
103+
enum of_overlay_notify_action for details.
104+
105+
Note that a notifier callback is not supposed to store pointers to a device
106+
tree node or its content beyond OF_OVERLAY_POST_REMOVE corresponding to the
107+
respective node it received.
108+
101109
Overlay DTS Format
102110
------------------
103111

Documentation/doc-guide/parse-headers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ BUGS
177177
****
178178

179179

180-
Report bugs to Mauro Carvalho Chehab <mchehab@s-opensource.com>
180+
Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org>
181181

182182

183183
COPYRIGHT
184184
*********
185185

186186

187-
Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab@s-opensource.com>.
187+
Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab[email protected]>.
188188

189189
License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.
190190

Documentation/media/uapi/rc/keytable.c.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ file: uapi/v4l/keytable.c
77
88
/* keytable.c - This program allows checking/replacing keys at IR
99
10-
Copyright (C) 2006-2009 Mauro Carvalho Chehab <mchehab@infradead.org>
10+
Copyright (C) 2006-2009 Mauro Carvalho Chehab <mchehab@kernel.org>
1111
1212
This program is free software; you can redistribute it and/or modify
1313
it under the terms of the GNU General Public License as published by

Documentation/media/uapi/v4l/v4l2grab.c.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ file: media/v4l/v4l2grab.c
66
.. code-block:: c
77
88
/* V4L2 video picture grabber
9-
Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@infradead.org>
9+
Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>
1010
1111
This program is free software; you can redistribute it and/or modify
1212
it under the terms of the GNU General Public License as published by

Documentation/sphinx/parse-headers.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,11 @@ =head1 DESCRIPTION
387387
388388
=head1 BUGS
389389
390-
Report bugs to Mauro Carvalho Chehab <mchehab@s-opensource.com>
390+
Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org>
391391
392392
=head1 COPYRIGHT
393393
394-
Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab@s-opensource.com>.
394+
Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab+samsung@kernel.org>.
395395
396396
License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.
397397

Documentation/translations/zh_CN/video4linux/v4l2-framework.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ communicating in English you can also ask the Chinese maintainer for
66
help. Contact the Chinese maintainer if this translation is outdated
77
or if there is a problem with the translation.
88

9-
Maintainer: Mauro Carvalho Chehab <mchehab@infradead.org>
9+
Maintainer: Mauro Carvalho Chehab <mchehab@kernel.org>
1010
Chinese maintainer: Fu Wei <[email protected]>
1111
---------------------------------------------------------------------
1212
Documentation/video4linux/v4l2-framework.txt 的中文翻译
1313

1414
如果想评论或更新本文的内容,请直接联系原文档的维护者。如果你使用英文
1515
交流有困难的话,也可以向中文版维护者求助。如果本翻译更新不及时或者翻
1616
译存在问题,请联系中文版维护者。
17-
英文版维护者: Mauro Carvalho Chehab <mchehab@infradead.org>
17+
英文版维护者: Mauro Carvalho Chehab <mchehab@kernel.org>
1818
中文版维护者: 傅炜 Fu Wei <[email protected]>
1919
中文版翻译者: 傅炜 Fu Wei <[email protected]>
2020
中文版校译者: 傅炜 Fu Wei <[email protected]>

0 commit comments

Comments
 (0)