Changes in Makefile

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

Tue, 24 Oct 2023 10:50:22 +0200

Merge drm/drm-next into drm-intel-gt-nextWork that needs to land in drm-intel-gt-next depends on two patches onlypresent in drm-intel-next, absence of which is causing a merge conflict: 3b918f4f0c8b ("drm/i915/pxp: Optimize GET_PARAM:PXP_STATUS") ac765b7018f6 ("drm/i915/pxp/mtl: intel_pxp_init_hw needs runtime-pm inside pm-complete")Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/vdpa/pds/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/pds/Makefile

a940daa52167e9db8ecce82213813b735a9d9f23 - Merge branch 'linus' into smp/core

Tue, 17 Oct 2023 21:40:46 +0200

Merge branch 'linus' into smp/corePull in upstream to get the fixes so depending changes can be applied. List of files: /linux/drivers/vdpa/pds/Makefile

57390019b68b83f96eb98f490367b9df1f2d77cb - Merge drm/drm-next into drm-misc-next

Wed, 11 Oct 2023 09:50:59 +0200

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

6f23fc47c1b2ac226704fb7294f43ed3b0965e51 - Merge tag 'v6.6-rc2' into locking/core, to pick up fixes

Mon, 18 Sep 2023 22:17:15 +0200

Merge tag 'v6.6-rc2' into locking/core, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/vdpa/pds/Makefile

a3f9e4bc1ec9d8f1e352eb7c1cbaea3168246be7 - Merge drm/drm-next into drm-intel-next

Fri, 15 Sep 2023 10:23:38 +0200

Merge drm/drm-next into drm-intel-nextSync to v6.6-rc1.Signed-off-by: Jani Nikula List of files: /linux/drivers/vdpa/pds/Makefile

c900529f3d9161bfde5cca0754f83b4d3c3e0220 - Merge drm/drm-fixes into drm-misc-fixes

Tue, 12 Sep 2023 08:53:30 +0200

Merge drm/drm-fixes into drm-misc-fixesForwarding to v6.6-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/vdpa/pds/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/pds/Makefile

578464679f33cde8331507c78f7b302299df7783 - spi: sun6i: fix RX data corruption in DMA mode

Mon, 04 Sep 2023 16:53:37 +0200

spi: sun6i: fix RX data corruption in DMA modeMerge series from Tobias Schramm :This set of patches fixes two bugs in the sun6i SPI driver that result incorruption of received data in DMA RX mode.The first bug seems to be related to an incompatibility of the SPI RX FIFOwith wider than single byte read accesses during SPI transfers. I'm notsure if this bug affects all types of SPI controllers found in AllwinnerSoCs supported by this driver. However reducing the access width shouldalways be safe. I've tested this change on a V3s SoC. Further testing tonarrow down the set of affected SoCs in the future would be welcome.The second bug is a race between SPI RX DMA and FIFO drain logic forinterrupt-based SPI operation. This bug affects all SPI controllerssupported by this driver. Once again this change has been tested on theAllwinner V3s SoC. List of files: /linux/drivers/vdpa/pds/Makefile

fdebffeba8b877368ddcc139c26278c1c97931a4 - BackMerge tag 'v6.5-rc7' into drm-next

Wed, 23 Aug 2023 23:26:06 +0200

BackMerge tag 'v6.5-rc7' into drm-nextLinux 6.5-rc7This is needed for the CI stuff and the msm pull has fixes in it.Signed-off-by: Dave Airlie List of files: /linux/drivers/vdpa/pds/Makefile

642073c306e66daca108cb630d169129e50a6ba3 - Merge commit b320441c04c9 ("Merge tag 'tty-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty") into tty-next

Sun, 20 Aug 2023 14:29:37 +0200

Merge commit b320441c04c9 ("Merge tag 'tty-6.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty") into tty-nextWe need the serial-core fixes in here as well.Signed-off-by: Greg Kroah-Hartman List of files: /linux/drivers/vdpa/pds/Makefile

7ff57803d24e0cb326251489d70f60462e3e6c04 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 18 Aug 2023 21:44:22 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netCross-merge networking fixes after downstream PR.Conflicts:drivers/net/ethernet/sfc/tc.c fa165e194997 ("sfc: don't unregister flow_indr if it was never registered") 3bf969e88ada ("sfc: add MAE table machinery for conntrack table")https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/No adjacent changes.Signed-off-by: Jakub Kicinski List of files: /linux/drivers/vdpa/pds/Makefile

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

