Skip to content

Commit 4bd257d

Browse files
mchehabmchehab
committed
Merge tag 'v4.20-rc7' into patchwork
Linux 4.20-rc7 * tag 'v4.20-rc7': (403 commits) Linux 4.20-rc7 scripts/spdxcheck.py: always open files in binary mode checkstack.pl: fix for aarch64 userfaultfd: check VM_MAYWRITE was set after verifying the uffd is registered fs/iomap.c: get/put the page in iomap_page_create/release() hugetlbfs: call VM_BUG_ON_PAGE earlier in free_huge_page() memblock: annotate memblock_is_reserved() with __init_memblock psi: fix reference to kernel commandline enable arch/sh/include/asm/io.h: provide prototypes for PCI I/O mapping in asm/io.h mm/sparse: add common helper to mark all memblocks present mm: introduce common STRUCT_PAGE_MAX_SHIFT define alpha: fix hang caused by the bootmem removal XArray: Fix xa_alloc when id exceeds max drm/vmwgfx: Protect from excessive execbuf kernel memory allocations v3 MAINTAINERS: Daniel for drm co-maintainer drm/amdgpu: drop fclk/gfxclk ratio setting IB/core: Fix oops in netdev_next_upper_dev_rcu() dm thin: bump target version drm/vmwgfx: remove redundant return ret statement drm/i915: Flush GPU relocs harder for gen3 ...
2 parents d2b4387 + 7566ec3 commit 4bd257d

File tree

415 files changed

+4599
-1992
lines changed

Some content is hidden

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

415 files changed

+4599
-1992
lines changed

‎CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,6 +2541,10 @@ S: Ormond
25412541
S: Victoria 3163
25422542
S: Australia
25432543

2544+
N: Eric Miao
2545+
E: eric.y.miao@gmail.com
2546+
D: MMP support
2547+
25442548
N: Pauline Middelink
25452549
E: middelin@polyware.nl
25462550
D: General low-level bug fixes, /proc fixes, identd support
@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5
41154119
S: Bellevue, Washington 98007
41164120
S: USA
41174121

4122+
N: Haojian Zhuang
4123+
E: haojian.zhuang@gmail.com
4124+
D: MMP support
4125+
41184126
N: Richard Zidlicky
41194127
E: rz@linux-m68k.org, rdzidlic@geocities.com
41204128
W: http://www.geocities.com/rdzidlic

‎Documentation/ABI/testing/sysfs-class-net-dsa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/class/net/<iface>/tagging
1+
What: /sys/class/net/<iface>/dsa/tagging
22
Date: August 2018
33
KernelVersion: 4.20
44
Contact: netdev@vger.kernel.org

‎Documentation/core-api/xarray.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ Takes xa_lock internally:
187187
* :c:func:`xa_erase_bh`
188188
* :c:func:`xa_erase_irq`
189189
* :c:func:`xa_cmpxchg`
190+
* :c:func:`xa_cmpxchg_bh`
191+
* :c:func:`xa_cmpxchg_irq`
190192
* :c:func:`xa_store_range`
191193
* :c:func:`xa_alloc`
192194
* :c:func:`xa_alloc_bh`
@@ -263,7 +265,8 @@ using :c:func:`xa_lock_irqsave` in both the interrupt handler and process
263265
context, or :c:func:`xa_lock_irq` in process context and :c:func:`xa_lock`
264266
in the interrupt handler. Some of the more common patterns have helper
265267
functions such as :c:func:`xa_store_bh`, :c:func:`xa_store_irq`,
266-
:c:func:`xa_erase_bh` and :c:func:`xa_erase_irq`.
268+
:c:func:`xa_erase_bh`, :c:func:`xa_erase_irq`, :c:func:`xa_cmpxchg_bh`
269+
and :c:func:`xa_cmpxchg_irq`.
267270

268271
Sometimes you need to protect access to the XArray with a mutex because
269272
that lock sits above another mutex in the locking hierarchy. That does

