Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...

- The coherent memory changes including mm changes.
- Some vmwgfx debug fixes.
- Removal of vmwgfx legacy security checks.

Signed-off-by: Dave Airlie <[email protected]>
From: Thomas Hellstrom <VMware> <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --combined MAINTAINERS
index 2abf6d28db64a250801d2a5066f3d466e38e9148,a55d4ef91b0b3e839e9c78c82a0cf787bcc2daea..d6600715a66231ad47831b8b68f51ed983c77d4e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -696,7 -696,6 +696,7 @@@ F: drivers/input/mouse/alps.
  ALTERA I2C CONTROLLER DRIVER
  M:    Thor Thayer <[email protected]>
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-altera.txt
  F:    drivers/i2c/busses/i2c-altera.c
  
  ALTERA MAILBOX DRIVER
@@@ -1175,7 -1174,6 +1175,7 @@@ S:      Maintaine
  F:    Documentation/devicetree/bindings/arm/arm-boards
  F:    Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt
  F:    Documentation/devicetree/bindings/clock/arm-integrator.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-versatile.txt
  F:    Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt
  F:    Documentation/devicetree/bindings/mtd/arm-versatile.txt
  F:    arch/arm/mach-integrator/
@@@ -1783,7 -1781,6 +1783,7 @@@ ARM/LPC18XX ARCHITECTUR
  M:    Vladimir Zapolskiy <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt
  F:    arch/arm/boot/dts/lpc43*
  F:    drivers/i2c/busses/i2c-lpc2k.c
  F:    drivers/memory/pl172.c
@@@ -1797,7 -1794,6 +1797,7 @@@ M:      Sylvain Lemieux <slemieux.tyco@gmail
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/vzapolskiy/linux-lpc32xx.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-pnx.txt
  F:    arch/arm/boot/dts/lpc32*
  F:    arch/arm/mach-lpc32xx/
  F:    drivers/i2c/busses/i2c-pnx.c
@@@ -1922,8 -1918,6 +1922,8 @@@ ARM/NOMADIK/U300/Ux500 ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-nomadik.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-stu300.txt
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/mach-u300/
  F:    arch/arm/mach-ux500/
