Skip to content

Commit 22261fd

Browse files
committed
Merge tag 'perf-urgent-for-mingo-5.1-20190329' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo: Core libraries: Jiri Olsa: - Fix max perf_event_attr.precise_ip detection. Kan Liang: - Fix parser error for uncore event alias Wei Lin: - Fixup ordering of kernel maps after obtaining the main kernel map address. Intel PT: Adrian Hunter: - Fix TSC slip where A TSC packet can slip past MTC packets so that the timestamp appears to go backwards. - Fixes for exported-sql-viewer GUI conversion to python3. ARM coresight: Solomon Tan: - Fix the build by adding a missing case value for enumeration value introduced in newer library, that now is the required one. tool headers: Arnaldo Carvalho de Melo: - Syncronize kernel headers with the kernel, getting new io_uring and pidfd_send_signal syscalls so that 'perf trace' can handle them. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2 parents 1a9df9e + e94d6b7 commit 22261fd

57 files changed

Lines changed: 719 additions & 392 deletions

File tree

Some content is hidden

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

Documentation/filesystems/mount_api.txt

Lines changed: 195 additions & 172 deletions
Large diffs are not rendered by default.

arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ config ARCH_DAVINCI
596596
select HAVE_IDE
597597
select PM_GENERIC_DOMAINS if PM
598598
select PM_GENERIC_DOMAINS_OF if PM && OF
599+
select REGMAP_MMIO
599600
select RESET_CONTROLLER
600601
select SPARSE_IRQ
601602
select USE_OF

arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
};
9494

9595
&hdmi {
96-
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
96+
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
9797
};
9898

9999
&pwm {

arch/arm/boot/dts/imx6dl-yapp4-common.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@
114114
reg = <2>;
115115
};
116116

117-
switch@0 {
117+
switch@10 {
118118
compatible = "qca,qca8334";
119-
reg = <0>;
119+
reg = <10>;
120120

121121
switch_ports: ports {
122122
#address-cells = <1>;
@@ -125,7 +125,7 @@
125125
ethphy0: port@0 {
126126
reg = <0>;
127127
label = "cpu";
128-
phy-mode = "rgmii";
128+
phy-mode = "rgmii-id";
129129
ethernet = <&fec>;
130130

131131
fixed-link {

arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
265265
vmcc-supply = <&reg_sd3_vmmc>;
266266
cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
267-
bus-witdh = <4>;
267+
bus-width = <4>;
268268
no-1-8-v;
269269
status = "okay";
270270
};
@@ -275,7 +275,7 @@
275275
pinctrl-1 = <&pinctrl_usdhc4_100mhz>;
276276
pinctrl-2 = <&pinctrl_usdhc4_200mhz>;
277277
vmcc-supply = <&reg_sd4_vmmc>;
278-
bus-witdh = <8>;
278+
bus-width = <8>;
279279
no-1-8-v;
280280
non-removable;
281281
status = "okay";

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
pinctrl-0 = <&pinctrl_enet>;
9292
phy-handle = <&ethphy>;
9393
phy-mode = "rgmii";
94+
phy-reset-duration = <10>; /* in msecs */
9495
phy-reset-gpios = <&gpio3 23 GPIO_ACTIVE_LOW>;
9596
phy-supply = <&vdd_eth_io_reg>;
9697
status = "disabled";

arch/arm/boot/dts/imx6ull-pinfunc-snvs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
33
* Copyright (C) 2016 Freescale Semiconductor, Inc.
44
* Copyright (C) 2017 NXP

arch/arm/boot/dts/ste-nomadik-nhk15.dts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,13 @@
213213
gpio-sck = <&gpio0 5 GPIO_ACTIVE_HIGH>;
214214
gpio-mosi = <&gpio0 4 GPIO_ACTIVE_HIGH>;
215215
/*
216-
* It's not actually active high, but the frameworks assume
217-
* the polarity of the passed-in GPIO is "normal" (active
218-
* high) then actively drives the line low to select the
219-
* chip.
216+
* This chipselect is active high. Just setting the flags
217+
* to GPIO_ACTIVE_HIGH is not enough for the SPI DT bindings,
218+
* it will be ignored, only the special "spi-cs-high" flag
219+
* really counts.
220220
*/
221221
cs-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
222+
spi-cs-high;
222223
num-chipselects = <1>;
223224

224225
/*

arch/arm/configs/imx_v4_v5_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ CONFIG_IMX_SDMA=y
170170
# CONFIG_IOMMU_SUPPORT is not set
171171
CONFIG_IIO=y
172172
CONFIG_FSL_MX25_ADC=y
173+
CONFIG_PWM=y
174+
CONFIG_PWM_IMX1=y
175+
CONFIG_PWM_IMX27=y
173176
CONFIG_EXT4_FS=y
174177
# CONFIG_DNOTIFY is not set
175178
CONFIG_VFAT_FS=y

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ CONFIG_MAG3110=y
398398
CONFIG_MPL3115=y
399399
CONFIG_PWM=y
400400
CONFIG_PWM_FSL_FTM=y
401-
CONFIG_PWM_IMX=y
401+
CONFIG_PWM_IMX27=y
402402
CONFIG_NVMEM_IMX_OCOTP=y
403403
CONFIG_NVMEM_VF610_OCOTP=y
404404
CONFIG_TEE=y

0 commit comments

Comments
 (0)