‎Documentation/devicetree/bindings/clock/clock-bindings.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,3 +168,19 @@ a shared clock is forbidden.
168168

169169
Configuration of common clocks, which affect multiple consumer devices can
170170
be similarly specified in the clock provider node.
171+
172+
==Protected clocks==
173+
174+
Some platforms or firmwares may not fully expose all the clocks to the OS, such
175+
as in situations where those clks are used by drivers running in ARM secure
176+
execution levels. Such a configuration can be specified in device tree with the
177+
protected-clocks property in the form of a clock specifier list. This property should
178+
only be specified in the node that is providing the clocks being protected:
179+
180+
clock-controller@a000f000 {
181+
compatible = "vendor,clk95;
182+
reg = <0xa000f000 0x1000>
183+
#clocks-cells = <1>;
184+
...
185+
protected-clocks = <UART3_CLK>, <SPI5_CLK>;
186+
};

‎Documentation/devicetree/bindings/input/input-reset.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The /chosen node should contain a 'linux,sysrq-reset-seq' child node to define
1212
a set of keys.
1313

1414
Required property:
15-
sysrq-reset-seq: array of Linux keycodes, one keycode per cell.
15+
keyset: array of Linux keycodes, one keycode per cell.
1616

1717
Optional property:
1818
timeout-ms: duration keys must be pressed together in milliseconds before

‎Documentation/media/uapi/v4l/extended-controls.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,6 +1518,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
15181518
configuring a stateless hardware decoding pipeline for MPEG-2.
15191519
The bitstream parameters are defined according to :ref:`mpeg2part2`.
15201520

1521+
.. note::
1522+
1523+
This compound control is not yet part of the public kernel API and
1524+
it is expected to change.
1525+
15211526
.. c:type:: v4l2_ctrl_mpeg2_slice_params
15221527
15231528
.. cssclass:: longtable
@@ -1638,6 +1643,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
16381643
Specifies quantization matrices (as extracted from the bitstream) for the
16391644
associated MPEG-2 slice data.
16401645

1646+
.. note::
1647+
1648+
This compound control is not yet part of the public kernel API and
1649+
it is expected to change.
1650+
16411651
.. c:type:: v4l2_ctrl_mpeg2_quantization
16421652
16431653
.. cssclass:: longtable

‎MAINTAINERS

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,7 @@ F: drivers/clk/sirf/
14721472
F: drivers/clocksource/timer-prima2.c
14731473
F: drivers/clocksource/timer-atlas7.c
14741474
N: [^a-z]sirf
1475+
X: drivers/gnss
14751476

14761477
ARM/EBSA110 MACHINE SUPPORT
14771478
M: Russell King <linux@armlinux.org.uk>
@@ -1738,13 +1739,17 @@ ARM/Mediatek SoC support
17381739
M: Matthias Brugger <matthias.bgg@gmail.com>
17391740
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
17401741
L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
1742+
W: https://mtk.bcnfs.org/
1743+
C: irc://chat.freenode.net/linux-mediatek
17411744
S: Maintained
17421745
F: arch/arm/boot/dts/mt6*
17431746
F: arch/arm/boot/dts/mt7*
17441747
F: arch/arm/boot/dts/mt8*
17451748
F: arch/arm/mach-mediatek/
17461749
F: arch/arm64/boot/dts/mediatek/
1750+
F: drivers/soc/mediatek/
17471751
N: mtk
1752+
N: mt[678]
17481753
K: mediatek
17491754

17501755
ARM/Mediatek USB3 PHY DRIVER
@@ -3278,11 +3283,16 @@ S: Maintained
32783283
F: sound/pci/oxygen/
32793284

