Skip to content

Commit c9ba756

Browse files
author
Ingo Molnar
committed
Merge tag 'v5.0-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <[email protected]>
2 parents f678331 + d139371 commit c9ba756

File tree

817 files changed

+8528
-4021
lines changed

Some content is hidden

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

817 files changed

+8528
-4021
lines changed

‎Documentation/ABI/stable/sysfs-driver-mlxreg-io

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
2424
cpld3_version
2525

2626
Date: November 2018
27-
KernelVersion: 4.21
27+
KernelVersion: 5.0
2828
Contact: Vadim Pasternak <vadimpmellanox.com>
2929
Description: These files show with which CPLD versions have been burned
3030
on LED board.
@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
3535
jtag_enable
3636

3737
Date: November 2018
38-
KernelVersion: 4.21
38+
KernelVersion: 5.0
3939
Contact: Vadim Pasternak <vadimpmellanox.com>
4040
Description: These files enable and disable the access to the JTAG domain.
4141
By default access to the JTAG domain is disabled.
@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
105105
reset_voltmon_upgrade_fail
106106

107107
Date: November 2018
108-
KernelVersion: 4.21
108+
KernelVersion: 5.0
109109
Contact: Vadim Pasternak <vadimpmellanox.com>
110110
Description: These files show the system reset cause, as following: ComEx
111111
power fail, reset from ComEx, system platform reset, reset

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,12 +1696,11 @@
16961696
By default, super page will be supported if Intel IOMMU
16971697
has the capability. With this option, super page will
16981698
not be supported.
1699-
sm_off [Default Off]
1700-
By default, scalable mode will be supported if the
1699+
sm_on [Default Off]
1700+
By default, scalable mode will be disabled even if the
17011701
hardware advertises that it has support for the scalable
17021702
mode translation. With this option set, scalable mode
1703-
will not be used even on hardware which claims to support
1704-
it.
1703+
will be used on hardware which claims to support it.
17051704
tboot_noforce [Default Off]
17061705
Do not force the Intel IOMMU enabled under tboot.
17071706
By default, tboot will force Intel IOMMU on, which

‎Documentation/core-api/xarray.rst

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,13 @@ some, but not all of the other indices changing.
108108

109109
Sometimes you need to ensure that a subsequent call to :c:func:`xa_store`
110110
will not need to allocate memory. The :c:func:`xa_reserve` function
111-
will store a reserved entry at the indicated index. Users of the normal
112-
API will see this entry as containing ``NULL``. If you do not need to
113-
use the reserved entry, you can call :c:func:`xa_release` to remove the
114-
unused entry. If another user has stored to the entry in the meantime,
115-
:c:func:`xa_release` will do nothing; if instead you want the entry to
116-
become ``NULL``, you should use :c:func:`xa_erase`.
111+
will store a reserved entry at the indicated index. Users of the
112+
normal API will see this entry as containing ``NULL``. If you do
113+
not need to use the reserved entry, you can call :c:func:`xa_release`
114+
to remove the unused entry. If another user has stored to the entry
115+
in the meantime, :c:func:`xa_release` will do nothing; if instead you
116+
want the entry to become ``NULL``, you should use :c:func:`xa_erase`.
117+
Using :c:func:`xa_insert` on a reserved entry will fail.
117118

118119
If all entries in the array are ``NULL``, the :c:func:`xa_empty` function
119120
will return ``true``.
@@ -183,6 +184,8 @@ Takes xa_lock internally:
183184
* :c:func:`xa_store_bh`
184185
* :c:func:`xa_store_irq`
185186
* :c:func:`xa_insert`
187+
* :c:func:`xa_insert_bh`
188+
* :c:func:`xa_insert_irq`
186189
* :c:func:`xa_erase`
187190
* :c:func:`xa_erase_bh`
188191
* :c:func:`xa_erase_irq`

