[PULL] drm-misc-next

Daniel Vetter daniel.vetter at ffwll.ch
Fri Dec 30 10:35:13 UTC 2016


Hi Dave,

First -misc pull for 4.11:
- drm_mm rework + lots of selftests (Chris Wilson)
- new connector_list locking+iterators 
- plenty of kerneldoc updates
- format handling rework from Ville
- atomic helper changes from Maarten for better plane corner-case handling
  in drivers, plus the i915 legacy cursor patch that needs this
- bridge cleanup from Laurent
- plus plenty of small stuff all over
- also contains a merge of the 4.10 docs tree so that we could apply the
  dma-buf kerneldoc patches

It's a lot more than usual, but due to the merge window blackout it also
covers about 4 weeks, so all in line again on a per-week basis. The more
annoying part with no pull request for 4 weeks is managing cross-tree
work. The -intel pull request I'll follow up with does conflict quite a
bit with -misc here. Longer-term (if drm-misc keeps growing) a
drm-next-queued to accept pull request for the next merge window during
this time might be useful.

I'd also like to backmerge -rc2+this into drm-intel next week, we have
quite a pile of patches waiting for the stuff in here.
 
Cheers, Daniel


The following changes since commit 2cf026ae85c42f253feb9f420d1b4bc99bd5503d:

  Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next (2016-12-13 14:29:05 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/git/drm-misc tags/drm-misc-next-2016-12-30

for you to fetch changes up to 9b8b75de4cb379187c481a5332a12429f31c0887:

  drm: Add kerneldoc markup for new @scan parameters in drm_mm (2016-12-28 14:05:38 +0100)

----------------------------------------------------------------
Bartosz Golaszewski (2):
      drm: bridge: add DT bindings for TI ths8135
      drm: bridge: add support for TI ths8135

Caesar Wang (1):
      drm/bridge: analogix_dp: set the DPCD600 during disabling PSR

Chris Wilson (39):
      dma-buf: Provide wrappers for reservation's lock
      drm: Add drm_mm_for_each_node_safe()
      drm: Constify the drm_mm API
      drm/i915: Simplify i915_gtt_color_adjust()
      drm: Use drm_mm_nodes() as shorthand for the list of nodes under struct drm_mm
      drm: Compile time enabling for asserts in drm_mm
      lib: Add a simple prime number generator
      drm: Add a simple generator of random permutations
      drm: Add some kselftests for the DRM range manager (struct drm_mm)
      drm: kselftest for drm_mm_init()
      drm: kselftest for drm_mm_debug()
      drm: kselftest for drm_mm_reserve_node()
      drm: kselftest for drm_mm_insert_node()
      drm: kselftest for drm_mm_replace_node()
      drm: kselftest for drm_mm_insert_node_in_range()
      drm: kselftest for drm_mm and alignment
      drm: kselftest for drm_mm and eviction
      drm: kselftest for drm_mm and range restricted eviction
      drm: kselftest for drm_mm and top-down allocation
      drm: kselftest for drm_mm and color adjustment
      drm: kselftest for drm_mm and color eviction
      drm: kselftest for drm_mm and restricted color eviction
      drm: Promote drm_mm alignment to u64
      drm: Fix kerneldoc for drm_mm_scan_remove_block()
      drm: Detect overflow in drm_mm_reserve_node()
      drm: Simplify drm_mm_clean()
      drm: Add asserts to catch overflow in drm_mm_init() and drm_mm_init_scan()
      drm: Extract struct drm_mm_scan from struct drm_mm
      drm: Rename prev_node to hole in drm_mm_scan_add_block()
      drm: Unconditionally do the range check in drm_mm_scan_add_block()
      drm: Fix application of color vs range restriction when scanning drm_mm
      drm: Compute tight evictions for drm_mm_scan
      drm: Optimise power-of-two alignments in drm_mm_scan_add_block()
      drm: Simplify drm_mm scan-list manipulation
      drm: Apply tight eviction scanning to color_adjust
      drm: Wrap drm_mm_node.hole_follows
      drm: Apply range restriction after color adjustment when allocation
      drm: Use drm_mm_insert_node_in_range_generic() for everyone
      drm: Add kerneldoc markup for new @scan parameters in drm_mm

Dan Carpenter (1):
      drm: mxsfb: drm_dev_alloc() returns error pointers

Daniel Stone (1):
      drm: Use atomic state for FB in legacy ioctls

Daniel Vetter (27):
      drm: Update drm_device docs about embedding.
      drm: Simplify GETRESOURCES ioctl
      drm_fourcc: Document linear modifier
      drm: Protect master->unique with dev->master_mutex
      drm: setclientcap doesn't need the drm BKL
      drm: Enforce BKL-less ioctls for modern drivers
      drm/hisilicon: Don't set drm_device->platformdev
      Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next
      dma-buf: Update kerneldoc for sync_file_create
      dma-buf: Reorganize device dma access docs
      dma-buf: Update cpu access documentation
      dma-buf: Final bits of doc polish
      drm/mediatek: don't use drm_put_dev
      drm/etnaviv: Use drm_dev_unref, not drm_put_dev
      Merge tag 'drm-for-v4.10' of git://people.freedesktop.org/~airlied/linux into drm-misc-next
      drm/fsl: don't use drm_put_dev
      drm/irq: drm_legacy_ prefix for legacy ioctls
      drm: Move atomic debugfs functions into drm_crtc_internal.h
      drm/radeon|amdgpu: Remove redundant num_connectors check
      drm: Drop locking cargo-cult from drm_mode_config_init
      drm: locking&new iterators for connector_list
      drm: Convert all helpers to drm_connector_list_iter
      drm: Clean up connectors by unreferencing them
      drm: prevent double-(un)registration for connectors
      drm: Tighten locking in drm_mode_getconnector
      drm: Fix O= out-of-tree builds for selftests
      drm/mm: Document locking rules

Dhinakaran Pandiyan (2):
      drm: Wrap the check for atomic_commit implementation
      drm: Get atomic property value even if DRIVER_ATOMIC is not set

Jason A. Donenfeld (1):
      kref: prefer atomic_inc_not_zero to atomic_add_unless

Kees Cook (4):
      drm/ttm: use designated initializers
      drm/ttm: use designated initializers
      drm/vmwgfx: use designated initializers
      drm/nouveau: use designated initializers

Kristian H. Kristensen (1):
      drm_fourcc: Fix DRM_FORMAT_MOD_LINEAR #define

Laurent Pinchart (5):
      drm: Don't include <drm/drm_encoder.h> in <drm/drm_crtc.h>
      drm: Fix compilation warning caused by static inline forward declaration
      drm: bridge: Link encoder and bridge in core code
      drm: bridge: Detach bridge from encoder at encoder cleanup time
      drm: bridge: Detach all bridges in a chain at encoder cleanup time

Maarten Lankhorst (7):
      drm/atomic: Use active instead of enable in wait_for_vblanks.
      drm/atomic: Delete wrong comment.
      drm/atomic: Unconditionally call prepare_fb.
      drm/atomic: Clean up wait_for_vblanks, v2.
      drm/atomic: Wait for vblank whenever a plane is added to state.
      drm/atomic: Remove drm_atomic_helper_framebuffer_changed.
      drm/i915: Add a cursor hack to allow converting legacy page flip to atomic, v3.

Peter Meerwald-Stadler (2):
      drm: Fix spelling of clock in drm_connector.h
      drm/hisilicon: Fix spelling of clock in hisi-ade.txt

Thierry Reding (1):
      drm: Fix typo in drm_event_reserve_init() kerneldoc

Ville Syrjälä (34):
      drm/i915: Add local 'fb' variables
      drm/radeon: Add local 'fb' variables
      drm/radeon: Use DIV_ROUND_UP()
      drm/mgag200: Add local 'fb' variable
      drm/ast: Add local 'fb' variables
      drm/gma500: Add some local 'fb' variables
      drm/cirrus: Add some local 'fb' variables
      drm/arcpgu: Add local 'fb' variables
      drm/arm: Add local 'fb' variables
      drm/nouveau: Fix crtc->primary->fb vs. drm_fb fail
      drm/nouveau: Add local 'fb' variables
      drm: Pass 'dev' to drm_helper_mode_fill_fb_struct()
      drm/qxl: Call drm_helper_mode_fill_fb_struct() before drm_framebuffer_init()
      drm/virtio: Call drm_helper_mode_fill_fb_struct() before drm_framebuffer_init()
      drm/i915: Set fb->dev early on for inherited fbs
      drm: Populate fb->dev from drm_helper_mode_fill_fb_struct()
      drm: Store a pointer to drm_format_info under drm_framebuffer
      drm/i915: Populate fb->format early for inherited fbs
      drm: Reject fbs w/o format info in drm_framebuffer_init()
      drm: Replace drm_format_num_planes() with fb->format->num_planes
      drm/i915: Eliminate the ugly 'fb?:' constructs from the ilk/skl wm code
      drm: Replace drm_format_plane_cpp() with fb->format->cpp[]
      drm/fb_cma_helper: Replace drm_format_info() with fb->format
      drm/nouveau: Use fb->format rather than drm_format_info()
      drm/i915: Store a pointer to the pixel format info for fbc
      drm: Add drm_framebuffer_plane_{width,height}()
      drm/i915: Use drm_framebuffer_plane_{width,height}() where possible
      drm: Nuke fb->depth
      drm: Nuke fb->bits_per_pixel
      drm: Nuke fb->pixel_format
      drm: Replace 'format->format' comparisons to just 'format' comparisons
      drm: Eliminate the useless "non-RGB fb" debug message
      drm/cma: Fix compile fail due to fomat->format typo
      drm: Fix kernel docs for drm_helper_mode_fill_fb_struct()

 Documentation/00-INDEX                             |  204 +-
 Documentation/ABI/README                           |    2 +-
 Documentation/ABI/testing/sysfs-kernel-slab        |    2 +-
 Documentation/BUG-HUNTING                          |  246 -
 Documentation/CodingStyle                          | 1063 +---
 Documentation/DocBook/Makefile                     |    7 +-
 Documentation/DocBook/alsa-driver-api.tmpl         |  142 -
 Documentation/DocBook/debugobjects.tmpl            |  443 --
 Documentation/DocBook/kernel-hacking.tmpl          |    4 +-
 Documentation/DocBook/tracepoint.tmpl              |  112 -
 Documentation/DocBook/uio-howto.tmpl               |   62 +
 Documentation/DocBook/usb.tmpl                     |  992 ----
 Documentation/DocBook/writing-an-alsa-driver.tmpl  | 6206 --------------------
 Documentation/Makefile.sphinx                      |   22 +-
 Documentation/SubmittingPatches                    |  842 +--
 Documentation/VGA-softcursor.txt                   |   39 -
 Documentation/acpi/video_extension.txt             |    2 +-
 Documentation/admin-guide/README.rst               |  411 ++
 Documentation/admin-guide/binfmt-misc.rst          |  151 +
 Documentation/admin-guide/braille-console.rst      |   38 +
 Documentation/admin-guide/bug-bisect.rst           |   76 +
 Documentation/admin-guide/bug-hunting.rst          |  369 ++
 Documentation/admin-guide/conf.py                  |   10 +
 Documentation/admin-guide/devices.rst              |  268 +
 Documentation/{ => admin-guide}/devices.txt        | 1176 ++--
 Documentation/admin-guide/dynamic-debug-howto.rst  |  353 ++
 Documentation/admin-guide/index.rst                |   68 +
 Documentation/{init.txt => admin-guide/init.rst}   |   29 +-
 .../{initrd.txt => admin-guide/initrd.rst}         |  199 +-
 Documentation/{java.txt => admin-guide/java.rst}   |  297 +-
 Documentation/admin-guide/kernel-parameters.rst    |  209 +
 .../{ => admin-guide}/kernel-parameters.txt        |  221 +-
 Documentation/{md.txt => admin-guide/md.rst}       |  528 +-
 .../module-signing.rst}                            |  128 +-
 Documentation/{mono.txt => admin-guide/mono.rst}   |   44 +-
 Documentation/admin-guide/parport.rst              |  286 +
 .../{ramoops.txt => admin-guide/ramoops.rst}       |   88 +-
 .../admin-guide/reporting-bugs.rst                 |   70 +-
 .../security-bugs.rst}                             |   14 +-
 .../serial-console.rst}                            |   68 +-
 Documentation/admin-guide/sysfs-rules.rst          |  192 +
 Documentation/admin-guide/sysrq.rst                |  289 +
 Documentation/admin-guide/tainted-kernels.rst      |   59 +
 .../{unicode.txt => admin-guide/unicode.rst}       |   24 +-
 Documentation/admin-guide/vga-softcursor.rst       |   66 +
 Documentation/arm/Booting                          |    2 +-
 Documentation/assoc_array.txt                      |  574 --
 Documentation/bad_memory.txt                       |   45 -
 Documentation/basic_profiling.txt                  |   56 -
 Documentation/binfmt_misc.txt                      |  131 -
 Documentation/blockdev/cciss.txt                   |    2 +-
 Documentation/blockdev/ramdisk.txt                 |    2 +-
 Documentation/braille-console.txt                  |   34 -
 Documentation/cgroup-v1/00-INDEX                   |    2 +-
 Documentation/circular-buffers.txt                 |    4 +-
 Documentation/conf.py                              |   22 +-
 Documentation/core-api/assoc_array.rst             |  551 ++
 .../{atomic_ops.txt => core-api/atomic_ops.rst}    |  340 +-
 Documentation/core-api/conf.py                     |   10 +
 Documentation/core-api/debug-objects.rst           |  310 +
 Documentation/core-api/index.rst                   |   33 +
 Documentation/core-api/local_ops.rst               |  206 +
 Documentation/core-api/tracepoint.rst              |   55 +
 .../{workqueue.txt => core-api/workqueue.rst}      |  260 +-
 Documentation/cpu-hotplug.txt                      |   32 +-
 Documentation/dev-tools/conf.py                    |   10 +
 Documentation/dev-tools/gcov.rst                   |    8 +-
 Documentation/dev-tools/{tools.rst => index.rst}   |    8 +
 Documentation/dev-tools/kcov.rst                   |    4 +-
 Documentation/development-process/index.rst        |    9 -
 Documentation/device-mapper/dm-raid.txt            |    8 +-
 .../bindings/display/bridge/ti,ths8135.txt         |   46 +
 .../bindings/display/hisilicon/hisi-ade.txt        |    2 +-
 .../devicetree/bindings/rtc/maxim,ds3231.txt       |    2 +-
 Documentation/devicetree/bindings/rtc/pcf8563.txt  |    2 +-
 .../devicetree/bindings/submitting-patches.txt     |    2 +-
 Documentation/dma-buf-sharing.txt                  |  482 --
 Documentation/doc-guide/conf.py                    |   10 +
 Documentation/doc-guide/docbook.rst                |   90 +
 Documentation/doc-guide/index.rst                  |   20 +
 .../kernel-doc.rst}                                |  323 +-
 Documentation/doc-guide/parse-headers.rst          |  192 +
 Documentation/doc-guide/sphinx.rst                 |  219 +
 Documentation/{ => driver-api}/80211/cfg80211.rst  |    0
 Documentation/{ => driver-api}/80211/conf.py       |    5 +
 Documentation/{ => driver-api}/80211/index.rst     |    2 +-
 .../{ => driver-api}/80211/introduction.rst        |    0
 .../{ => driver-api}/80211/mac80211-advanced.rst   |    0
 Documentation/{ => driver-api}/80211/mac80211.rst  |    0
 Documentation/driver-api/conf.py                   |   10 +
 Documentation/driver-api/device_link.rst           |  279 +
 Documentation/driver-api/dma-buf.rst               |  165 +
 Documentation/driver-api/index.rst                 |   12 +
 Documentation/driver-api/infrastructure.rst        |   70 -
 Documentation/driver-api/usb.rst                   |  748 +++
 Documentation/{vme_api.txt => driver-api/vme.rst}  |  115 +-
 Documentation/dynamic-debug-howto.txt              |  340 --
 Documentation/filesystems/locks.txt                |    2 +-
 Documentation/filesystems/nfs/nfsroot.txt          |    4 +-
 Documentation/filesystems/proc.txt                 |   11 +-
 Documentation/frv/booting.txt                      |    2 +-
 Documentation/gpu/conf.py                          |    5 +
 Documentation/gpu/drm-kms.rst                      |    2 +-
 Documentation/gpu/drm-mm.rst                       |    2 +-
 Documentation/gpu/index.rst                        |    2 +-
 Documentation/hwmon/submitting-patches             |    8 +-
 Documentation/index.rst                            |   62 +-
 Documentation/isdn/README                          |    2 +-
 Documentation/kernel-doc-nano-HOWTO.txt            |    2 +-
 Documentation/kernel-per-CPU-kthreads.txt          |    2 +-
 Documentation/kselftest.txt                        |   11 +
 Documentation/local_ops.txt                        |  191 -
 Documentation/lockup-watchdogs.txt                 |    4 +-
 Documentation/m68k/kernel-options.txt              |    2 +-
 Documentation/magic-number.txt                     |  158 -
 Documentation/media/.gitignore                     |    3 +
 Documentation/media/Makefile                       |   74 +-
 Documentation/media/dvb-drivers/intro.rst          |    4 +-
 Documentation/media/index.rst                      |    5 -
 Documentation/media/intro.rst                      |    4 +-
 .../media/media_api_files/typical_media_device.pdf |  Bin 52895 -> 0 bytes
 .../{media_api_files => }/typical_media_device.svg |    0
 Documentation/media/uapi/dvb/dvbstb.svg            |  651 ++
 Documentation/media/uapi/dvb/intro.rst             |    4 +-
 .../media/uapi/dvb/intro_files/dvbstb.pdf          |  Bin 1881 -> 0 bytes
 .../media/uapi/dvb/intro_files/dvbstb.png          |  Bin 22655 -> 0 bytes
 Documentation/media/uapi/v4l/bayer.svg             |  984 ++++
 Documentation/media/uapi/v4l/constraints.svg       |  346 ++
 Documentation/media/uapi/v4l/crop.rst              |    4 +-
 Documentation/media/uapi/v4l/crop.svg              |  281 +
 Documentation/media/uapi/v4l/crop_files/crop.gif   |  Bin 5967 -> 0 bytes
 Documentation/media/uapi/v4l/crop_files/crop.pdf   |  Bin 5846 -> 0 bytes
 Documentation/media/uapi/v4l/dev-raw-vbi.rst       |   12 +-
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif   |  Bin 4741 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf   |  Bin 3706 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif   |  Bin 5095 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf   |  Bin 3996 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif |  Bin 2400 -> 0 bytes
 .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf |  Bin 7405 -> 0 bytes
 Documentation/media/uapi/v4l/dev-subdev.rst        |   16 +-
 .../media/uapi/v4l/dev-subdev_files/pipeline.pdf   |  Bin 20276 -> 0 bytes
 .../media/uapi/v4l/dev-subdev_files/pipeline.png   |  Bin 12130 -> 0 bytes
 .../subdev-image-processing-crop.pdf               |  Bin 20729 -> 0 bytes
 .../subdev-image-processing-crop.svg               |   63 -
 .../subdev-image-processing-full.pdf               |  Bin 46311 -> 0 bytes
 .../subdev-image-processing-full.svg               |  163 -
 ...ubdev-image-processing-scaling-multi-source.pdf |  Bin 36714 -> 0 bytes
 ...ubdev-image-processing-scaling-multi-source.svg |  116 -
 Documentation/media/uapi/v4l/diff-v4l.rst          |    4 +-
 Documentation/media/uapi/v4l/field-order.rst       |    8 +-
 .../uapi/v4l/field-order_files/fieldseq_bt.gif     |  Bin 25430 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_bt.pdf     |  Bin 9185 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_tb.gif     |  Bin 25323 -> 0 bytes
 .../uapi/v4l/field-order_files/fieldseq_tb.pdf     |  Bin 9173 -> 0 bytes
 Documentation/media/uapi/v4l/fieldseq_bt.svg       | 2613 ++++++++
 Documentation/media/uapi/v4l/fieldseq_tb.svg       | 2607 ++++++++
 Documentation/media/uapi/v4l/nv12mt.svg            |  450 ++
 Documentation/media/uapi/v4l/nv12mt_example.svg    | 1589 +++++
 Documentation/media/uapi/v4l/pipeline.dot          |   12 +
 Documentation/media/uapi/v4l/pixfmt-nv12mt.rst     |    8 +-
 .../media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png  |  Bin 1920 -> 0 bytes
 .../v4l/pixfmt-nv12mt_files/nv12mt_example.png     |  Bin 5261 -> 0 bytes
 Documentation/media/uapi/v4l/selection-api-003.rst |    4 +-
 .../uapi/v4l/selection-api-003_files/selection.png |  Bin 11716 -> 0 bytes
 Documentation/media/uapi/v4l/selection.svg         | 5812 ++++++++++++++++++
 Documentation/media/uapi/v4l/subdev-formats.rst    |   19 +-
 .../media/uapi/v4l/subdev-formats_files/bayer.png  |  Bin 9725 -> 0 bytes
 .../uapi/v4l/subdev-image-processing-crop.svg      |  313 +
 .../uapi/v4l/subdev-image-processing-full.svg      |  769 +++
 ...ubdev-image-processing-scaling-multi-source.svg |  560 ++
 Documentation/media/uapi/v4l/vbi_525.svg           |  811 +++
 Documentation/media/uapi/v4l/vbi_625.svg           |  858 +++
 Documentation/media/uapi/v4l/vbi_hsync.svg         |  313 +
 .../media/uapi/v4l/vidioc-g-selection.rst          |    4 +-
 .../v4l/vidioc-g-selection_files/constraints.png   |  Bin 3313 -> 0 bytes
 Documentation/media/v4l-drivers/bttv.rst           |    4 +-
 Documentation/media/v4l-drivers/cafe_ccic.rst      |    4 +-
 Documentation/memory-hotplug.txt                   |    2 +-
 Documentation/networking/netconsole.txt            |    2 +-
 Documentation/networking/netdev-FAQ.txt            |    8 +-
 Documentation/networking/vortex.txt                |    2 +-
 Documentation/oops-tracing.txt                     |  279 -
 Documentation/parport.txt                          |  267 -
 Documentation/power/00-INDEX                       |    2 +-
 Documentation/power/pci.txt                        |   10 +-
 Documentation/power/runtime_pm.txt                 |    2 +-
 Documentation/power/swsusp-dmcrypt.txt             |    2 +-
 .../{development-process => process}/1.Intro.rst   |    4 +-
 .../{development-process => process}/2.Process.rst |    0
 .../3.Early-stage.rst                              |    0
 .../{development-process => process}/4.Coding.rst  |    8 +-
 .../{development-process => process}/5.Posting.rst |   12 +-
 .../6.Followthrough.rst                            |    0
 .../7.AdvancedTopics.rst                           |    2 -
 .../8.Conclusion.rst                               |    6 +-
 .../adding-syscalls.rst}                           |  269 +-
 .../applying-patches.rst}                          |    7 +-
 Documentation/{Changes => process/changes.rst}     |    2 +-
 .../code-of-conflict.rst}                          |    3 +-
 Documentation/process/coding-style.rst             | 1062 ++++
 .../{development-process => process}/conf.py       |    2 +-
 .../development-process.rst                        |    1 -
 .../email-clients.rst}                             |    0
 Documentation/{HOWTO => process/howto.rst}         |   58 +-
 Documentation/process/index.rst                    |   57 +
 .../{kernel-docs.txt => process/kernel-docs.rst}   |    0
 Documentation/process/magic-number.rst             |  164 +
 .../management-style.rst}                          |    2 +-
 .../stable-api-nonsense.rst}                       |    0
 .../stable-kernel-rules.rst}                       |    4 +-
 .../submit-checklist.rst}                          |    6 +-
 .../submitting-drivers.rst}                        |   16 +-
 Documentation/process/submitting-patches.rst       |  836 +++
 .../volatile-considered-harmful.rst}               |   22 +-
 Documentation/rfkill.txt                           |    2 +-
 Documentation/scheduler/completion.txt             |    3 +-
 Documentation/scsi/scsi-parameters.txt             |    2 +-
 Documentation/scsi/scsi_mid_low_api.txt            |    2 +-
 Documentation/scsi/sym53c8xx_2.txt                 |    2 +-
 Documentation/security/conf.py                     |    8 +
 Documentation/security/index.rst                   |    7 +
 Documentation/security/tpm/index.rst               |    7 +
 .../tpm/tpm_vtpm_proxy.rst}                        |   55 +-
 Documentation/{ => security}/tpm/xen-tpmfront.txt  |    0
 Documentation/sound/alsa-configuration.rst         | 2683 +++++++++
 Documentation/sound/alsa/ALSA-Configuration.txt    | 2330 --------
 Documentation/sound/alsa/ControlNames.txt          |  107 -
 Documentation/sound/alsa/HD-Audio-Models.txt       |  324 -
 Documentation/sound/alsa/VIA82xx-mixer.txt         |    8 -
 Documentation/sound/alsa/alsa-parameters.txt       |  135 -
 Documentation/sound/alsa/seq_oss.html              |  409 --
 .../Audigy-mixer.txt => cards/audigy-mixer.rst}    |  297 +-
 .../audiophile-usb.rst}                            |  258 +-
 .../sound/{alsa/Bt87x.txt => cards/bt87x.rst}      |   23 +-
 .../sound/{alsa/CMIPCI.txt => cards/cmipci.rst}    |   62 +-
 .../emu10k1-jack.txt => cards/emu10k1-jack.rst}    |   20 +-
 .../sound/{alsa/hdspm.txt => cards/hdspm.rst}      |  253 +-
 .../img,spdif-in.txt => cards/img-spdif-in.rst}    |   24 +-
 Documentation/sound/cards/index.rst                |   19 +
 .../{alsa/Joystick.txt => cards/joystick.rst}      |   71 +-
 .../sound/{alsa/README.maya44 => cards/maya44.rst} |  137 +-
 .../sound/{alsa/MIXART.txt => cards/mixart.rst}    |   26 +-
 .../SB-Live-mixer.txt => cards/sb-live-mixer.rst}  |  337 +-
 .../serial-u16550.txt => cards/serial-u16550.rst}  |   21 +-
 Documentation/sound/cards/via82xx-mixer.rst        |    8 +
 .../channel-mapping-api.rst}                       |   77 +-
 .../compress-offload.rst}                          |  127 +-
 Documentation/sound/designs/control-names.rst      |  142 +
 Documentation/sound/designs/index.rst              |   15 +
 .../jack-controls.rst}                             |   13 +-
 .../oss-emulation.rst}                             |  169 +-
 .../{alsa/powersave.txt => designs/powersave.rst}  |   16 +-
 .../{alsa/Procfile.txt => designs/procfile.rst}    |  106 +-
 Documentation/sound/designs/seq-oss.rst            |  371 ++
 .../timestamping.txt => designs/timestamping.rst}  |  143 +-
 .../controls.rst}                                  |   33 +-
 .../dp-mst.rst}                                    |   30 +-
 Documentation/sound/hd-audio/index.rst             |   10 +
 Documentation/sound/hd-audio/models.rst            |  518 ++
 .../{alsa/HD-Audio.txt => hd-audio/notes.rst}      |  635 +-
 Documentation/sound/index.rst                      |   20 +
 Documentation/sound/kernel-api/alsa-driver-api.rst |  134 +
 Documentation/sound/kernel-api/index.rst           |    8 +
 .../sound/kernel-api/writing-an-alsa-driver.rst    | 4219 +++++++++++++
 Documentation/sound/oss/oss-parameters.txt         |    2 +-
 .../{alsa/soc/clocking.txt => soc/clocking.rst}    |   13 +-
 Documentation/sound/soc/codec-to-codec.rst         |  108 +
 .../sound/{alsa/soc/codec.txt => soc/codec.rst}    |   75 +-
 .../sound/{alsa/soc/DAI.txt => soc/dai.rst}        |   28 +-
 .../sound/{alsa/soc/dapm.txt => soc/dapm.rst}      |  249 +-
 .../sound/{alsa/soc/DPCM.txt => soc/dpcm.rst}      |  280 +-
 Documentation/sound/soc/index.rst                  |   20 +
 .../sound/{alsa/soc/jack.txt => soc/jack.rst}      |    1 +
 .../{alsa/soc/machine.txt => soc/machine.rst}      |   22 +-
 .../{alsa/soc/overview.txt => soc/overview.rst}    |   32 +-
 .../{alsa/soc/platform.txt => soc/platform.rst}    |   31 +-
 .../soc/pops_clicks.txt => soc/pops-clicks.rst}    |   15 +-
 .../sphinx/{kernel-doc.py => kerneldoc.py}         |    0
 Documentation/sphinx/parse-headers.pl              |   95 +-
 Documentation/sysctl/kernel.txt                    |    4 +-
 Documentation/sysfs-rules.txt                      |  184 -
 Documentation/sysrq.txt                            |  257 -
 Documentation/trace/uprobetracer.txt               |    6 +-
 Documentation/{ => translations}/ja_JP/HOWTO       |   24 +-
 .../{ => translations}/ja_JP/SubmitChecklist       |    8 +-
 .../{ => translations}/ja_JP/SubmittingPatches     |   18 +-
 .../ja_JP/stable_api_nonsense.txt                  |    4 +-
 .../ja_JP/stable_kernel_rules.txt                  |    6 +-
 .../{ko_KR/HOWTO => translations/ko_KR/howto.rst}  |  172 +-
 Documentation/translations/ko_KR/index.rst         |   12 +
 .../{ => translations}/ko_KR/memory-barriers.txt   |   36 +
 .../ko_KR/stable_api_nonsense.txt                  |    4 +-
 Documentation/{ => translations}/zh_CN/CodingStyle |    8 +-
 Documentation/{ => translations}/zh_CN/HOWTO       |   30 +-
 Documentation/{ => translations}/zh_CN/IRQ.txt     |    0
 .../{ => translations}/zh_CN/SecurityBugs          |    6 +-
 .../{ => translations}/zh_CN/SubmittingDrivers     |   12 +-
 .../{ => translations}/zh_CN/SubmittingPatches     |   14 +-
 Documentation/{ => translations}/zh_CN/arm/Booting |    2 +-
 .../zh_CN/arm/kernel_user_helpers.txt              |    0
 .../{ => translations}/zh_CN/arm64/booting.txt     |    0
 .../zh_CN/arm64/legacy_instructions.txt            |    0
 .../{ => translations}/zh_CN/arm64/memory.txt      |    0
 .../zh_CN/arm64/silicon-errata.txt                 |    0
 .../zh_CN/arm64/tagged-pointers.txt                |    0
 .../{ => translations}/zh_CN/basic_profiling.txt   |    0
 .../{ => translations}/zh_CN/email-clients.txt     |    4 +-
 .../{ => translations}/zh_CN/filesystems/sysfs.txt |    0
 Documentation/{ => translations}/zh_CN/gpio.txt    |    0
 .../{ => translations}/zh_CN/io_ordering.txt       |    0
 .../{ => translations}/zh_CN/magic-number.txt      |    0
 .../{ => translations}/zh_CN/oops-tracing.txt      |    6 +-
 Documentation/{ => translations}/zh_CN/sparse.txt  |    0
 .../zh_CN/stable_api_nonsense.txt                  |    4 +-
 .../zh_CN/stable_kernel_rules.txt                  |    6 +-
 .../zh_CN/video4linux/omap3isp.txt                 |    0
 .../zh_CN/video4linux/v4l2-framework.txt           |    0
 .../zh_CN/volatile-considered-harmful.txt          |    4 +-
 Documentation/virtual/kvm/review-checklist.txt     |    4 +-
 Documentation/vm/numa                              |    2 +-
 .../watchdog/convert_drivers_to_kernel_api.txt     |    2 +-
 Documentation/watchdog/watchdog-parameters.txt     |    2 +-
 Documentation/x86/boot.txt                         |    2 +-
 MAINTAINERS                                        |   18 +-
 README                                             |  408 +-
 arch/x86/Kconfig                                   |    2 +-
 drivers/acpi/Kconfig                               |    2 +-
 drivers/ata/libata-core.c                          |    2 +-
 drivers/char/pcmcia/cm4000_cs.c                    |    4 +-
 drivers/dma-buf/dma-buf.c                          |  208 +-
 drivers/dma-buf/sync_file.c                        |   15 +-
 drivers/gpu/drm/Kconfig                            |   19 +
 drivers/gpu/drm/Makefile                           |    2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c             |    4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |    6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |    1 +
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    6 +-
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |    3 +-
 drivers/gpu/drm/arc/arcpgu_hdmi.c                  |    5 +-
 drivers/gpu/drm/arm/hdlcd_crtc.c                   |   18 +-
 drivers/gpu/drm/arm/malidp_planes.c                |   10 +-
 drivers/gpu/drm/armada/armada_crtc.c               |    9 +-
 drivers/gpu/drm/armada/armada_fb.c                 |    2 +-
 drivers/gpu/drm/armada/armada_fbdev.c              |    5 +-
 drivers/gpu/drm/armada/armada_overlay.c            |    4 +-
 drivers/gpu/drm/ast/ast_drv.h                      |    1 +
 drivers/gpu/drm/ast/ast_fb.c                       |    4 +-
 drivers/gpu/drm/ast/ast_main.c                     |    2 +-
 drivers/gpu/drm/ast/ast_mode.c                     |   16 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c    |    2 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c   |    4 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   22 +-
 drivers/gpu/drm/bochs/bochs.h                      |    1 +
 drivers/gpu/drm/bochs/bochs_fbdev.c                |    2 +-
 drivers/gpu/drm/bochs/bochs_mm.c                   |    2 +-
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |    9 +-
 drivers/gpu/drm/bridge/dumb-vga-dac.c              |    1 +
 drivers/gpu/drm/bridge/dw-hdmi.c                   |    3 +-
 drivers/gpu/drm/cirrus/cirrus_drv.h                |    1 +
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    6 +-
 drivers/gpu/drm/cirrus/cirrus_main.c               |    2 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c               |    9 +-
 drivers/gpu/drm/drm_atomic.c                       |   26 +-
 drivers/gpu/drm/drm_atomic_helper.c                |  115 +-
 drivers/gpu/drm/drm_bridge.c                       |   59 +-
 drivers/gpu/drm/drm_connector.c                    |  229 +-
 drivers/gpu/drm/drm_crtc.c                         |    9 +-
 drivers/gpu/drm/drm_crtc_helper.c                  |   53 +-
 drivers/gpu/drm/drm_crtc_internal.h                |    9 +
 drivers/gpu/drm/drm_debugfs.c                      |    1 +
 drivers/gpu/drm/drm_drv.c                          |   11 +-
 drivers/gpu/drm/drm_edid.c                         |    1 +
 drivers/gpu/drm/drm_encoder.c                      |   17 +-
 drivers/gpu/drm/drm_fb_cma_helper.c                |   11 +-
 drivers/gpu/drm/drm_fb_helper.c                    |   28 +-
 drivers/gpu/drm/drm_fops.c                         |    2 +-
 drivers/gpu/drm/drm_framebuffer.c                  |   53 +-
 drivers/gpu/drm/drm_internal.h                     |    8 +-
 drivers/gpu/drm/drm_ioctl.c                        |   23 +-
 drivers/gpu/drm/drm_irq.c                          |   30 +-
 drivers/gpu/drm/drm_mm.c                           |  571 +-
 drivers/gpu/drm/drm_mode_config.c                  |  145 +-
 drivers/gpu/drm/drm_mode_object.c                  |    3 +-
 drivers/gpu/drm/drm_modeset_helper.c               |   25 +-
 drivers/gpu/drm/drm_of.c                           |    1 +
 drivers/gpu/drm/drm_plane.c                        |   14 +-
 drivers/gpu/drm/drm_plane_helper.c                 |    6 +-
 drivers/gpu/drm/drm_probe_helper.c                 |   18 +-
 drivers/gpu/drm/drm_simple_kms_helper.c            |   21 +-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c              |    2 +-
 drivers/gpu/drm/etnaviv/etnaviv_mmu.c              |    9 +-
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c      |    6 +-
 drivers/gpu/drm/exynos/exynos7_drm_decon.c         |    8 +-
 drivers/gpu/drm/exynos/exynos_dp.c                 |    5 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_fb.c             |    2 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_fimd.c           |    4 +-
 drivers/gpu/drm/exynos/exynos_mixer.c              |   12 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c          |    3 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h          |    2 +
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c        |    4 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c          |    5 +-
 drivers/gpu/drm/gma500/accel_2d.c                  |    2 +-
 drivers/gpu/drm/gma500/framebuffer.c               |    6 +-
 drivers/gpu/drm/gma500/gma_display.c               |   13 +-
 drivers/gpu/drm/gma500/mdfld_intel_display.c       |   17 +-
 drivers/gpu/drm/gma500/oaktrail_crtc.c             |   13 +-
 drivers/gpu/drm/gma500/psb_intel_drv.h             |    1 +
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c     |    6 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c  |    2 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c        |    2 +-
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c       |    5 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |   17 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |    8 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h    |    4 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |   11 +-
 drivers/gpu/drm/i915/i915_drv.h                    |    4 +-
 drivers/gpu/drm/i915/i915_gem_evict.c              |   31 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |    8 +-
 drivers/gpu/drm/i915/i915_vma.c                    |    4 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   51 +-
 drivers/gpu/drm/i915/intel_display.c               |  210 +-
 drivers/gpu/drm/i915/intel_drv.h                   |    3 +
 drivers/gpu/drm/i915/intel_fbc.c                   |   14 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |   10 +-
 drivers/gpu/drm/i915/intel_overlay.c               |   26 +-
 drivers/gpu/drm/i915/intel_pm.c                    |   67 +-
 drivers/gpu/drm/i915/intel_sprite.c                |   14 +-
 drivers/gpu/drm/imx/imx-ldb.c                      |    8 +-
 drivers/gpu/drm/imx/ipuv3-plane.c                  |   40 +-
 drivers/gpu/drm/imx/parallel-display.c             |    6 +-
 drivers/gpu/drm/lib/drm_random.c                   |   41 +
 drivers/gpu/drm/lib/drm_random.h                   |   25 +
 drivers/gpu/drm/mediatek/mtk_dpi.c                 |    8 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c             |    3 +-
 drivers/gpu/drm/mediatek/mtk_drm_fb.c              |    2 +-
 drivers/gpu/drm/mediatek/mtk_drm_plane.c           |    4 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c                 |   24 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   11 +-
 drivers/gpu/drm/meson/meson_plane.c                |    2 +-
 drivers/gpu/drm/mgag200/mgag200_drv.h              |    1 +
 drivers/gpu/drm/mgag200/mgag200_fb.c               |    4 +-
 drivers/gpu/drm/mgag200/mgag200_main.c             |    2 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c             |   23 +-
 drivers/gpu/drm/msm/dsi/dsi_manager.c              |   17 +-
 drivers/gpu/drm/msm/edp/edp_bridge.c               |    2 +-
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |    2 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c          |    2 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          |    2 +-
 drivers/gpu/drm/msm/msm_fb.c                       |   12 +-
 drivers/gpu/drm/msm/msm_fbdev.c                    |    2 +-
 drivers/gpu/drm/mxsfb/mxsfb_crtc.c                 |    2 +-
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                  |    4 +-
 drivers/gpu/drm/nouveau/dispnv04/crtc.c            |   17 +-
 drivers/gpu/drm/nouveau/dispnv04/dfp.c             |    3 +-
 drivers/gpu/drm/nouveau/dispnv04/overlay.c         |    8 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |    5 +-
 drivers/gpu/drm/nouveau/nouveau_connector.h        |    1 +
 drivers/gpu/drm/nouveau/nouveau_display.c          |   10 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    6 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |   28 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |   14 +-
 drivers/gpu/drm/omapdrm/omap_fb.c                  |   12 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |    2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |    2 +-
 drivers/gpu/drm/qxl/qxl_draw.c                     |    2 +-
 drivers/gpu/drm/qxl/qxl_drv.h                      |    1 +
 drivers/gpu/drm/qxl/qxl_fb.c                       |    5 +-
 drivers/gpu/drm/radeon/atombios_crtc.c             |   19 +-
 drivers/gpu/drm/radeon/r100.c                      |   10 +-
 drivers/gpu/drm/radeon/radeon_display.c            |    8 +-
 drivers/gpu/drm/radeon/radeon_fb.c                 |    4 +-
 drivers/gpu/drm/radeon/radeon_irq_kms.c            |   12 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c        |   16 +-
 drivers/gpu/drm/radeon/radeon_mode.h               |    1 +
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h          |    1 +
 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c          |    5 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c            |    4 +-
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c              |    4 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |    2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c      |    5 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   22 +-
 drivers/gpu/drm/selftests/Makefile                 |    1 +
 drivers/gpu/drm/selftests/drm_mm_selftests.h       |   23 +
 drivers/gpu/drm/selftests/drm_selftest.c           |  109 +
 drivers/gpu/drm/selftests/drm_selftest.h           |   41 +
 drivers/gpu/drm/selftests/test-drm_mm.c            | 2172 +++++++
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c          |    6 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.h          |    1 +
 drivers/gpu/drm/shmobile/shmob_drm_plane.c         |    4 +-
 drivers/gpu/drm/sti/sti_dvo.c                      |    3 +-
 drivers/gpu/drm/sti/sti_gdp.c                      |   10 +-
 drivers/gpu/drm/sti/sti_hda.c                      |    3 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |    3 +-
 drivers/gpu/drm/sti/sti_hqvdp.c                    |    2 +-
 drivers/gpu/drm/sun4i/sun4i_backend.c              |    5 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                  |   13 +-
 drivers/gpu/drm/tegra/dc.c                         |    8 +-
 drivers/gpu/drm/tegra/drm.c                        |    5 +-
 drivers/gpu/drm/tegra/drm.h                        |    1 +
 drivers/gpu/drm/tegra/fb.c                         |    6 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |    4 +-
 drivers/gpu/drm/tilcdc/tilcdc_external.c           |    4 +-
 drivers/gpu/drm/tilcdc/tilcdc_plane.c              |    4 +-
 drivers/gpu/drm/ttm/ttm_bo_manager.c               |   10 +-
 drivers/gpu/drm/udl/udl_fb.c                       |    6 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |    2 +
 drivers/gpu/drm/vc4/vc4_plane.c                    |    8 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |    3 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |    1 +
 drivers/gpu/drm/virtio/virtgpu_fb.c                |    4 +-
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |   10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |   11 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |    1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    5 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |    2 +-
 drivers/gpu/drm/zte/zx_plane.c                     |    4 +-
 drivers/net/can/grcan.c                            |    2 +-
 drivers/nvdimm/Kconfig                             |    2 +-
 drivers/staging/vme/devices/vme_user.c             |    2 +-
 drivers/video/fbdev/skeletonfb.c                   |    8 +-
 drivers/virtio/Kconfig                             |    2 +-
 fs/Kconfig.binfmt                                  |    4 +-
 fs/pstore/Kconfig                                  |    2 +-
 include/drm/drmP.h                                 |   13 +
 include/drm/drm_atomic.h                           |    8 +-
 include/drm/drm_atomic_helper.h                    |    3 -
 include/drm/drm_auth.h                             |   17 +-
 include/drm/drm_bridge.h                           |    4 +-
 include/drm/drm_connector.h                        |   79 +-
 include/drm/drm_crtc.h                             |    8 -
 include/drm/drm_encoder.h                          |    7 +-
 include/drm/drm_encoder_slave.h                    |    1 +
 include/drm/drm_framebuffer.h                      |   27 +-
 include/drm/drm_mm.h                               |  300 +-
 include/drm/drm_mode_config.h                      |   12 +-
 include/drm/drm_modeset_helper.h                   |    3 +-
 include/drm/drm_modeset_helper_vtables.h           |    1 +
 include/drm/drm_simple_kms_helper.h                |    2 -
 include/linux/device.h                             |    2 +-
 include/linux/dma-buf.h                            |  224 +-
 include/linux/kref.h                               |    2 +-
 include/linux/pm.h                                 |    2 +-
 include/linux/prime_numbers.h                      |   37 +
 include/linux/reservation.h                        |   34 +
 include/linux/workqueue.h                          |   35 +-
 include/uapi/drm/drm_fourcc.h                      |   11 +
 include/uapi/linux/major.h                         |    2 +-
 init/Kconfig                                       |    2 +-
 init/main.c                                        |    2 +-
 lib/Kconfig                                        |    7 +
 lib/Kconfig.debug                                  |    2 +-
 lib/Makefile                                       |    2 +
 lib/prime_numbers.c                                |  314 +
 scripts/check_00index.sh                           |   66 +
 scripts/checkpatch.pl                              |    6 +-
 scripts/kernel-doc                                 |   20 +-
 tools/testing/selftests/drivers/gpu/drm_mm.sh      |   15 +
 tools/testing/selftests/futex/README               |    2 +-
 tools/testing/selftests/lib/prime_numbers.sh       |   15 +
 568 files changed, 45282 insertions(+), 23288 deletions(-)
 delete mode 100644 Documentation/BUG-HUNTING
 delete mode 100644 Documentation/DocBook/alsa-driver-api.tmpl
 delete mode 100644 Documentation/DocBook/debugobjects.tmpl
 delete mode 100644 Documentation/DocBook/tracepoint.tmpl
 delete mode 100644 Documentation/DocBook/usb.tmpl
 delete mode 100644 Documentation/DocBook/writing-an-alsa-driver.tmpl
 delete mode 100644 Documentation/VGA-softcursor.txt
 create mode 100644 Documentation/admin-guide/README.rst
 create mode 100644 Documentation/admin-guide/binfmt-misc.rst
 create mode 100644 Documentation/admin-guide/braille-console.rst
 create mode 100644 Documentation/admin-guide/bug-bisect.rst
 create mode 100644 Documentation/admin-guide/bug-hunting.rst
 create mode 100644 Documentation/admin-guide/conf.py
 create mode 100644 Documentation/admin-guide/devices.rst
 rename Documentation/{ => admin-guide}/devices.txt (73%)
 create mode 100644 Documentation/admin-guide/dynamic-debug-howto.rst
 create mode 100644 Documentation/admin-guide/index.rst
 rename Documentation/{init.txt => admin-guide/init.rst} (65%)
 rename Documentation/{initrd.txt => admin-guide/initrd.rst} (70%)
 rename Documentation/{java.txt => admin-guide/java.rst} (60%)
 create mode 100644 Documentation/admin-guide/kernel-parameters.rst
 rename Documentation/{ => admin-guide}/kernel-parameters.txt (94%)
 rename Documentation/{md.txt => admin-guide/md.rst} (60%)
 rename Documentation/{module-signing.txt => admin-guide/module-signing.rst} (71%)
 rename Documentation/{mono.txt => admin-guide/mono.rst} (62%)
 create mode 100644 Documentation/admin-guide/parport.rst
 rename Documentation/{ramoops.txt => admin-guide/ramoops.rst} (69%)
 rename REPORTING-BUGS => Documentation/admin-guide/reporting-bugs.rst (78%)
 rename Documentation/{SecurityBugs => admin-guide/security-bugs.rst} (91%)
 rename Documentation/{serial-console.txt => admin-guide/serial-console.rst} (60%)
 create mode 100644 Documentation/admin-guide/sysfs-rules.rst
 create mode 100644 Documentation/admin-guide/sysrq.rst
 create mode 100644 Documentation/admin-guide/tainted-kernels.rst
 rename Documentation/{unicode.txt => admin-guide/unicode.rst} (89%)
 create mode 100644 Documentation/admin-guide/vga-softcursor.rst
 delete mode 100644 Documentation/assoc_array.txt
 delete mode 100644 Documentation/bad_memory.txt
 delete mode 100644 Documentation/basic_profiling.txt
 delete mode 100644 Documentation/binfmt_misc.txt
 delete mode 100644 Documentation/braille-console.txt
 create mode 100644 Documentation/core-api/assoc_array.rst
 rename Documentation/{atomic_ops.txt => core-api/atomic_ops.rst} (76%)
 create mode 100644 Documentation/core-api/conf.py
 create mode 100644 Documentation/core-api/debug-objects.rst
 create mode 100644 Documentation/core-api/index.rst
 create mode 100644 Documentation/core-api/local_ops.rst
 create mode 100644 Documentation/core-api/tracepoint.rst
 rename Documentation/{workqueue.txt => core-api/workqueue.rst} (63%)
 create mode 100644 Documentation/dev-tools/conf.py
 rename Documentation/dev-tools/{tools.rst => index.rst} (87%)
 delete mode 100644 Documentation/development-process/index.rst
 create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
 delete mode 100644 Documentation/dma-buf-sharing.txt
 create mode 100644 Documentation/doc-guide/conf.py
 create mode 100644 Documentation/doc-guide/docbook.rst
 create mode 100644 Documentation/doc-guide/index.rst
 rename Documentation/{kernel-documentation.rst => doc-guide/kernel-doc.rst} (53%)
 create mode 100644 Documentation/doc-guide/parse-headers.rst
 create mode 100644 Documentation/doc-guide/sphinx.rst
 rename Documentation/{ => driver-api}/80211/cfg80211.rst (100%)
 rename Documentation/{ => driver-api}/80211/conf.py (50%)
 rename Documentation/{ => driver-api}/80211/index.rst (88%)
 rename Documentation/{ => driver-api}/80211/introduction.rst (100%)
 rename Documentation/{ => driver-api}/80211/mac80211-advanced.rst (100%)
 rename Documentation/{ => driver-api}/80211/mac80211.rst (100%)
 create mode 100644 Documentation/driver-api/conf.py
 create mode 100644 Documentation/driver-api/device_link.rst
 create mode 100644 Documentation/driver-api/dma-buf.rst
 create mode 100644 Documentation/driver-api/usb.rst
 rename Documentation/{vme_api.txt => driver-api/vme.rst} (92%)
 delete mode 100644 Documentation/dynamic-debug-howto.txt
 delete mode 100644 Documentation/local_ops.txt
 delete mode 100644 Documentation/magic-number.txt
 create mode 100644 Documentation/media/.gitignore
 delete mode 100644 Documentation/media/media_api_files/typical_media_device.pdf
 rename Documentation/media/{media_api_files => }/typical_media_device.svg (100%)
 create mode 100644 Documentation/media/uapi/dvb/dvbstb.svg
 delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.pdf
 delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.png
 create mode 100644 Documentation/media/uapi/v4l/bayer.svg
 create mode 100644 Documentation/media/uapi/v4l/constraints.svg
 create mode 100644 Documentation/media/uapi/v4l/crop.svg
 delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.gif
 delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif
 delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf
 delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif
 delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf
 create mode 100644 Documentation/media/uapi/v4l/fieldseq_bt.svg
 create mode 100644 Documentation/media/uapi/v4l/fieldseq_tb.svg
 create mode 100644 Documentation/media/uapi/v4l/nv12mt.svg
 create mode 100644 Documentation/media/uapi/v4l/nv12mt_example.svg
 create mode 100644 Documentation/media/uapi/v4l/pipeline.dot
 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png
 delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png
 delete mode 100644 Documentation/media/uapi/v4l/selection-api-003_files/selection.png
 create mode 100644 Documentation/media/uapi/v4l/selection.svg
 delete mode 100644 Documentation/media/uapi/v4l/subdev-formats_files/bayer.png
 create mode 100644 Documentation/media/uapi/v4l/subdev-image-processing-crop.svg
 create mode 100644 Documentation/media/uapi/v4l/subdev-image-processing-full.svg
 create mode 100644 Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg
 create mode 100644 Documentation/media/uapi/v4l/vbi_525.svg
 create mode 100644 Documentation/media/uapi/v4l/vbi_625.svg
 create mode 100644 Documentation/media/uapi/v4l/vbi_hsync.svg
 delete mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png
 delete mode 100644 Documentation/oops-tracing.txt
 delete mode 100644 Documentation/parport.txt
 rename Documentation/{development-process => process}/1.Intro.rst (99%)
 rename Documentation/{development-process => process}/2.Process.rst (100%)
 rename Documentation/{development-process => process}/3.Early-stage.rst (100%)
 rename Documentation/{development-process => process}/4.Coding.rst (98%)
 rename Documentation/{development-process => process}/5.Posting.rst (96%)
 rename Documentation/{development-process => process}/6.Followthrough.rst (100%)
 rename Documentation/{development-process => process}/7.AdvancedTopics.rst (99%)
 rename Documentation/{development-process => process}/8.Conclusion.rst (94%)
 rename Documentation/{adding-syscalls.txt => process/adding-syscalls.rst} (65%)
 rename Documentation/{applying-patches.txt => process/applying-patches.rst} (98%)
 rename Documentation/{Changes => process/changes.rst} (99%)
 rename Documentation/{CodeOfConflict => process/code-of-conflict.rst} (96%)
 create mode 100644 Documentation/process/coding-style.rst
 rename Documentation/{development-process => process}/conf.py (69%)
 rename Documentation/{development-process => process}/development-process.rst (99%)
 rename Documentation/{email-clients.txt => process/email-clients.rst} (100%)
 rename Documentation/{HOWTO => process/howto.rst} (93%)
 create mode 100644 Documentation/process/index.rst
 rename Documentation/{kernel-docs.txt => process/kernel-docs.rst} (100%)
 create mode 100644 Documentation/process/magic-number.rst
 rename Documentation/{ManagementStyle => process/management-style.rst} (99%)
 rename Documentation/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (100%)
 rename Documentation/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (97%)
 rename Documentation/{SubmitChecklist => process/submit-checklist.rst} (96%)
 rename Documentation/{SubmittingDrivers => process/submitting-drivers.rst} (91%)
 create mode 100644 Documentation/process/submitting-patches.rst
 rename Documentation/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (96%)
 create mode 100644 Documentation/security/conf.py
 create mode 100644 Documentation/security/index.rst
 create mode 100644 Documentation/security/tpm/index.rst
 rename Documentation/{tpm/tpm_vtpm_proxy.txt => security/tpm/tpm_vtpm_proxy.rst} (53%)
 rename Documentation/{ => security}/tpm/xen-tpmfront.txt (100%)
 create mode 100644 Documentation/sound/alsa-configuration.rst
 delete mode 100644 Documentation/sound/alsa/ALSA-Configuration.txt
 delete mode 100644 Documentation/sound/alsa/ControlNames.txt
 delete mode 100644 Documentation/sound/alsa/HD-Audio-Models.txt
 delete mode 100644 Documentation/sound/alsa/VIA82xx-mixer.txt
 delete mode 100644 Documentation/sound/alsa/alsa-parameters.txt
 delete mode 100644 Documentation/sound/alsa/seq_oss.html
 rename Documentation/sound/{alsa/Audigy-mixer.txt => cards/audigy-mixer.rst} (57%)
 rename Documentation/sound/{alsa/Audiophile-Usb.txt => cards/audiophile-usb.rst} (81%)
 rename Documentation/sound/{alsa/Bt87x.txt => cards/bt87x.rst} (82%)
 rename Documentation/sound/{alsa/CMIPCI.txt => cards/cmipci.rst} (86%)
 rename Documentation/sound/{alsa/emu10k1-jack.txt => cards/emu10k1-jack.rst} (89%)
 rename Documentation/sound/{alsa/hdspm.txt => cards/hdspm.rst} (56%)
 rename Documentation/sound/{alsa/img,spdif-in.txt => cards/img-spdif-in.rst} (68%)
 create mode 100644 Documentation/sound/cards/index.rst
 rename Documentation/sound/{alsa/Joystick.txt => cards/joystick.rst} (56%)
 rename Documentation/sound/{alsa/README.maya44 => cards/maya44.rst} (65%)
 rename Documentation/sound/{alsa/MIXART.txt => cards/mixart.rst} (83%)
 rename Documentation/sound/{alsa/SB-Live-mixer.txt => cards/sb-live-mixer.rst} (54%)
 rename Documentation/sound/{alsa/serial-u16550.txt => cards/serial-u16550.rst} (92%)
 create mode 100644 Documentation/sound/cards/via82xx-mixer.rst
 rename Documentation/sound/{alsa/Channel-Mapping-API.txt => designs/channel-mapping-api.rst} (75%)
 rename Documentation/sound/{alsa/compress_offload.txt => designs/compress-offload.rst} (73%)
 create mode 100644 Documentation/sound/designs/control-names.rst
 create mode 100644 Documentation/sound/designs/index.rst
 rename Documentation/sound/{alsa/Jack-Controls.txt => designs/jack-controls.rst} (86%)
 rename Documentation/sound/{alsa/OSS-Emulation.txt => designs/oss-emulation.rst} (70%)
 rename Documentation/sound/{alsa/powersave.txt => designs/powersave.rst} (76%)
 rename Documentation/sound/{alsa/Procfile.txt => designs/procfile.rst} (71%)
 create mode 100644 Documentation/sound/designs/seq-oss.rst
 rename Documentation/sound/{alsa/timestamping.txt => designs/timestamping.rst} (56%)
 rename Documentation/sound/{alsa/HD-Audio-Controls.txt => hd-audio/controls.rst} (92%)
 rename Documentation/sound/{alsa/HD-Audio-DP-MST-audio.txt => hd-audio/dp-mst.rst} (69%)
 create mode 100644 Documentation/sound/hd-audio/index.rst
 create mode 100644 Documentation/sound/hd-audio/models.rst
 rename Documentation/sound/{alsa/HD-Audio.txt => hd-audio/notes.rst} (61%)
 create mode 100644 Documentation/sound/index.rst
 create mode 100644 Documentation/sound/kernel-api/alsa-driver-api.rst
 create mode 100644 Documentation/sound/kernel-api/index.rst
 create mode 100644 Documentation/sound/kernel-api/writing-an-alsa-driver.rst
 rename Documentation/sound/{alsa/soc/clocking.txt => soc/clocking.rst} (94%)
 create mode 100644 Documentation/sound/soc/codec-to-codec.rst
 rename Documentation/sound/{alsa/soc/codec.txt => soc/codec.rst} (84%)
 rename Documentation/sound/{alsa/soc/DAI.txt => soc/dai.rst} (71%)
 rename Documentation/sound/{alsa/soc/dapm.txt => soc/dapm.rst} (62%)
 rename Documentation/sound/{alsa/soc/DPCM.txt => soc/dpcm.rst} (57%)
 create mode 100644 Documentation/sound/soc/index.rst
 rename Documentation/sound/{alsa/soc/jack.txt => soc/jack.rst} (99%)
 rename Documentation/sound/{alsa/soc/machine.txt => soc/machine.rst} (90%)
 rename Documentation/sound/{alsa/soc/overview.txt => soc/overview.rst} (83%)
 rename Documentation/sound/{alsa/soc/platform.txt => soc/platform.rst} (81%)
 rename Documentation/sound/{alsa/soc/pops_clicks.txt => soc/pops-clicks.rst} (87%)
 rename Documentation/sphinx/{kernel-doc.py => kerneldoc.py} (100%)
 delete mode 100644 Documentation/sysfs-rules.txt
 delete mode 100644 Documentation/sysrq.txt
 rename Documentation/{ => translations}/ja_JP/HOWTO (98%)
 rename Documentation/{ => translations}/ja_JP/SubmitChecklist (95%)
 rename Documentation/{ => translations}/ja_JP/SubmittingPatches (98%)
 rename Documentation/{ => translations}/ja_JP/stable_api_nonsense.txt (99%)
 rename Documentation/{ => translations}/ja_JP/stable_kernel_rules.txt (95%)
 rename Documentation/{ko_KR/HOWTO => translations/ko_KR/howto.rst} (88%)
 create mode 100644 Documentation/translations/ko_KR/index.rst
 rename Documentation/{ => translations}/ko_KR/memory-barriers.txt (98%)
 rename Documentation/{ => translations}/ko_KR/stable_api_nonsense.txt (99%)
 rename Documentation/{ => translations}/zh_CN/CodingStyle (99%)
 rename Documentation/{ => translations}/zh_CN/HOWTO (96%)
 rename Documentation/{ => translations}/zh_CN/IRQ.txt (100%)
 rename Documentation/{ => translations}/zh_CN/SecurityBugs (91%)
 rename Documentation/{ => translations}/zh_CN/SubmittingDrivers (94%)
 rename Documentation/{ => translations}/zh_CN/SubmittingPatches (97%)
 rename Documentation/{ => translations}/zh_CN/arm/Booting (99%)
 rename Documentation/{ => translations}/zh_CN/arm/kernel_user_helpers.txt (100%)
 rename Documentation/{ => translations}/zh_CN/arm64/booting.txt (100%)
 rename Documentation/{ => translations}/zh_CN/arm64/legacy_instructions.txt (100%)
 rename Documentation/{ => translations}/zh_CN/arm64/memory.txt (100%)
 rename Documentation/{ => translations}/zh_CN/arm64/silicon-errata.txt (100%)
 rename Documentation/{ => translations}/zh_CN/arm64/tagged-pointers.txt (100%)
 rename Documentation/{ => translations}/zh_CN/basic_profiling.txt (100%)
 rename Documentation/{ => translations}/zh_CN/email-clients.txt (98%)
 rename Documentation/{ => translations}/zh_CN/filesystems/sysfs.txt (100%)
 rename Documentation/{ => translations}/zh_CN/gpio.txt (100%)
 rename Documentation/{ => translations}/zh_CN/io_ordering.txt (100%)
 rename Documentation/{ => translations}/zh_CN/magic-number.txt (100%)
 rename Documentation/{ => translations}/zh_CN/oops-tracing.txt (97%)
 rename Documentation/{ => translations}/zh_CN/sparse.txt (100%)
 rename Documentation/{ => translations}/zh_CN/stable_api_nonsense.txt (98%)
 rename Documentation/{ => translations}/zh_CN/stable_kernel_rules.txt (94%)
 rename Documentation/{ => translations}/zh_CN/video4linux/omap3isp.txt (100%)
 rename Documentation/{ => translations}/zh_CN/video4linux/v4l2-framework.txt (100%)
 rename Documentation/{ => translations}/zh_CN/volatile-considered-harmful.txt (97%)
 create mode 100644 drivers/gpu/drm/lib/drm_random.c
 create mode 100644 drivers/gpu/drm/lib/drm_random.h
 create mode 100644 drivers/gpu/drm/selftests/Makefile
 create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h
 create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c
 create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h
 create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c
 create mode 100644 include/linux/prime_numbers.h
 create mode 100644 lib/prime_numbers.c
 create mode 100755 scripts/check_00index.sh
 create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh
 create mode 100755 tools/testing/selftests/lib/prime_numbers.sh

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list