32803285
C-SKY ARCHITECTURE
3281-
M: Guo Ren <ren_guo@c-sky.com>
3286+
M: Guo Ren <guoren@kernel.org>
32823287
T: git https://github.com/c-sky/csky-linux.git
32833288
S: Supported
32843289
F: arch/csky/
32853290
F: Documentation/devicetree/bindings/csky/
3291+
F: drivers/irqchip/irq-csky-*
3292+
F: Documentation/devicetree/bindings/interrupt-controller/csky,*
3293+
F: drivers/clocksource/timer-gx6605s.c
3294+
F: drivers/clocksource/timer-mp-csky.c
3295+
F: Documentation/devicetree/bindings/timer/csky,*
32863296
K: csky
32873297
N: csky
32883298

@@ -4851,6 +4861,7 @@ F: include/uapi/drm/vmwgfx_drm.h
48514861

48524862
DRM DRIVERS
48534863
M: David Airlie <airlied@linux.ie>
4864+
M: Daniel Vetter <daniel@ffwll.ch>
48544865
L: dri-devel@lists.freedesktop.org
48554866
T: git git://anongit.freedesktop.org/drm/drm
48564867
B: https://bugs.freedesktop.org/
@@ -6330,6 +6341,7 @@ F: include/uapi/linux/gigaset_dev.h
63306341

63316342
GNSS SUBSYSTEM
63326343
M: Johan Hovold <johan@kernel.org>
6344+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git
63336345
S: Maintained
63346346
F: Documentation/ABI/testing/sysfs-class-gnss
63356347
F: Documentation/devicetree/bindings/gnss/
@@ -10012,12 +10024,9 @@ S: Odd Fixes
1001210024
F: drivers/media/radio/radio-miropcm20*
1001310025

1001410026
MMP SUPPORT
10015-
M: Eric Miao <eric.y.miao@gmail.com>
10016-
M: Haojian Zhuang <haojian.zhuang@gmail.com>
10027+
R: Lubomir Rintel <lkundrak@v3.sk>
1001710028
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
10018-
T: git git://github.com/hzhuang1/linux.git
10019-
T: git git://git.linaro.org/people/ycmiao/pxa-linux.git
10020-
S: Maintained
10029+
S: Odd Fixes
1002110030
F: arch/arm/boot/dts/mmp*
1002210031
F: arch/arm/mach-mmp/
1002310032

@@ -13910,6 +13919,13 @@ F: drivers/md/raid*
1391013919
F: include/linux/raid/
1391113920
F: include/uapi/linux/raid/
1391213921

13922+
SOCIONEXT (SNI) AVE NETWORK DRIVER
13923+
M: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
13924+
L: netdev@vger.kernel.org
13925+
S: Maintained
13926+
F: drivers/net/ethernet/socionext/sni_ave.c
13927+
F: Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt
13928+
1391313929
SOCIONEXT (SNI) NETSEC NETWORK DRIVER
1391413930
M: Jassi Brar <jaswinder.singh@linaro.org>
1391513931
L: netdev@vger.kernel.org

‎Makefile

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

88
# *DOCUMENTATION*

‎arch/alpha/kernel/setup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ setup_arch(char **cmdline_p)
634634

635635
/* Find our memory. */
636636
setup_memory(kernel_end);
637+
memblock_set_bottom_up(true);
637638

638639
/* First guess at cpu cache sizes. Do this before init_arch. */
639640
determine_cpu_caches(cpu->type);

‎arch/alpha/mm/numa.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ setup_memory_node(int nid, void *kernel_end)
144144
if (!nid && (node_max_pfn < end_kernel_pfn || node_min_pfn > start_kernel_pfn))
145145
panic("kernel loaded out of ram");
146146

147+
memblock_add(PFN_PHYS(node_min_pfn),
148+
(node_max_pfn - node_min_pfn) << PAGE_SHIFT);
149+
147150
/* Zone start phys-addr must be 2^(MAX_ORDER-1) aligned.
148151
Note that we round this down, not up - node memory
149152
has much larger alignment than 8Mb, so it's safe. */
150153
node_min_pfn &= ~((1UL << (MAX_ORDER-1))-1);
151154

