Commit ba08cf45 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.6-rc3 into tty-next



We want the tty fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e24cd4e6 f8788d86
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see:
	Documentation/process/license-rules.rst

for more details.

All contributions to the Linux Kernel are subject to this COPYING file.
+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ this logic.

As a single binary will need to support both 48-bit and 52-bit VA
spaces, the VMEMMAP must be sized large enough for 52-bit VAs and
also must be sized large enought to accommodate a fixed PAGE_OFFSET.
also must be sized large enough to accommodate a fixed PAGE_OFFSET.

Most code in the kernel should not need to consider the VA_BITS, for
code that does need to know the VA size the variables are
+9 −2
Original line number Diff line number Diff line
@@ -44,8 +44,15 @@ The AArch64 Tagged Address ABI has two stages of relaxation depending
how the user addresses are used by the kernel:

1. User addresses not accessed by the kernel but used for address space
   management (e.g. ``mmap()``, ``mprotect()``, ``madvise()``). The use
   of valid tagged pointers in this context is always allowed.
   management (e.g. ``mprotect()``, ``madvise()``). The use of valid
   tagged pointers in this context is allowed with the exception of
   ``brk()``, ``mmap()`` and the ``new_address`` argument to
   ``mremap()`` as these have the potential to alias with existing
   user addresses.

   NOTE: This behaviour changed in v5.6 and so some earlier kernels may
   incorrectly accept valid tagged pointers for the ``brk()``,
   ``mmap()`` and ``mremap()`` system calls.

2. User addresses accessed by the kernel (e.g. ``write()``). This ABI
   relaxation is disabled by default and the application thread needs to
+5 −1
Original line number Diff line number Diff line
@@ -43,9 +43,13 @@ properties:
        - enum:
          - allwinner,sun8i-h3-tcon-tv
          - allwinner,sun50i-a64-tcon-tv
          - allwinner,sun50i-h6-tcon-tv
        - const: allwinner,sun8i-a83t-tcon-tv

      - items:
        - enum:
          - allwinner,sun50i-h6-tcon-tv
        - const: allwinner,sun8i-r40-tcon-tv

  reg:
    maxItems: 1

+2 −1
Original line number Diff line number Diff line
Ilitek ILI210x/ILI2117/ILI251x touchscreen controller
Ilitek ILI210x/ILI2117/ILI2120/ILI251x touchscreen controller

Required properties:
- compatible:
    ilitek,ili210x for ILI210x
    ilitek,ili2117 for ILI2117
    ilitek,ili2120 for ILI2120
    ilitek,ili251x for ILI251x

- reg: The I2C address of the device
Loading