Changes in Makefile

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

Wed, 05 Feb 2025 10:29:14 +0100

Merge drm/drm-next into drm-intel-gt-nextWe need4ba4f1afb6a9 ("perf: Generic hotplug support for a PMU with a scope")in order to land a i915 PMU simplification and a fix. That landed in 6.12and we are stuck at 6.9 so lets bump things forward.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/vdpa/Makefile

36ec807b627b4c0a0a382f0ae48eac7187d14b2b - Merge branch 'next' into for-linus

Fri, 20 Sep 2024 10:24:24 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.12 merge window. List of files: /linux/drivers/vdpa/Makefile

f057b57270c2a17d3f45c177e9434fa5745caa48 - Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into next

Fri, 06 Sep 2024 06:49:07 +0200

Merge branch 'ib/6.11-rc6-matrix-keypad-spitz' into nextBring in changes removing support for platform data from matrix-keypaddriver. List of files: /linux/drivers/vdpa/Makefile

66e72a01b60ae6950ddbb3585fdc1424d303e14b - Merge tag 'v6.11-rc1' into clk-meson-next

Mon, 29 Jul 2024 16:32:02 +0200

Merge tag 'v6.11-rc1' into clk-meson-nextLinux 6.11-rc1 List of files: /linux/drivers/vdpa/Makefile

ee057c8c194b9283f4137b253b70e292693a39f0 - Merge tag 'v6.11-rc3' into trace/ring-buffer/core

Wed, 14 Aug 2024 22:56:42 +0200

Merge tag 'v6.11-rc3' into trace/ring-buffer/coreThe "reserve_mem" kernel command line parameter has been pulled intov6.11. Merge the latest -rc3 to allow the persistent ring buffer memory tobe able to be mapped at the address specified by the "reserve_mem" commandline parameter.Signed-off-by: Steven Rostedt (Google) List of files: /linux/drivers/vdpa/Makefile

c8faf11cd192214e231626c3ee973a35d8fc33f2 - Merge tag 'v6.11-rc1' into for-6.12

Tue, 30 Jul 2024 21:30:11 +0200

Merge tag 'v6.11-rc1' into for-6.12Linux 6.11-rc1 List of files: /linux/drivers/vdpa/Makefile

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

Fri, 16 Aug 2024 19:05:54 +0200

Merge drm/drm-next into drm-xe-nextGet drm-xe-next on v6.11-rc2 and synchronized with drm-intel-next forthe display side. This resolves the current conflict for theenable_display module parameter and allows further pending refactors.Signed-off-by: Lucas De Marchi List of files: /linux/drivers/vdpa/Makefile

5c61f59824b5e46516ea5d0543ad7a8871567416 - Merge drm/drm-next into drm-misc-next

Mon, 12 Aug 2024 14:14:18 +0200

Merge drm/drm-next into drm-misc-nextGet drm-misc-next to the state of v6.11-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/vdpa/Makefile

3663e2c4bc45fcdc71931fcbfcbfbf9b71f55c83 - Merge drm/drm-next into drm-intel-next

Thu, 01 Aug 2024 12:06:09 +0200

Merge drm/drm-next into drm-intel-nextSync with v6.11-rc1 in general, and specifically get the newBACKLIGHT_POWER_ constants for power states.Signed-off-by: Jani Nikula List of files: /linux/drivers/vdpa/Makefile

4436e6da008fee87d54c038e983e5be9a6baf8fb - Merge branch 'linus' into x86/mm

Fri, 02 Aug 2024 14:10:55 +0200

Merge branch 'linus' into x86/mmBring x86 and selftests up to date List of files: /linux/drivers/vdpa/Makefile

a1ff5a7d78a036d6c2178ee5acd6ba4946243800 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 30 Jul 2024 09:09:23 +0200

Merge drm/drm-fixes into drm-misc-fixesLet's start the new drm-misc-fixes cycle by bringing in 6.11-rc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/vdpa/Makefile