‎Documentation/devicetree/bindings/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ extra-y += $(DT_TMP_SCHEMA)
1717
quiet_cmd_mk_schema = SCHEMA $@
1818
cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)
1919

20-
DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')
20+
DT_DOCS = $(shell \
21+
cd $(srctree)/$(src) && \
22+
find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \
23+
)
24+
2125
DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))
2226

2327
extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

‎Documentation/devicetree/bindings/display/msm/gpu.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Example:
2727
reg = <0x04300000 0x20000>;
2828
reg-names = "kgsl_3d0_reg_memory";
2929
interrupts = <GIC_SPI 80 0>;
30-
interrupt-names = "kgsl_3d0_irq";
3130
clock-names =
3231
"core",
3332
"iface",

‎Documentation/devicetree/bindings/serio/olpc,ap-sp.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ Required properties:
44
- compatible : "olpc,ap-sp"
55
- reg : base address and length of SoC's WTM registers
66
- interrupts : SP-AP interrupt
7-
- clocks : phandle + clock-specifier for the clock that drives the WTM
8-
- clock-names: should be "sp"
97

108
Example:
119
ap-sp@d4290000 {
1210
compatible = "olpc,ap-sp";
1311
reg = <0xd4290000 0x1000>;
1412
interrupts = <40>;
15-
clocks = <&soc_clocks MMP2_CLK_SP>;
16-
clock-names = "sp";
1713
}

‎Documentation/sysctl/fs.txt

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,32 @@ of any kernel data structures.
5656

5757
dentry-state:
5858

59-
From linux/fs/dentry.c:
59+
From linux/include/linux/dcache.h:
6060
--------------------------------------------------------------
61-
struct {
61+
struct dentry_stat_t dentry_stat {
6262
int nr_dentry;
6363
int nr_unused;
6464
int age_limit; /* age in seconds */
6565
int want_pages; /* pages requested by system */
66-
int dummy[2];
67-
} dentry_stat = {0, 0, 45, 0,};
68-
--------------------------------------------------------------
69-
70-
Dentries are dynamically allocated and deallocated, and
71-
nr_dentry seems to be 0 all the time. Hence it's safe to
72-
assume that only nr_unused, age_limit and want_pages are
73-
used. Nr_unused seems to be exactly what its name says.
66+
int nr_negative; /* # of unused negative dentries */
67+
int dummy; /* Reserved for future use */
68+
};
69+
--------------------------------------------------------------
70+
71+
Dentries are dynamically allocated and deallocated.
72+
73+
nr_dentry shows the total number of dentries allocated (active
74+
+ unused). nr_unused shows the number of dentries that are not
75+
actively used, but are saved in the LRU list for future reuse.
76+
7477
Age_limit is the age in seconds after which dcache entries
7578
can be reclaimed when memory is short and want_pages is
7679
nonzero when shrink_dcache_pages() has been called and the
7780
dcache isn't pruned yet.
7881

82+
nr_negative shows the number of unused dentries that are also
83+
negative dentries which do not mapped to actual files.
84+
7985
==============================================================
8086

8187
dquot-max & dquot-nr:

‎Documentation/x86/resctrl_ui.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Fenghua Yu <[email protected]>
99
Tony Luck <[email protected]>
1010
Vikas Shivappa <[email protected]>
1111

12-
This feature is enabled by the CONFIG_X86_RESCTRL and the x86 /proc/cpuinfo
12+
This feature is enabled by the CONFIG_X86_CPU_RESCTRL and the x86 /proc/cpuinfo
1313
flag bits:
1414
RDT (Resource Director Technology) Allocation - "rdt_a"
1515
CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"

‎MAINTAINERS