152-
memblock_add(PFN_PHYS(node_min_pfn),
153-
(node_max_pfn - node_min_pfn) << PAGE_SHIFT);
154-
155155
NODE_DATA(nid)->node_start_pfn = node_min_pfn;
156156
NODE_DATA(nid)->node_present_pages = node_max_pfn - node_min_pfn;
157157

‎arch/arc/Kconfig

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ endmenu
109109

110110
choice
111111
prompt "ARC Instruction Set"
112-
default ISA_ARCOMPACT
112+
default ISA_ARCV2
113113

114114
config ISA_ARCOMPACT
115115
bool "ARCompact ISA"
@@ -176,13 +176,11 @@ endchoice
176176

177177
config CPU_BIG_ENDIAN
178178
bool "Enable Big Endian Mode"
179-
default n
180179
help
181180
Build kernel for Big Endian Mode of ARC CPU
182181

183182
config SMP
184183
bool "Symmetric Multi-Processing"
185-
default n
186184
select ARC_MCIP if ISA_ARCV2
187185
help
188186
This enables support for systems with more than one CPU.
@@ -254,15 +252,13 @@ config ARC_CACHE_PAGES
254252
config ARC_CACHE_VIPT_ALIASING
255253
bool "Support VIPT Aliasing D$"
256254
depends on ARC_HAS_DCACHE && ISA_ARCOMPACT
257-
default n
258255

259256
endif #ARC_CACHE
260257

261258
config ARC_HAS_ICCM
262259
bool "Use ICCM"
263260
help
264261
Single Cycle RAMS to store Fast Path Code
265-
default n
266262

267263
config ARC_ICCM_SZ
268264
int "ICCM Size in KB"
@@ -273,7 +269,6 @@ config ARC_HAS_DCCM
273269
bool "Use DCCM"
274270
help
275271
Single Cycle RAMS to store Fast Path Data
276-
default n
277272

278273
config ARC_DCCM_SZ
279274
int "DCCM Size in KB"
@@ -366,13 +361,11 @@ if ISA_ARCOMPACT
366361

367362
config ARC_COMPACT_IRQ_LEVELS
368363
bool "Setup Timer IRQ as high Priority"
369-
default n
370364
# if SMP, LV2 enabled ONLY if ARC implementation has LV2 re-entrancy
371365
depends on !SMP
372366

373367
config ARC_FPU_SAVE_RESTORE
374368
bool "Enable FPU state persistence across context switch"
375-
default n
376369
help
377370
Double Precision Floating Point unit had dedicated regs which
378371
need to be saved/restored across context-switch.
@@ -453,7 +446,6 @@ config HIGHMEM
453446

454447
config ARC_HAS_PAE40
455448
bool "Support for the 40-bit Physical Address Extension"
456-
default n
457449
depends on ISA_ARCV2
458450
select HIGHMEM
459451
select PHYS_ADDR_T_64BIT
@@ -496,7 +488,6 @@ config HZ
496488

497489
config ARC_METAWARE_HLINK
498490
bool "Support for Metaware debugger assisted Host access"
499-
default n
500491
help
501492
This options allows a Linux userland apps to directly access
502493
host file system (open/creat/read/write etc) with help from
@@ -524,13 +515,11 @@ config ARC_DW2_UNWIND
524515

525516
config ARC_DBG_TLB_PARANOIA
526517
bool "Paranoia Checks in Low Level TLB Handlers"
527-
default n
528518

529519
endif
530520

531521
config ARC_UBOOT_SUPPORT
532522
bool "Support uboot arg Handling"
533-
default n
534523
help
535524
ARC Linux by default checks for uboot provided args as pointers to
536525
external cmdline or DTB. This however breaks in absence of uboot,

‎arch/arc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# published by the Free Software Foundation.
77
#
88

