Changes in Makefile

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/drivers/dma-buf/heaps/Makefile

d6310078d9f8c416e85f641a631aecf58f9c97ff - Merge branch 'for-5.12/google' into for-linus

Tue, 23 Feb 2021 11:33:13 +0100

Merge branch 'for-5.12/google' into for-linus- User experience improvements for hid-google from Nicolas Boichat List of files: /linux/drivers/dma-buf/heaps/Makefile

cbecf716ca618fd44feda6bd9a64a8179d031fc5 - Merge branch 'next' into for-linus

Tue, 23 Feb 2021 06:35:15 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.12 merge window. List of files: /linux/drivers/dma-buf/heaps/Makefile

415e915fdfc775ad0c6675fde1008f6f43dd6251 - Merge tag 'v5.11' into next

Tue, 23 Feb 2021 06:21:03 +0100

Merge tag 'v5.11' into nextMerge with mainline to get latest APIs and device tree bindings. List of files: /linux/drivers/dma-buf/heaps/Makefile

9d4d8572a539ef807e21c196f145aa365fd52f0e - Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stable

Tue, 02 Feb 2021 15:37:25 +0100

Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stableTag for adaptions to struct amba_driver::remove changing prototype List of files: /linux/drivers/dma-buf/heaps/Makefile

715a1284d89a740b197b3bad5eb20d36a397382f - Merge branch 'cpuidle-fix' into fixes

Fri, 15 Jan 2021 11:48:43 +0100

Merge branch 'cpuidle-fix' into fixes List of files: /linux/drivers/dma-buf/heaps/Makefile

d263dfa7d2697a43f3299b9731cd568ee49cdd2c - Merge drm/drm-next into drm-intel-gt-next

Fri, 15 Jan 2021 07:49:57 +0100

Merge drm/drm-next into drm-intel-gt-nextBackmerging to get a common base for merging topic branches betweendrm-intel-next and drm-intel-gt-next.Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/dma-buf/heaps/Makefile

10205618052908770451acd33eaeaa7685e97ed2 - Merge drm/drm-next into drm-intel-next

Fri, 08 Jan 2021 12:03:51 +0100

Merge drm/drm-next into drm-intel-nextsync-up to not fall too much behind.Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/dma-buf/heaps/Makefile

6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d - Merge branch 'for-linus' into for-next

Thu, 07 Jan 2021 18:52:46 +0100

Merge branch 'for-linus' into for-nextBack-merge of 5.11-devel branch for syncing the result changes.Signed-off-by: Takashi Iwai List of files: /linux/drivers/dma-buf/heaps/Makefile

7b62275507232f01f66d3e7d05c77bbd9009b726 - Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Thu, 07 Jan 2021 18:51:39 +0100

Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Fixes for v5.11A collection of mostly driver specific fixes, plus a maintainershipupdate for TI and a fix for DAPM driver removal paths. List of files: /linux/drivers/dma-buf/heaps/Makefile

8db90aa36063f471bea1e65e23185913043852dc - Merge tag 'v5.11-rc1' into spi-5.11

Mon, 28 Dec 2020 15:20:15 +0100

Merge tag 'v5.11-rc1' into spi-5.11Linux 5.11-rc1 List of files: /linux/drivers/dma-buf/heaps/Makefile

2ae6f64ce1ce304b502461fdfe0b96c8171ae2cc - Merge tag 'v5.11-rc1' into regulator-5.11

Mon, 28 Dec 2020 15:20:00 +0100

Merge tag 'v5.11-rc1' into regulator-5.11Linux 5.11-rc1 List of files: /linux/drivers/dma-buf/heaps/Makefile

f81325a05e9317f09a2e4ec57a52e4e49eb42b54 - Merge tag 'v5.11-rc1' into asoc-5.11

Mon, 28 Dec 2020 15:16:53 +0100

Merge tag 'v5.11-rc1' into asoc-5.11Linux 5.11-rc1 List of files: /linux/drivers/dma-buf/heaps/Makefile

c59c7588fc922e27c378a7e2a920b889bd6bf872 - Merge tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drm

Fri, 18 Dec 2020 21:38:28 +0100

