Skip to content

Commit dbaab94

Browse files
committed
Merge 5.8-rc7 into tty-next
we need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents ca45b5c + 92ed301 commit dbaab94

File tree

303 files changed

+3457
-3165
lines changed

Some content is hidden

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

303 files changed

+3457
-3165
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ Maxime Ripard <[email protected]> <[email protected]>
198198
Mayuresh Janorkar <[email protected]>
199199
Michael Buesch <[email protected]>
200200
Michel Dänzer <[email protected]>
201+
202+
203+
201204
202205
203206
Mitesh shah <[email protected]>

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ Description: Allow the root user to disable/enable in runtime the clock
1616
gating mechanism in Gaudi. Due to how Gaudi is built, the
1717
clock gating needs to be disabled in order to access the
1818
registers of the TPC and MME engines. This is sometimes needed
19-
during debug by the user and hence the user needs this option
19+
during debug by the user and hence the user needs this option.
20+
The user can supply a bitmask value, each bit represents
21+
a different engine to disable/enable its clock gating feature.
22+
The bitmask is composed of 20 bits:
23+
0 - 7 : DMA channels
24+
8 - 11 : MME engines
25+
12 - 19 : TPC engines
26+
The bit's location of a specific engine can be determined
27+
using (1 << GAUDI_ENGINE_ID_*). GAUDI_ENGINE_ID_* values
28+
are defined in uapi habanalabs.h file in enum gaudi_engine_id
2029

2130
What: /sys/kernel/debug/habanalabs/hl<n>/command_buffers
2231
Date: Jan 2019

