Skip to content

Commit 6fb845f

Browse files
axboeaxboe
committed
Merge tag 'v5.0-rc6' into for-5.1/block
Pull in 5.0-rc6 to avoid a dumb merge conflict with fs/iomap.c. This is needed since io_uring is now based on the block branch, to avoid a conflict between the multi-page bvecs and the bits of io_uring that touch the core block parts. * tag 'v5.0-rc6': (525 commits) Linux 5.0-rc6 x86/mm: Make set_pmd_at() paravirt aware MAINTAINERS: Update the ocores i2c bus driver maintainer, etc blk-mq: remove duplicated definition of blk_mq_freeze_queue Blk-iolatency: warn on negative inflight IO counter blk-iolatency: fix IO hang due to negative inflight counter MAINTAINERS: unify reference to xen-devel list x86/mm/cpa: Fix set_mce_nospec() futex: Handle early deadlock return correctly futex: Fix barrier comment net: dsa: b53: Fix for failure when irq is not defined in dt blktrace: Show requests without sector mips: cm: reprime error cause mips: loongson64: remove unreachable(), fix loongson_poweroff(). sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach() geneve: should not call rt6_lookup() when ipv6 was disabled KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221) KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222) kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974) signal: Better detection of synchronous signals ...
2 parents 56d18f6 + d139371 commit 6fb845f

File tree

566 files changed

+5560
-2185
lines changed

Some content is hidden

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

566 files changed

+5560
-2185
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/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/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 <fenghua.yu@intel.com>
99
Tony Luck <tony.luck@intel.com>
1010
Vikas Shivappa <vikas.shivappa@intel.com>
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: 51 additions & 1 deletion
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 <ast@kernel.org>
28502850
M: Daniel Borkmann <daniel@iogearbox.net>
2851+
R: Martin KaFai Lau <kafai@fb.com>
2852+
R: Song Liu <songliubraving@fb.com>
2853+
R: Yonghong Song <yhs@fb.com>
28512854
L: netdev@vger.kernel.org
28522855
L: linux-kernel@vger.kernel.org
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 <illusionist.neo@gmail.com>
@@ -5181,7 +5186,7 @@ DRM DRIVERS FOR XEN
51815186
M: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>
51825187
T: git git://anongit.freedesktop.org/drm/drm-misc
51835188
L: dri-devel@lists.freedesktop.org
5184-
L: xen-devel@lists.xen.org
5189+
L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
51855190
S: Supported
51865191
F: drivers/gpu/drm/xen/
51875192
F: Documentation/gpu/xen-front.rst
@@ -11307,10 +11312,12 @@ F: include/dt-bindings/
1130711312

1130811313
OPENCORES I2C BUS DRIVER
1130911314
M: Peter Korsgaard <peter@korsgaard.com>
11315+
M: Andrew Lunn <andrew@lunn.ch>
1131011316
L: linux-i2c@vger.kernel.org
1131111317
S: Maintained
1131211318
F: Documentation/i2c/busses/i2c-ocores
1131311319
F: drivers/i2c/busses/i2c-ocores.c
11320+
F: include/linux/platform_data/i2c-ocores.h
1131411321

1131511322
OPENRISC ARCHITECTURE
1131611323
M: Jonas Bonn <jonas@southpole.se>
@@ -12868,6 +12875,13 @@ F: Documentation/devicetree/bindings/net/dsa/realtek-smi.txt
1286812875
F: drivers/net/dsa/realtek-smi*
1286912876
F: drivers/net/dsa/rtl83*
1287012877

12878+
REDPINE WIRELESS DRIVER
12879+
M: Amitkumar Karwar <amitkarwar@gmail.com>
12880+
M: Siva Rebbagondla <siva8118@gmail.com>
12881+
L: linux-wireless@vger.kernel.org
12882+
S: Maintained
12883+
F: drivers/net/wireless/rsi/
12884+
1287112885
REGISTER MAP ABSTRACTION
1287212886
M: Mark Brown <broonie@kernel.org>
1287312887
L: linux-kernel@vger.kernel.org
@@ -13696,6 +13710,15 @@ L: netdev@vger.kernel.org
1369613710
S: Supported
1369713711
F: drivers/net/ethernet/sfc/
1369813712

13713+
SFF/SFP/SFP+ MODULE SUPPORT
13714+
M: Russell King <linux@armlinux.org.uk>
13715+
L: netdev@vger.kernel.org
13716+
S: Maintained
13717+
F: drivers/net/phy/phylink.c
13718+
F: drivers/net/phy/sfp*
13719+
F: include/linux/phylink.h
13720+
F: include/linux/sfp.h
13721+
1369913722
SGI GRU DRIVER
1370013723
M: Dimitri Sivanich <sivanich@sgi.com>
1370113724
S: Maintained
@@ -16641,6 +16664,15 @@ S: Maintained
1664116664
F: drivers/platform/x86/
1664216665
F: drivers/platform/olpc/
1664316666

16667+
X86 PLATFORM DRIVERS - ARCH
16668+
R: Darren Hart <dvhart@infradead.org>
16669+
R: Andy Shevchenko <andy@infradead.org>
16670+
L: platform-driver-x86@vger.kernel.org
16671+
L: x86@kernel.org
16672+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
16673+
S: Maintained
16674+
F: arch/x86/platform
16675+
1664416676
X86 VDSO
1664516677
M: Andy Lutomirski <luto@kernel.org>
1664616678
L: linux-kernel@vger.kernel.org
@@ -16673,6 +16705,24 @@ T: git git://linuxtv.org/media_tree.git
1667316705
S: Maintained
1667416706
F: drivers/media/tuners/tuner-xc2028.*
1667516707