f4f92db4391285ef3a688cdad25d5c76db200a30 - Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Fri, 19 Jul 2024 20:57:55 +0200

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostPull virtio updates from Michael Tsirkin: "Several new features here: - Virtio find vqs API has been reworked (required to fix the scalability issue we have with adminq, which I hope to merge later in the cycle) - vDPA driver for Marvell OCTEON - virtio fs performance improvement - mlx5 migration speedups Fixes, cleanups all over the place"* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (56 commits) virtio: rename virtio_find_vqs_info() to virtio_find_vqs() virtio: remove unused virtio_find_vqs() and virtio_find_vqs_ctx() helpers virtio: convert the rest virtio_find_vqs() users to virtio_find_vqs_info() virtio_balloon: convert to use virtio_find_vqs_info() virtiofs: convert to use virtio_find_vqs_info() scsi: virtio_scsi: convert to use virtio_find_vqs_info() virtio_net: convert to use virtio_find_vqs_info() virtio_crypto: convert to use virtio_find_vqs_info() virtio_console: convert to use virtio_find_vqs_info() virtio_blk: convert to use virtio_find_vqs_info() virtio: rename find_vqs_info() op to find_vqs() virtio: remove the original find_vqs() op virtio: call virtio_find_vqs_info() from virtio_find_single_vq() directly virtio: convert find_vqs() op implementations to find_vqs_info() virtio_pci: convert vp_*find_vqs() ops to find_vqs_info() virtio: introduce virtio_queue_info struct and find_vqs_info() config op virtio: make virtio_find_single_vq() call virtio_find_vqs() virtio: make virtio_find_vqs() call virtio_find_vqs_ctx() caif_virtio: use virtio_find_single_vq() for single virtqueue finding vdpa/mlx5: Don't enable non-active VQs in .set_vq_ready() ... List of files: /linux/drivers/vdpa/Makefile

8b6c724cdab85d8923dd8c474a5a9464228379c5 - virtio: vdpa: vDPA driver for Marvell OCTEON DPU devices

Fri, 14 Jun 2024 16:46:59 +0200

virtio: vdpa: vDPA driver for Marvell OCTEON DPU devicesThis commit introduces a new vDPA driver specifically designed formanaging the virtio control plane over the vDPA bus for OCTEON DPUdevices. The driver consists of two layers:1. Octep HW Layer (Octeon Endpoint): Responsible for handling hardwareoperations and configurations related to the DPU device.2. Octep Main Layer: Compliant with the vDPA bus framework, this layerimplements device operations for the vDPA bus. It handles deviceprobing, bus attachment, vring operations, and other relevant tasks.Signed-off-by: Srujana Challa Signed-off-by: Vamsi Attunuru Signed-off-by: Shijith Thotton Signed-off-by: Nithin Dabilpuram Acked-by: Jason Wang Message-Id: <20240614144659.1776067-1-schalla@marvell.com>Signed-off-by: Michael S. Tsirkin List of files: /linux/drivers/vdpa/Makefile

cdd5b5a9761fd66d17586e4f4ba6588c70e640ea - Merge branch 'next' into for-linus

Tue, 07 Nov 2023 00:42:08 +0100

Merge branch 'next' into for-linusPrepare input updates for 6.7 merge window. List of files: /linux/drivers/vdpa/Makefile

34069d12e239ae8f36dd96c378e4622fb1c42a76 - Merge tag 'v6.5' into next

Tue, 05 Sep 2023 23:08:14 +0200

Merge tag 'v6.5' into nextSync up with mainline to bring in updates to the shared infrastructure. List of files: /linux/drivers/vdpa/Makefile

2612e3bbc0386368a850140a6c9b990cd496a5ec - Merge drm/drm-next into drm-intel-next

Mon, 07 Aug 2023 23:14:42 +0200

Merge drm/drm-next into drm-intel-nextCatching-up with drm-next and drm-intel-gt-next.It will unblock a code refactor around the platformdefinitions (names vs acronyms).Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/vdpa/Makefile

9f771739a04919226081a107167596de75108fbb - Merge drm/drm-next into drm-intel-gt-next

Mon, 07 Aug 2023 12:29:40 +0200

Merge drm/drm-next into drm-intel-gt-nextNeed to pull in b3e4aae612ec ("drm/i915/hdcp: Modify hdcp_gsc_message msg sending mechanism") asa dependency for https://patchwork.freedesktop.org/series/121735/Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/vdpa/Makefile

61b7369483efb5e0a9f3b48e75fac00d46d661e0 - Merge drm/drm-next into drm-misc-next

Mon, 24 Jul 2023 15:44:47 +0200

Merge drm/drm-next into drm-misc-nextBackmerging to get v6.5-rc2.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/vdpa/Makefile

0791faebfe750292a8a842b64795a390ca4a3b51 - ASoC: Merge v6.5-rc2

Mon, 17 Jul 2023 07:12:31 +0200

ASoC: Merge v6.5-rc2Get a similar baseline to my other branches, and fixes for people usingthe branch. List of files: /linux/drivers/vdpa/Makefile

2f98e686ef59b5d19af5847d755798e2031bee3a - Merge v6.5-rc1 into drm-misc-fixes

Tue, 11 Jul 2023 09:23:20 +0200

Merge v6.5-rc1 into drm-misc-fixesBoris needs 6.5-rc1 in drm-misc-fixes to prevent a conflict.Signed-off-by: Maxime Ripard List of files: /linux/drivers/vdpa/Makefile