Unverified Commit 3f0e3af4 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

Merge drm/drm-next into drm-xe-next 



Bring some drm-scheduler patches to Xe.

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parents 7c0c19c0 59260fe5

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ ForEachMacros: 
  - 'ynl_attr_for_each_nested'

  - 'ynl_attr_for_each_payload'

  - 'zorro_for_each_dev'

  - 'zpci_bus_for_each'



IncludeBlocks: Preserve

IncludeCategories:

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -1987,6 +1987,7 @@ D: netfilter: TCP window tracking code 
D: netfilter: raw table

D: netfilter: iprange match

D: netfilter: new logging interfaces

D: netfilter: ipset

D: netfilter: various other hacks

S: Tata

S: Hungary

Documentation/admin-guide/blockdev/zoned_loop.rst

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ MB and a zone capacity of 63 MB:: 


        $ modprobe zloop

        $ mkdir -p /var/local/zloop/0

        $ echo "add capacity_mb=2048,zone_size_mb=64,zone_capacity=63MB" > /dev/zloop-control

        $ echo "add capacity_mb=2048,zone_size_mb=64,zone_capacity_mb=63" > /dev/zloop-control



For the device created (/dev/zloop0), the zone backing files are all created

under the default base directory (/var/local/zloop)::

Documentation/arch/x86/boot.rst

+99 −99
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ Protocol: 2.00+ 


  Assigned boot loader IDs:



	== =======================================

	==== =======================================

	0x0  LILO

	     (0x00 reserved for pre-2.00 bootloader)

	0x1  Loadlin
@@ -456,7 +456,7 @@ Protocol: 2.00+ 
	     <http://sebastian-plotz.blogspot.de>

	0x12 OVMF UEFI virtualization stack

	0x13 barebox

	== =======================================

	==== =======================================



  Please contact <hpa@zytor.com> if you need a bootloader ID value assigned.

Documentation/devicetree/bindings/arm/arm,integrator.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: ARM Integrator Boards



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>

  - Linus Walleij <linusw@kernel.org>



description: |+

  These were the first ARM platforms officially supported by ARM Ltd.