16708+
XDP (eXpress Data Path)
16709+
M: Alexei Starovoitov <ast@kernel.org>
16710+
M: Daniel Borkmann <daniel@iogearbox.net>
16711+
M: David S. Miller <davem@davemloft.net>
16712+
M: Jakub Kicinski <jakub.kicinski@netronome.com>
16713+
M: Jesper Dangaard Brouer <hawk@kernel.org>
16714+
M: John Fastabend <john.fastabend@gmail.com>
16715+
L: netdev@vger.kernel.org
16716+
L: xdp-newbies@vger.kernel.org
16717+
S: Supported
16718+
F: net/core/xdp.c
16719+
F: include/net/xdp.h
16720+
F: kernel/bpf/devmap.c
16721+
F: kernel/bpf/cpumap.c
16722+
F: include/trace/events/xdp.h
16723+
K: xdp
16724+
N: xdp
16725+
1667616726
XDP SOCKETS (AF_XDP)
1667716727
M: Björn Töpel <bjorn.topel@intel.com>
1667816728
M: Magnus Karlsson <magnus.karlsson@intel.com>

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 5
33
PATCHLEVEL = 0
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc4
5+
EXTRAVERSION = -rc6
66
NAME = Shy Crocodile
77

88
# *DOCUMENTATION*

‎arch/arm/boot/dts/am335x-shc.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
pinctrl-names = "default";
216216
pinctrl-0 = <&mmc1_pins>;
217217
bus-width = <0x4>;
218-
cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
218+
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
219219
cd-inverted;
220220
max-frequency = <26000000>;
221221
vmmc-supply = <&vmmcsd_fixed>;

‎arch/arm/boot/dts/da850.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
clocksource: timer@20000 {
477477
compatible = "ti,da830-timer";
478478
reg = <0x20000 0x1000>;
479-
interrupts = <12>, <13>;
479+
interrupts = <21>, <22>;
480480
interrupt-names = "tint12", "tint34";
481481
clocks = <&pll0_auxclk>;
482482
};

‎arch/arm/boot/dts/imx6q-pistachio.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
power {
104104
label = "Power Button";
105105
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
106-
gpio-key,wakeup;
106+
wakeup-source;
107107
linux,code = <KEY_POWER>;
108108
};
109109
};

‎arch/arm/boot/dts/imx6sll-evk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
310310
cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>;
311311
keep-power-in-suspend;
312-
enable-sdio-wakeup;
312+
wakeup-source;
313313
vmmc-supply = <&reg_sd3_vmmc>;
314314
status = "okay";
315315
};

‎arch/arm/boot/dts/imx6sx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@
467467
};
468468

469469
gpt: gpt@2098000 {
470-
compatible = "fsl,imx6sx-gpt", "fsl,imx31-gpt";
470+
compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
471471
reg = <0x02098000 0x4000>;
472472
interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
473473
clocks = <&clks IMX6SX_CLK_GPT_BUS>,

‎arch/arm/boot/dts/meson.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
compatible = "amlogic,meson6-dwmac", "snps,dwmac";
275275
reg = <0xc9410000 0x10000
276276
0xc1108108 0x4>;
277-
interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
277+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
278278
interrupt-names = "macirq";
279279
status = "disabled";
280280
};

‎arch/arm/boot/dts/meson8b-ec100.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@
205205
cap-sd-highspeed;
206206
disable-wp;
207207

208-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
209-
cd-inverted;
208+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
210209

211210
vmmc-supply = <&vcc_3v3>;
212211
};

‎arch/arm/boot/dts/meson8b-odroidc1.dts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@
221221
/* Realtek RTL8211F (0x001cc916) */
222222
eth_phy: ethernet-phy@0 {
223223
reg = <0>;
224-
eee-broken-1000t;
225224
interrupt-parent = <&gpio_intc>;
226225
/* GPIOH_3 */
227226
interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
@@ -273,8 +272,7 @@
273272
cap-sd-highspeed;
274273
disable-wp;
275274

276-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
277-
cd-inverted;
275+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
278276

279277
vmmc-supply = <&tflash_vdd>;
280278
vqmmc-supply = <&tf_io>;

‎arch/arm/boot/dts/meson8m2-mxiii-plus.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@
206206
cap-sd-highspeed;
207207
disable-wp;
208208

209-
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
210-
cd-inverted;
209+
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
211210

212211
vmmc-supply = <&vcc_3v3>;
213212
};

‎arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
interrupts-extended = <
106106
&cpcap 15 0 &cpcap 14 0 &cpcap 28 0 &cpcap 19 0
107107
&cpcap 18 0 &cpcap 17 0 &cpcap 16 0 &cpcap 49 0
108-
&cpcap 48 1
108+
&cpcap 48 0
109109
>;
110110
interrupt-names =
111111
"id_ground", "id_float", "se0conn", "vbusvld",

‎arch/arm/boot/dts/omap3-gta04.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,11 +714,7 @@
714714

715715
vdda-supply = <&vdac>;
716716

717-
#address-cells = <1>;
718-
#size-cells = <0>;
719-
720717
port {
721-
reg = <0>;
722718
venc_out: endpoint {
723719
remote-endpoint = <&opa_in>;
724720
ti,channels = <1>;

‎arch/arm/boot/dts/omap3-n900.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@
814814
/* For debugging, it is often good idea to remove this GPIO.
815815
It means you can remove back cover (to reboot by removing
816816
battery) and still use the MMC card. */
817-
cd-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>; /* 160 */
817+
cd-gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* 160 */
818818
};
819819

820820
/* most boards use vaux3, only some old versions use vmmc2 instead */

0 commit comments

Comments
 (0)