Documentation/devicetree/bindings/sound/simple-card.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,8 @@ examples:
378378
- |
379379
sound {
380380
compatible = "simple-audio-card";
381+
#address-cells = <1>;
382+
#size-cells = <0>;
381383
382384
simple-audio-card,name = "rsnd-ak4643";
383385
simple-audio-card,format = "left_j";
@@ -391,10 +393,12 @@ examples:
391393
"ak4642 Playback", "DAI1 Playback";
392394
393395
dpcmcpu: simple-audio-card,cpu@0 {
396+
reg = <0>;
394397
sound-dai = <&rcar_sound 0>;
395398
};
396399
397400
simple-audio-card,cpu@1 {
401+
reg = <1>;
398402
sound-dai = <&rcar_sound 1>;
399403
};
400404
@@ -418,6 +422,8 @@ examples:
418422
- |
419423
sound {
420424
compatible = "simple-audio-card";
425+
#address-cells = <1>;
426+
#size-cells = <0>;
421427
422428
simple-audio-card,routing =
423429
"pcm3168a Playback", "DAI1 Playback",
@@ -426,6 +432,7 @@ examples:
426432
"pcm3168a Playback", "DAI4 Playback";
427433
428434
simple-audio-card,dai-link@0 {
435+
reg = <0>;
429436
format = "left_j";
430437
bitclock-master = <&sndcpu0>;
431438
frame-master = <&sndcpu0>;
@@ -439,22 +446,23 @@ examples:
439446
};
440447
441448
simple-audio-card,dai-link@1 {
449+
reg = <1>;
442450
format = "i2s";
443451
bitclock-master = <&sndcpu1>;
444452
frame-master = <&sndcpu1>;
445453
446454
convert-channels = <8>; /* TDM Split */
447455
448-
sndcpu1: cpu@0 {
456+
sndcpu1: cpu0 {
449457
sound-dai = <&rcar_sound 1>;
450458
};
451-
cpu@1 {
459+
cpu1 {
452460
sound-dai = <&rcar_sound 2>;
453461
};
454-
cpu@2 {
462+
cpu2 {
455463
sound-dai = <&rcar_sound 3>;
456464
};
457-
cpu@3 {
465+
cpu3 {
458466
sound-dai = <&rcar_sound 4>;
459467
};
460468
codec {
@@ -466,6 +474,7 @@ examples:
466474
};
467475
468476
simple-audio-card,dai-link@2 {
477+
reg = <2>;
469478
format = "i2s";
470479
bitclock-master = <&sndcpu2>;
471480
frame-master = <&sndcpu2>;

Documentation/driver-api/ptp.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ PTP hardware clock infrastructure for Linux
2323
+ Ancillary clock features
2424
- Time stamp external events
2525
- Period output signals configurable from user space
26+
- Low Pass Filter (LPF) access from user space
2627
- Synchronization of the Linux system time via the PPS subsystem
2728

2829
PTP hardware clock kernel API
@@ -94,3 +95,14 @@ Supported hardware
9495

9596
- Auxiliary Slave/Master Mode Snapshot (optional interrupt)
9697
- Target Time (optional interrupt)
98+
99+
* Renesas (IDT) ClockMatrix™
100+
101+
- Up to 4 independent PHC channels
102+
- Integrated low pass filter (LPF), access via .adjPhase (compliant to ITU-T G.8273.2)
103+
- Programmable output periodic signals
104+
- Programmable inputs can time stamp external triggers
105+
- Driver and/or hardware configuration through firmware (idtcm.bin)
106+
- LPF settings (bandwidth, phase limiting, automatic holdover, physical layer assist (per ITU-T G.8273.2))
107+
- Programmable output PTP clocks, any frequency up to 1GHz (to other PHY/MAC time stampers, refclk to ASSPs/SoCs/FPGAs)
108+
- Lock to GNSS input, automatic switching between GNSS and user-space PHC control (optional)

Documentation/networking/bareudp.rst

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,29 @@ Usage
2626

2727
1) Device creation & deletion
2828

29-
a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847.
29+
a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls_uc
3030

3131
This creates a bareudp tunnel device which tunnels L3 traffic with ethertype
3232
0x8847 (MPLS traffic). The destination port of the UDP header will be set to
3333
6635.The device will listen on UDP port 6635 to receive traffic.
3434

3535
b) ip link delete bareudp0
3636

37-
2) Device creation with multiple proto mode enabled
37+
2) Device creation with multiproto mode enabled
3838

39-
There are two ways to create a bareudp device for MPLS & IP with multiproto mode
40-
enabled.
39+
The multiproto mode allows bareudp tunnels to handle several protocols of the
40+
same family. It is currently only available for IP and MPLS. This mode has to
41+
be enabled explicitly with the "multiproto" flag.
4142

42-
a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype 0x8847 multiproto
43+
a) ip link add dev bareudp0 type bareudp dstport 6635 ethertype ipv4 multiproto
4344

44-
b) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls
45+
For an IPv4 tunnel the multiproto mode allows the tunnel to also handle
46+
IPv6.
47+
48+
b) ip link add dev bareudp0 type bareudp dstport 6635 ethertype mpls_uc multiproto
49+
50+
For MPLS, the multiproto mode allows the tunnel to handle both unicast
51+
and multicast MPLS packets.
4552

4653
3) Device Usage
4754

MAINTAINERS

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6956,6 +6956,7 @@ M: Timur Tabi <[email protected]>
69566956
M: Nicolin Chen <[email protected]>
69576957
M: Xiubo Li <[email protected]>
69586958
R: Fabio Estevam <[email protected]>
6959+
R: Shengjiu Wang <[email protected]>
69596960
L: [email protected] (moderated for non-subscribers)
69606961
69616962
S: Maintained
@@ -9305,6 +9306,17 @@ F: Documentation/kbuild/kconfig*
93059306
F: scripts/Kconfig.include
93069307
F: scripts/kconfig/
93079308

9309+
KCOV
9310+
R: Dmitry Vyukov <[email protected]>
9311+
R: Andrey Konovalov <[email protected]>
9312+
9313+
S: Maintained
9314+
F: Documentation/dev-tools/kcov.rst
9315+
F: include/linux/kcov.h
9316+
F: include/uapi/linux/kcov.h
9317+
F: kernel/kcov.c
9318+
F: scripts/Makefile.kcov
9319+
93089320
KCSAN
93099321
M: Marco Elver <[email protected]>
93109322
R: Dmitry Vyukov <[email protected]>
@@ -11240,7 +11252,7 @@ S: Maintained
1124011252
F: drivers/crypto/atmel-ecc.*
1124111253