Tue, 15 Aug 2023 08:03:44 +0200

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostPull virtio fixes from Michael Tsirkin: "Just a bunch of bugfixes all over the place"* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (26 commits) virtio-mem: check if the config changed before fake offlining memory virtio-mem: keep retrying on offline_and_remove_memory() errors in Sub Block Mode (SBM) virtio-mem: convert most offline_and_remove_memory() errors to -EBUSY virtio-mem: remove unsafe unplug in Big Block Mode (BBM) pds_vdpa: fix up debugfs feature bit printing pds_vdpa: alloc irq vectors on DRIVER_OK pds_vdpa: clean and reset vqs entries pds_vdpa: always allow offering VIRTIO_NET_F_MAC pds_vdpa: reset to vdpa specified mac virtio-net: Zero max_tx_vq field for VIRTIO_NET_CTRL_MQ_HASH_CONFIG case vdpa/mlx5: Fix crash on shutdown for when no ndev exists vdpa/mlx5: Delete control vq iotlb in destroy_mr only when necessary vdpa/mlx5: Fix mr->initialized semantics vdpa/mlx5: Correct default number of queues when MQ is on virtio-vdpa: Fix cpumask memory leak in virtio_vdpa_find_vqs() vduse: Use proper spinlock for IRQ injection vdpa: Enable strict validation for netlinks ops vdpa: Add max vqp attr to vdpa_nl_policy for nlattr length check vdpa: Add queue index attr to vdpa_nl_policy for nlattr length check vdpa: Add features attr to vdpa_nl_policy for nlattr length check ... List of files: /linux/drivers/vdpa/pds/Makefile

9ad1a29cb0991e3145996cdce691525e8ac65db7 - pds_vdpa: protect Makefile from unconfigured debugfs

Fri, 07 Jul 2023 01:17:18 +0200

pds_vdpa: protect Makefile from unconfigured debugfsdebugfs.h protects itself from an undefined DEBUG_FS, so it isnot necessary to check it in the driver code or the Makefile.The driver code had been updated for this, but the Makefile hadmissed the update.Link: https://lore.kernel.org/linux-next/fec68c3c-8249-7af4-5390-0495386a76f9@infradead.org/Fixes: a16291b5bcbb ("pds_vdpa: Add new vDPA driver for AMD/Pensando DSC")Signed-off-by: Shannon Nelson Message-Id: <20230706231718.54198-1-shannon.nelson@amd.com>Signed-off-by: Michael S. Tsirkin Reviewed-by: Randy Dunlap Tested-by: Randy Dunlap # build-testedAcked-by: Jason Wang List of files: /linux/drivers/vdpa/pds/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/pds/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/pds/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/pds/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/pds/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/pds/Makefile

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

Tue, 04 Jul 2023 00:38:26 +0200

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostPull virtio updates from Michael Tsirkin: - resume support in vdpa/solidrun - structure size optimizations in virtio_pci - new pds_vdpa driver - immediate initialization mechanism for vdpa/ifcvf - interrupt bypass for vdpa/mlx5 - multiple worker support for vhost - viirtio net in Intel F2000X-PL support for vdpa/ifcvf - fixes, cleanups all over the place* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (48 commits) vhost: Make parameter name match of vhost_get_vq_desc() vduse: fix NULL pointer dereference vhost: Allow worker switching while work is queueing vhost_scsi: add support for worker ioctls vhost: allow userspace to create workers vhost: replace single worker pointer with xarray vhost: add helper to parse userspace vring state/file vhost: remove vhost_work_queue vhost_scsi: flush IO vqs then send TMF rsp vhost_scsi: convert to vhost_vq_work_queue vhost_scsi: make SCSI cmd completion per vq vhost_sock: convert to vhost_vq_work_queue vhost: convert poll work to be vq based vhost: take worker or vq for flushing vhost: take worker or vq instead of dev for queueing vhost, vhost_net: add helper to check if vq has work vhost: add vhost_worker pointer to vhost_virtqueue vhost: dynamically allocate vhost_worker vhost: create worker at end of vhost_dev_set_owner virtio_bt: call scheduler when we free unused buffs ... List of files: /linux/drivers/vdpa/pds/Makefile