Lines changed: 75 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2848,6 +2848,9 @@ F: include/uapi/linux/if_bonding.h
28482848
BPF (Safe dynamic programs and tools)
28492849
M: Alexei Starovoitov <[email protected]>
28502850
M: Daniel Borkmann <[email protected]>
2851+
R: Martin KaFai Lau <[email protected]>
2852+
R: Song Liu <[email protected]>
2853+
R: Yonghong Song <[email protected]>
28512854
L: [email protected]
28522855
L: [email protected]
28532856
T: git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
@@ -2873,6 +2876,8 @@ F: samples/bpf/
28732876
F: tools/bpf/
28742877
F: tools/lib/bpf/
28752878
F: tools/testing/selftests/bpf/
2879+
K: bpf
2880+
N: bpf
28762881

28772882
BPF JIT for ARM
28782883
M: Shubham Bansal <[email protected]>
@@ -3052,8 +3057,8 @@ F: include/linux/bcm963xx_nvram.h
30523057
F: include/linux/bcm963xx_tag.h
30533058

30543059
BROADCOM BNX2 GIGABIT ETHERNET DRIVER
3055-
M: Rasesh Mody <rasesh.mody@cavium.com>
3056-
M: Dept-GELinuxNICDev@cavium.com
3060+
M: Rasesh Mody <rmody@marvell.com>
3061+
M: GR-Linux-NIC-Dev@marvell.com
30573062
L: [email protected]
30583063
S: Supported
30593064
F: drivers/net/ethernet/broadcom/bnx2.*
@@ -3072,9 +3077,9 @@ S: Supported
30723077
F: drivers/scsi/bnx2i/
30733078

30743079
BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
3075-
M: Ariel Elior <ariel.elior@cavium.com>
3076-
M: Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
3077-
M: everest-linux-l2@cavium.com
3080+
M: Ariel Elior <aelior@marvell.com>
3081+
M: Sudarsana Kalluru <skalluru@marvell.com>
3082+
M: GR-everest-linux-l2@marvell.com
30783083
L: [email protected]
30793084
S: Supported
30803085
F: drivers/net/ethernet/broadcom/bnx2x/
@@ -3249,9 +3254,9 @@ S: Supported
32493254
F: drivers/scsi/bfa/
32503255

32513256
BROCADE BNA 10 GIGABIT ETHERNET DRIVER
3252-
M: Rasesh Mody <rasesh.mody@cavium.com>
3253-
M: Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
3254-
M: Dept-GELinuxNICDev@cavium.com
3257+
M: Rasesh Mody <rmody@marvell.com>
3258+
M: Sudarsana Kalluru <skalluru@marvell.com>
3259+
M: GR-Linux-NIC-Dev@marvell.com
32553260
L: [email protected]
32563261
S: Supported
32573262
F: drivers/net/ethernet/brocade/bna/
@@ -3978,6 +3983,7 @@ F: drivers/cpufreq/arm_big_little.c
39783983
CPU POWER MONITORING SUBSYSTEM
39793984
M: Thomas Renninger <[email protected]>
39803985
M: Shuah Khan <[email protected]>
3986+
M: Shuah Khan <[email protected]>
39813987
L: [email protected]
39823988
S: Maintained
39833989
F: tools/power/cpupower/
@@ -5180,7 +5186,7 @@ DRM DRIVERS FOR XEN
51805186
M: Oleksandr Andrushchenko <[email protected]>
51815187
T: git git://anongit.freedesktop.org/drm/drm-misc
51825188
L: [email protected]
5183-
L: xen-devel@lists.xen.org
5189+
L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
51845190
S: Supported
51855191
F: drivers/gpu/drm/xen/
51865192
F: Documentation/gpu/xen-front.rst
@@ -8258,6 +8264,7 @@ F: include/uapi/linux/sunrpc/
82588264