1124211254
MICROCHIP I2C DRIVER
11243-
M: Ludovic Desroches <ludovic.desroches@microchip.com>
11255+
M: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
1124411256
1124511257
S: Supported
1124611258
F: drivers/i2c/busses/i2c-at91-*.c
@@ -11333,17 +11345,17 @@ F: drivers/iio/adc/at91-sama5d2_adc.c
1133311345
F: include/dt-bindings/iio/adc/at91-sama5d2_adc.h
1133411346

1133511347
MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER
11336-
M: Nicolas Ferre <nicolas.ferre@microchip.com>
11348+
M: Claudiu Beznea <claudiu.beznea@microchip.com>
1133711349
S: Supported
1133811350
F: drivers/power/reset/at91-sama5d2_shdwc.c
1133911351

1134011352
MICROCHIP SPI DRIVER
11341-
M: Nicolas Ferre <nicolas.ferre@microchip.com>
11353+
M: Tudor Ambarus <tudor.ambarus@microchip.com>
1134211354
S: Supported
1134311355
F: drivers/spi/spi-atmel.*
1134411356

1134511357
MICROCHIP SSC DRIVER
11346-
M: Nicolas Ferre <nicolas.ferre@microchip.com>
11358+
M: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
1134711359
L: [email protected] (moderated for non-subscribers)
1134811360
S: Supported
1134911361
F: drivers/misc/atmel-ssc.c
@@ -14862,6 +14874,7 @@ F: drivers/s390/block/dasd*
1486214874
F: include/linux/dasd_mod.h
1486314875

1486414876
S390 IOMMU (PCI)
14877+
M: Matthew Rosato <[email protected]>
1486514878
M: Gerald Schaefer <[email protected]>
1486614879
1486714880
S: Supported

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 8
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc6
5+
EXTRAVERSION = -rc7
66
NAME = Kleptomaniac Octopus
77

88
# *DOCUMENTATION*
@@ -567,7 +567,7 @@ ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)
567567
ifneq ($(CROSS_COMPILE),)
568568
CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
569569
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
570-
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
570+
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
571571
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
572572
endif
573573
ifneq ($(GCC_TOOLCHAIN),)
@@ -1754,7 +1754,7 @@ PHONY += descend $(build-dirs)
17541754
descend: $(build-dirs)
17551755
$(build-dirs): prepare
17561756
$(Q)$(MAKE) $(build)=$@ \
1757-
single-build=$(if $(filter-out $@/, $(filter $@/%, $(single-no-ko))),1) \
1757+
single-build=$(if $(filter-out $@/, $(filter $@/%, $(KBUILD_SINGLE_TARGETS))),1) \
17581758
need-builtin=1 need-modorder=1
17591759

17601760
clean-dirs := $(addprefix _clean_, $(clean-dirs))

arch/arm64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export TEXT_OFFSET
137137

138138
core-y += arch/arm64/
139139
libs-y := arch/arm64/lib/ $(libs-y)
140-
core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
140+
libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a
141141

142142
# Default target when executing plain make
143143
boot := arch/arm64/boot

arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,7 @@
454454
status = "okay";
455455
phy-mode = "2500base-x";
456456
phys = <&cp1_comphy5 2>;
457-
fixed-link {
458-
speed = <2500>;
459-
full-duplex;
460-
};
457+
managed = "in-band-status";
461458
};
462459

463460
&cp1_spi1 {

arch/arm64/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COMPAT_GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE_COMPAT)elfedit))
1414
COMPAT_GCC_TOOLCHAIN := $(realpath $(COMPAT_GCC_TOOLCHAIN_DIR)/..)
1515

1616
CC_COMPAT_CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))
17-
CC_COMPAT_CLANG_FLAGS += --prefix=$(COMPAT_GCC_TOOLCHAIN_DIR)
17+
CC_COMPAT_CLANG_FLAGS += --prefix=$(COMPAT_GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE_COMPAT))
1818
CC_COMPAT_CLANG_FLAGS += -no-integrated-as -Qunused-arguments
1919
ifneq ($(COMPAT_GCC_TOOLCHAIN),)
2020
CC_COMPAT_CLANG_FLAGS += --gcc-toolchain=$(COMPAT_GCC_TOOLCHAIN)

0 commit comments

Comments
 (0)