9-
KBUILD_DEFCONFIG := nsim_700_defconfig
9+
KBUILD_DEFCONFIG := nsim_hs_defconfig
1010

1111
cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
1212
cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7

‎arch/arc/boot/dts/hsdk.dts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,21 @@
222222
bus-width = <4>;
223223
dma-coherent;
224224
};
225+
226+
gpio: gpio@3000 {
227+
compatible = "snps,dw-apb-gpio";
228+
reg = <0x3000 0x20>;
229+
#address-cells = <1>;
230+
#size-cells = <0>;
231+
232+
gpio_port_a: gpio-controller@0 {
233+
compatible = "snps,dw-apb-gpio-port";
234+
gpio-controller;
235+
#gpio-cells = <2>;
236+
snps,nr-gpios = <24>;
237+
reg = <0>;
238+
};
239+
};
225240
};
226241

227242
memory@80000000 {

‎arch/arc/configs/axs101_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CONFIG_PERF_EVENTS=y
1414
# CONFIG_VM_EVENT_COUNTERS is not set
1515
# CONFIG_SLUB_DEBUG is not set
1616
# CONFIG_COMPAT_BRK is not set
17+
CONFIG_ISA_ARCOMPACT=y
1718
CONFIG_MODULES=y
1819
CONFIG_MODULE_FORCE_LOAD=y
1920
CONFIG_MODULE_UNLOAD=y
@@ -95,6 +96,7 @@ CONFIG_VFAT_FS=y
9596
CONFIG_NTFS_FS=y
9697
CONFIG_TMPFS=y
9798
CONFIG_NFS_FS=y
99+
CONFIG_NFS_V3_ACL=y
98100
CONFIG_NLS_CODEPAGE_437=y
99101
CONFIG_NLS_ISO8859_1=y
100102
# CONFIG_ENABLE_WARN_DEPRECATED is not set

‎arch/arc/configs/axs103_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ CONFIG_VFAT_FS=y
9494
CONFIG_NTFS_FS=y
9595
CONFIG_TMPFS=y
9696
CONFIG_NFS_FS=y
97+
CONFIG_NFS_V3_ACL=y
9798
CONFIG_NLS_CODEPAGE_437=y
9899
CONFIG_NLS_ISO8859_1=y
99100
# CONFIG_ENABLE_WARN_DEPRECATED is not set

‎arch/arc/configs/axs103_smp_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ CONFIG_VFAT_FS=y
9797
CONFIG_NTFS_FS=y
9898
CONFIG_TMPFS=y
9999
CONFIG_NFS_FS=y
100+
CONFIG_NFS_V3_ACL=y
100101
CONFIG_NLS_CODEPAGE_437=y
101102
CONFIG_NLS_ISO8859_1=y
102103
# CONFIG_ENABLE_WARN_DEPRECATED is not set

‎arch/arc/configs/hsdk_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ CONFIG_SERIAL_8250_CONSOLE=y
4545
CONFIG_SERIAL_8250_DW=y
4646
CONFIG_SERIAL_OF_PLATFORM=y
4747
# CONFIG_HW_RANDOM is not set
48+
CONFIG_GPIOLIB=y
49+
CONFIG_GPIO_SYSFS=y
50+
CONFIG_GPIO_DWAPB=y
4851
# CONFIG_HWMON is not set
4952
CONFIG_DRM=y
5053
# CONFIG_DRM_FBDEV_EMULATION is not set
@@ -65,6 +68,7 @@ CONFIG_EXT3_FS=y
6568
CONFIG_VFAT_FS=y
6669
CONFIG_TMPFS=y
6770
CONFIG_NFS_FS=y
71+
CONFIG_NFS_V3_ACL=y
6872
CONFIG_NLS_CODEPAGE_437=y
6973
CONFIG_NLS_ISO8859_1=y
7074
# CONFIG_ENABLE_WARN_DEPRECATED is not set

0 commit comments

Comments
 (0)