Merge tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drmPull more drm updates from Daniel Vetter: "UAPI Changes: - Only enable char/agp uapi when CONFIG_DRM_LEGACY is set Cross-subsystem Changes: - vma_set_file helper to make vma->vm_file changing less brittle, acked by Andrew Core Changes: - dma-buf heaps improvements - pass full atomic modeset state to driver callbacks - shmem helpers: cached bo by default - cleanups for fbdev, fb-helpers - better docs for drm modes and SCALING_FITLER uapi - ttm: fix dma32 page pool regression Driver Changes: - multi-hop regression fixes for amdgpu, radeon, nouveau - lots of small amdgpu hw enabling fixes (display, pm, ...) - fixes for imx, mcde, meson, some panels, virtio, qxl, i915, all fairly minor - some cleanups for legacy drm/fbdev drivers"* tag 'drm-next-2020-12-18' of git://anongit.freedesktop.org/drm/drm: (117 commits) drm/qxl: don't allocate a dma_address array drm/nouveau: fix multihop when move doesn't work. drm/i915/tgl: Fix REVID macros for TGL to fetch correct stepping drm/i915: Fix mismatch between misplaced vma check and vma insert drm/i915/perf: also include Gen11 in OATAILPTR workaround Revert "drm/i915: re-order if/else ladder for hpd_irq_setup" drm/amdgpu/disply: fix documentation warnings in display manager drm/amdgpu: print mmhub client name for dimgrey_cavefish drm/amdgpu: set mode1 reset as default for dimgrey_cavefish drm/amd/display: Add get_dig_frontend implementation for DCEx drm/radeon: remove h from printk format specifier drm/amdgpu: remove h from printk format specifier drm/amdgpu: Fix spelling mistake "Heterogenous" -> "Heterogeneous" drm/amdgpu: fix regression in vbios reservation handling on headless drm/amdgpu/SRIOV: Extend VF reset request wait period drm/amdkfd: correct amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu log. drm/amd/display: Adding prototype for dccg21_update_dpp_dto() drm/amdgpu: print what method we are using for runtime pm drm/amdgpu: simplify logic in atpx resume handling drm/amdgpu: no need to call pci_ignore_hotplug for _PR3 ... List of files: /linux/drivers/dma-buf/heaps/Makefile

5fbd41d3bf123af6a135bdea564087ec0f563eb0 - Merge tag 'drm-misc-next-2020-11-27-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Tue, 15 Dec 2020 10:21:47 +0100

Merge tag 'drm-misc-next-2020-11-27-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-nextdrm-misc-next for 5.11:UAPI Changes:Cross-subsystem Changes: * char/agp: Disable frontend without CONFIG_DRM_LEGACY * mm: Fix fput in mmap error path; Introduce vma_set_file() to change vma->vm_fileCore Changes: * dma-buf: Use sgtables in system heap; Move heap helpers to CMA-heap code; Skip sync for unmapped buffers; Alloc higher order pages is available; Respect num_fences when initializing shared fence list * doc: Improvements around DRM modes and SCALING_FILTER * Pass full state to connector atomic functions + callee updates * Cleanups * shmem: Map pages with caching by default; Cleanups * ttm: Fix DMA32 for global page pool * fbdev: Cleanups * fb-helper: Update framebuffer after userspace writes; Unmap console buffer during shutdown; Rework damage handling of shadow framebufferDriver Changes: * amdgpu: Multi-hop fixes, Clenaups * imx: Fix rotation for Vivante tiled formats; Support nearest-neighour skaling; Cleanups * mcde: Fix RGB formats; Support DPI output; Cleanups * meson: HDMI clock fixes * panel: Add driver and bindings for Innolux N125HCE-GN1 * panel/s6e63m0: More backlight levels; Fix init; Cleanups * via: Clenunps * virtio: Use fence ID for handling fences; CleanupsSigned-off-by: Daniel Vetter From: Thomas Zimmermann Link: https://patchwork.freedesktop.org/patch/msgid/20201127083055.GA29139@linux-uq9g List of files: /linux/drivers/dma-buf/heaps/Makefile

064fae53c068a13987733ef2898d12d93a34545c - dma-buf: heaps: Remove heap-helpers code

Sun, 22 Nov 2020 00:50:00 +0100

dma-buf: heaps: Remove heap-helpers codeThe heap-helpers code was not as generic as initially hopedand it is now not being used, so remove it from the tree.Cc: Sumit Semwal Cc: Liam Mark Cc: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Daniel Mentz Cc: Chris Goldsworthy Cc: Ørjan Eide Cc: Robin Murphy Cc: Ezequiel Garcia Cc: Simon Ser Cc: James Jones Cc: linux-media@vger.kernel.orgCc: dri-devel@lists.freedesktop.orgReviewed-by: Brian Starkey Signed-off-by: John Stultz Signed-off-by: Sumit Semwal Link: https://patchwork.freedesktop.org/patch/msgid/20201121235002.69945-4-john.stultz@linaro.org List of files: /linux/drivers/dma-buf/heaps/Makefile

8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/drivers/dma-buf/heaps/Makefile

d053cf0d771f6547cb0537759a9af63cf402908d - Merge branch 'for-5.8' into for-linus

Mon, 01 Jun 2020 10:15:16 +0200

Merge branch 'for-5.8' into for-linus List of files: /linux/drivers/dma-buf/heaps/Makefile

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/drivers/dma-buf/heaps/Makefile

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/drivers/dma-buf/heaps/Makefile