Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-next

Browse source

nouveau next fixes.

Fixes arm32 build.

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau/bios/timing: mark expected switch fall-throughs
  drm/nouveau/devinit/nv04: mark expected switch fall-throughs
  drm/nouveau/bios: make const arrays hwsq_signature and edid_sig static
  drm/nouveau/core/memory: fix missing mutex unlock
  drm/nouveau/mmu: swap out round for ALIGN

...

This commit is contained in:

Dave Airlie 2017-11-03 09:17:08 +10:00

parent 9ad472e337 d34ded7ece

commit bf6eb600e5

5 changed files with 16 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/gpu/drm/nouveau/nouveau_bios.c

View file

1

drivers/gpu/drm/nouveau/nvkm/core/memory.c

View file

5

drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c

View file

12

drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c

View file

4

drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c

View file