@@@ -2146,7 -2140,6 +2146,7 @@@ L:      [email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-rk3x.txt
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/boot/dts/rv1108*
  F:    arch/arm/mach-rockchip/
@@@ -2282,7 -2275,6 +2282,7 @@@ M:      Patrice Chotard <patrice.chotard@st.
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.stlinux.com
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-st.txt
  F:    arch/arm/mach-sti/
  F:    arch/arm/boot/dts/sti*
  F:    drivers/char/hw_random/st-rng.c
@@@ -2474,7 -2466,6 +2474,7 @@@ ARM/VT8500 ARM ARCHITECTUR
  M:    Tony Prisk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-wmt.txt
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/timer-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
@@@ -2540,8 -2531,6 +2540,8 @@@ F:      drivers/cpuidle/cpuidle-zynq.
  F:    drivers/block/xsysace.c
  N:    zynq
  N:    xilinx
 +F:    Documentation/devicetree/bindings/i2c/i2c-cadence.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-xiic.txt
  F:    drivers/clocksource/timer-cadence-ttc.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
@@@ -3060,9 -3049,8 +3060,9 @@@ S:      Maintaine
  F:    arch/riscv/net/
  
  BPF JIT for S390
 -M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
 +M:    Vasily Gorbik <[email protected]>
 +M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5191,6 -5179,7 +5191,7 @@@ T:      git git://people.freedesktop.org/~th
  S:    Supported
  F:    drivers/gpu/drm/vmwgfx/
  F:    include/uapi/drm/vmwgfx_drm.h
+ F:    mm/as_dirty_helpers.c
  
  DRM DRIVERS
  M:    David Airlie <[email protected]>
@@@ -7360,7 -7349,6 +7361,7 @@@ I2C MV64XXX MARVELL AND ALLWINNER DRIVE
  M:    Gregory CLEMENT <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
  F:    drivers/i2c/busses/i2c-mv64xxx.c
  
  I2C OVER PARALLEL PORT
@@@ -11744,7 -11732,6 +11745,7 @@@ M:   Peter Korsgaard <[email protected]
  M:    Andrew Lunn <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/i2c/i2c-ocores.txt
  F:    Documentation/i2c/busses/i2c-ocores
  F:    drivers/i2c/busses/i2c-ocores.c
  F:    include/linux/platform_data/i2c-ocores.h
@@@ -13064,6 -13051,7 +13065,6 @@@ F:   Documentation/devicetree/bindings/ne
  
  QUALCOMM GENERIC INTERFACE I2C DRIVER
  M:    Alok Chauhan <[email protected]>
 -M:    Karthikeyan Ramasubramanian <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -13383,7 -13371,6 +13384,7 @@@ F:   drivers/clk/renesas
  RENESAS EMEV2 I2C DRIVER
  M:    Wolfram Sang <[email protected]>
  S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/i2c-emev2.txt
  F:    drivers/i2c/busses/i2c-emev2.c
  
  RENESAS ETHERNET DRIVERS
@@@ -13405,8 -13392,6 +13406,8 @@@ F:   drivers/iio/adc/rcar-gyroadc.
  RENESAS R-CAR I2C DRIVERS
  M:    Wolfram Sang <[email protected]>
  S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/i2c-rcar.txt
 +F:    Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
  F:    drivers/i2c/busses/i2c-rcar.c
  F:    drivers/i2c/busses/i2c-sh_mobile.c
  
@@@ -13637,9 -13622,8 +13638,9 @@@ S:   Maintaine
  F:    drivers/video/fbdev/savage/
  
  S390
 -M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
 +M:    Vasily Gorbik <[email protected]>
 +M:    Christian Borntraeger <[email protected]>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
@@@ -15001,7 -14985,7 +15002,7 @@@ S:   Odd Fixe
  F:    drivers/net/ethernet/adaptec/starfire*
  
  STEC S1220 SKD DRIVER
 -M:    Bart Van Assche <bart.vanassche@wdc.com>
 +M:    Damien Le Moal <Damien.LeMoal@wdc.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/block/skd*[ch]
@@@ -15696,7 -15680,6 +15697,7 @@@ R:   Bartosz Golaszewski <bgolaszewski@ba
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git
  S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/i2c-davinci.txt
  F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
  F:    arch/arm/boot/dts/da850*
@@@ -17318,7 -17301,7 +17319,7 @@@ F:   Documentation/ABI/stable/sysfs-hyper
  F:    Documentation/ABI/testing/sysfs-hypervisor-xen
  
  XEN NETWORK BACKEND DRIVER
 -M:    Wei Liu <wei.liu[email protected]>
 +M:    Wei Liu <wei.liu@kernel.org>
  M:    Paul Durrant <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -17400,7 -17383,6 +17401,7 @@@ M:   Jan Glauber <[email protected]
  L:    [email protected]
  W:    http://www.cavium.com
  S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/i2c-xlp9xx.txt
  F:    drivers/i2c/busses/i2c-xlp9xx.c
  
  XRA1403 GPIO EXPANDER

diff --combined include/linux/mm.h
index dd0b5f4e1e45acaad867296c3fd28bf2215af581,a0bc2a82917e5788c99e1ed3c892cb7ea26e270b..798cdda9560e46d5c553bde90076683f4d91b14e
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -99,17 -99,6 +99,17 @@@ extern int mmap_rnd_compat_bits __read_
  #include <asm/pgtable.h>
  #include <asm/processor.h>
  
 +/*
 + * Architectures that support memory tagging (assigning tags to memory regions,
 + * embedding these tags into addresses that point to these memory regions, and
 + * checking that the memory and the pointer tags match on memory accesses)
 + * redefine this macro to strip tags from pointers.
 + * It's defined as noop for arcitectures that don't support memory tagging.
 + */
 +#ifndef untagged_addr
 +#define untagged_addr(addr) (addr)
 +#endif
 +
  #ifndef __pa_symbol
  #define __pa_symbol(x)  __pa(RELOC_HIDE((unsigned long)(x), 0))
  #endif
@@@ -2686,7 -2675,24 +2686,24 @@@ typedef int (*pte_fn_t)(pte_t *pte, pgt
  extern int apply_to_page_range(struct mm_struct *mm, unsigned long address,
                               unsigned long size, pte_fn_t fn, void *data);
  
- 
+ struct pfn_range_apply;
+ typedef int (*pter_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
+                        struct pfn_range_apply *closure);
+ struct pfn_range_apply {
+       struct mm_struct *mm;
+       pter_fn_t ptefn;
+       unsigned int alloc;
+ };
+ extern int apply_to_pfn_range(struct pfn_range_apply *closure,
+                             unsigned long address, unsigned long size);
+ unsigned long apply_as_wrprotect(struct address_space *mapping,
+                                pgoff_t first_index, pgoff_t nr);
+ unsigned long apply_as_clean(struct address_space *mapping,
+                            pgoff_t first_index, pgoff_t nr,
+                            pgoff_t bitmap_pgoff,
+                            unsigned long *bitmap,
+                            pgoff_t *start,
+                            pgoff_t *end);
  #ifdef CONFIG_PAGE_POISONING
  extern bool page_poisoning_enabled(void);
  extern void kernel_poison_pages(struct page *page, int numpages, int enable);