82598265
KERNEL SELFTEST FRAMEWORK
82608266
M: Shuah Khan <[email protected]>
8267+
M: Shuah Khan <[email protected]>
82618268
L: [email protected]
82628269
T: git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
82638270
Q: https://patchwork.kernel.org/project/linux-kselftest/list/
@@ -10688,9 +10695,9 @@ S: Maintained
1068810695
F: drivers/net/netdevsim/*
1068910696

1069010697
NETXEN (1/10) GbE SUPPORT
10691-
M: Manish Chopra <manish.chopra@cavium.com>
10692-
M: Rahul Verma <rahul.verma@cavium.com>
10693-
M: Dept-GELinuxNICDev@cavium.com
10698+
M: Manish Chopra <manishc@marvell.com>
10699+
M: Rahul Verma <rahulv@marvell.com>
10700+
M: GR-Linux-NIC-Dev@marvell.com
1069410701
L: [email protected]
1069510702
S: Supported
1069610703
F: drivers/net/ethernet/qlogic/netxen/
@@ -11305,10 +11312,12 @@ F: include/dt-bindings/
1130511312

1130611313
OPENCORES I2C BUS DRIVER
1130711314
M: Peter Korsgaard <[email protected]>
11315+
M: Andrew Lunn <[email protected]>
1130811316
L: [email protected]
1130911317
S: Maintained
1131011318
F: Documentation/i2c/busses/i2c-ocores
1131111319
F: drivers/i2c/busses/i2c-ocores.c
11320+
F: include/linux/platform_data/i2c-ocores.h
1131211321

1131311322
OPENRISC ARCHITECTURE
1131411323
M: Jonas Bonn <[email protected]>
@@ -12466,17 +12475,17 @@ S: Supported
1246612475
F: drivers/scsi/qedi/
1246712476

1246812477
QLOGIC QL4xxx ETHERNET DRIVER
12469-
M: Ariel Elior <Ariel.Elior@cavium.com>
12470-
M: everest-linux-l2@cavium.com
12478+
M: Ariel Elior <aelior@marvell.com>
12479+
M: GR-everest-linux-l2@marvell.com
1247112480
L: [email protected]
1247212481
S: Supported
1247312482
F: drivers/net/ethernet/qlogic/qed/
1247412483
F: include/linux/qed/
1247512484
F: drivers/net/ethernet/qlogic/qede/
1247612485

1247712486
QLOGIC QL4xxx RDMA DRIVER
12478-
M: Michal Kalderon <Michal.Kalderon@cavium.com>
12479-
M: Ariel Elior <Ariel.Elior@cavium.com>
12487+
M: Michal Kalderon <mkalderon@marvell.com>
12488+
M: Ariel Elior <aelior@marvell.com>
1248012489
L: [email protected]
1248112490
S: Supported
1248212491
F: drivers/infiniband/hw/qedr/
@@ -12496,7 +12505,7 @@ F: Documentation/scsi/LICENSE.qla2xxx
1249612505
F: drivers/scsi/qla2xxx/
1249712506

1249812507
QLOGIC QLA3XXX NETWORK DRIVER
12499-
M: Dept-GELinuxNICDev@cavium.com
12508+
M: GR-Linux-NIC-Dev@marvell.com
1250012509
L: [email protected]
1250112510
S: Supported
1250212511
F: Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
@@ -12510,16 +12519,16 @@ F: Documentation/scsi/LICENSE.qla4xxx
1251012519
F: drivers/scsi/qla4xxx/
1251112520

1251212521
QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
12513-
M: Shahed Shaikh <Shahed.Shaikh@cavium.com>
12514-
M: Manish Chopra <manish.chopra@cavium.com>
12515-
M: Dept-GELinuxNICDev@cavium.com
12522+
M: Shahed Shaikh <shshaikh@marvell.com>
12523+
M: Manish Chopra <manishc@marvell.com>
12524+
M: GR-Linux-NIC-Dev@marvell.com
1251612525
L: [email protected]
1251712526
S: Supported
1251812527
F: drivers/net/ethernet/qlogic/qlcnic/
1251912528

1252012529
QLOGIC QLGE 10Gb ETHERNET DRIVER
12521-
M: Manish Chopra <manish.chopra@cavium.com>
12522-
M: Dept-GELinuxNICDev@cavium.com
12530+
M: Manish Chopra <manishc@marvell.com>
12531+
M: GR-Linux-NIC-Dev@marvell.com
1252312532
L: [email protected]
1252412533
S: Supported
1252512534
F: drivers/net/ethernet/qlogic/qlge/
@@ -12858,6 +12867,13 @@ F: Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
1285812867
F: drivers/net/dsa/realtek-smi*
1285912868
F: drivers/net/dsa/rtl83*
1286012869

12870+
REDPINE WIRELESS DRIVER
12871+
M: Amitkumar Karwar <[email protected]>
12872+
M: Siva Rebbagondla <[email protected]>
12873+
L: [email protected]
12874+
S: Maintained
12875+
F: drivers/net/wireless/rsi/
12876+
1286112877
REGISTER MAP ABSTRACTION
1286212878
M: Mark Brown <[email protected]>
1286312879
L: [email protected]
@@ -13687,6 +13703,15 @@ L: [email protected]
1368713703
S: Supported
1368813704
F: drivers/net/ethernet/sfc/
1368913705

13706+
SFF/SFP/SFP+ MODULE SUPPORT
13707+
M: Russell King <[email protected]>
13708+
L: [email protected]
13709+
S: Maintained
13710+
F: drivers/net/phy/phylink.c
13711+
F: drivers/net/phy/sfp*
13712+
F: include/linux/phylink.h
13713+
F: include/linux/sfp.h
13714+
1369013715
SGI GRU DRIVER
1369113716
M: Dimitri Sivanich <[email protected]>
1369213717
S: Maintained
@@ -15834,6 +15859,7 @@ F: drivers/usb/common/usb-otg-fsm.c
1583415859
USB OVER IP DRIVER
1583515860
M: Valentina Manea <[email protected]>
1583615861
M: Shuah Khan <[email protected]>
15862+
M: Shuah Khan <[email protected]>
1583715863
L: [email protected]
1583815864
S: Maintained
1583915865
F: Documentation/usb/usbip_protocol.txt
@@ -16631,6 +16657,15 @@ S: Maintained
1663116657
F: drivers/platform/x86/
1663216658
F: drivers/platform/olpc/
1663316659

16660+
X86 PLATFORM DRIVERS - ARCH
16661+
R: Darren Hart <[email protected]>
16662+
R: Andy Shevchenko <[email protected]>
16663+
L: [email protected]
16664+
L: [email protected]
16665+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
16666+
S: Maintained
16667+
F: arch/x86/platform
16668+
1663416669
X86 VDSO
1663516670
M: Andy Lutomirski <[email protected]>
1663616671
L: [email protected]
@@ -16663,6 +16698,24 @@ T: git git://linuxtv.org/media_tree.git
1666316698
S: Maintained
1666416699
F: drivers/media/tuners/tuner-xc2028.*
1666516700

16701+
XDP (eXpress Data Path)
16702+
M: Alexei Starovoitov <[email protected]>
16703+
M: Daniel Borkmann <[email protected]>
16704+
M: David S. Miller <[email protected]>
16705+
M: Jakub Kicinski <[email protected]>
16706+
M: Jesper Dangaard Brouer <[email protected]>
16707+
M: John Fastabend <[email protected]>
16708+
L: [email protected]
16709+
L: [email protected]
16710+
S: Supported
16711+
F: net/core/xdp.c
16712+
F: include/net/xdp.h
16713+
F: kernel/bpf/devmap.c
16714+
F: kernel/bpf/cpumap.c
16715+
F: include/trace/events/xdp.h
16716+
K: xdp
16717+
N: xdp
16718+
1666616719
XDP SOCKETS (AF_XDP)
1666716720
M: Björn Töpel <[email protected]>
1666816721
M: Magnus Karlsson <[email protected]>

0 commit comments

Comments
 (0)