Changes in Makefile

4f2c0a4acffbec01079c28f839422e64ddeff004 - Merge branch 'main' into zstd-linus

Wed, 14 Dec 2022 01:21:55 +0100

Merge branch 'main' into zstd-linus List of files: /linux/drivers/infiniband/hw/erdma/Makefile

14e77332e74603efab8347c89d3cda447c3b97c9 - Merge branch 'main' into zstd-next

Sat, 22 Oct 2022 01:00:35 +0200

Merge branch 'main' into zstd-next List of files: /linux/drivers/infiniband/hw/erdma/Makefile

5f8f8574c7f5585b09a9623f0f13462e4eb67b4d - Merge branch 'next' into for-linus

Mon, 10 Oct 2022 07:30:23 +0200

Merge branch 'next' into for-linusPrepare input updates for 6.1 merge window. List of files: /linux/drivers/infiniband/hw/erdma/Makefile

edd1533d3ccd82dd5d600986d27d524e6be4c5fd - Merge branch 'for-6.1/logitech' into for-linus

Wed, 05 Oct 2022 11:21:55 +0200

Merge branch 'for-6.1/logitech' into for-linus- Add hanlding of all Bluetooth HID++ devices and fixes in hid++ (Bastien Nocera) List of files: /linux/drivers/infiniband/hw/erdma/Makefile

97acb6a8fcc4e5c2cdc2693a35acdc5a7461aaa3 - Merge drm/drm-next into drm-intel-gt-next

Mon, 03 Oct 2022 18:04:02 +0200

Merge drm/drm-next into drm-intel-gt-nextDaniele needs 84d4333c1e28 ("misc/mei: Add NULL check to component matchcallback functions") in order to merge the DG2 HuC patches.Signed-off-by: Tvrtko Ursulin List of files: /linux/drivers/infiniband/hw/erdma/Makefile

305a72efa791c826fe84768ca55e31adc4113ea8 - Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next

Sun, 02 Oct 2022 04:16:16 +0200

Merge branch 'for-6.1/nvdimm' into libnvdimm-for-nextAdd v6.1 content on top of some straggling updates that missed v6.0. List of files: /linux/drivers/infiniband/hw/erdma/Makefile

70d1b1a7f8b32b78c09b30dbcfa25ba1e470568b - Merge branch 'mlx5-vfio' into mlx5-next

Tue, 27 Sep 2022 11:56:24 +0200

Merge branch 'mlx5-vfio' into mlx5-nextMerge net/mlx5 dependencies for device DMA logging.Signed-off-by: Leon Romanovsky List of files: /linux/drivers/infiniband/hw/erdma/Makefile

b3bbcc5d1da1b654091dad15980b3d58fdae0fc6 - Merge branch 'for-6.0/dax' into libnvdimm-fixes

Sun, 25 Sep 2022 03:14:12 +0200

Merge branch 'for-6.0/dax' into libnvdimm-fixesPick up another "Soft Reservation" fix for v6.0-final on top of somestraggling nvdimm fixes that missed v5.19. List of files: /linux/drivers/infiniband/hw/erdma/Makefile

74656d03ac36fabb16b9df5221cf398ee3a9ca08 - Merge tag 'v6.0-rc6' into locking/core, to refresh the branch

Wed, 21 Sep 2022 09:58:02 +0200

Merge tag 'v6.0-rc6' into locking/core, to refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/drivers/infiniband/hw/erdma/Makefile

a108772d03d8bdb43258218b00bfe43bbe1e8800 - Merge drm/drm-next into drm-misc-next

Wed, 14 Sep 2022 13:22:18 +0200

Merge drm/drm-next into drm-misc-nextWe need 6.0-rc1 to merge the backlight rework PR.Signed-off-by: Maxime Ripard List of files: /linux/drivers/infiniband/hw/erdma/Makefile

2a906db2824b75444982f5e9df870106982afca8 - Merge branch 'am5748-fix' into fixes

Tue, 06 Sep 2022 08:45:27 +0200

Merge branch 'am5748-fix' into fixes List of files: /linux/drivers/infiniband/hw/erdma/Makefile

1043897681808118c0f7e70b210774000fe06621 - Merge branch 'linus' into x86/mm, to refresh the branch

Fri, 02 Sep 2022 10:31:58 +0200

Merge branch 'linus' into x86/mm, to refresh the branchThis branch is ~14k commits behind upstream, and has an old merge basefrom early into the merge window, refresh it to v6.0-rc3+fixes beforequeueing up new commits.Signed-off-by: Ingo Molnar List of files: /linux/drivers/infiniband/hw/erdma/Makefile

53aa930dc4bae6aa269951bd37103083145d6691 - Merge branch 'sched/warnings' into sched/core, to pick up WARN_ON_ONCE() conversion commit

Tue, 30 Aug 2022 10:27:33 +0200

Merge branch 'sched/warnings' into sched/core, to pick up WARN_ON_ONCE() conversion commitMerge in the BUG_ON() => WARN_ON_ONCE() conversion commit.Signed-off-by: Ingo Molnar List of files: /linux/drivers/infiniband/hw/erdma/Makefile

917bda9ab155032a02be1a57ebd4d949ae9e1528 - Merge drm/drm-next into drm-intel-next

Mon, 29 Aug 2022 13:44:38 +0200

Merge drm/drm-next into drm-intel-nextSync drm-intel-next with v6.0-rc as well as recent drm-intel-gt-next.Since drm-next does not have commit f0c70d41e4e8 ("drm/i915/guc: removeruntime info printing from time stamp logging") yet, onlydrm-intel-gt-next, will need to do that as part of the merge here tobuild.Signed-off-by: Jani Nikula List of files: /linux/drivers/infiniband/hw/erdma/Makefile

93fbff1197474d7b65e598c6f48fa82a5c334539 - Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into next

Wed, 17 Aug 2022 21:30:00 +0200

Merge branch 'i2c/make_remove_callback_void-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux into nextSync up with the latest I2C code base to get updated prototype of I2Cbus remove() method. List of files: /linux/drivers/infiniband/hw/erdma/Makefile

cf36ae3e5802716617b9e4d902a31048240396b0 - Merge drm/drm-fixes into drm-misc-fixes

Wed, 17 Aug 2022 08:40:32 +0200

Merge drm/drm-fixes into drm-misc-fixesBackmerging for v6.0-rc1.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/infiniband/hw/erdma/Makefile

e495274793ea602415d050452088a496abcd9e6c - Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Fri, 05 Aug 2022 04:54:32 +0200

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdmaPull rdma updates from Jason Gunthorpe: "This cycle we got a new RDMA driver "ERDMA" for the Alibaba cloud environment. Otherwise the changes are dominated by rxe fixes. There is another RDMA driver on the list that might get merged next cycle, 'MANA' for the Azure cloud environment. Summary: - Bug fixes and small features for irdma, hns, siw, qedr, hfi1, mlx5 - General spelling/grammer fixes - rdma cm can follow changes in neighbours for control packets - Significant amounts of rxe fixes and spec compliance changes - Use the modern NAPI API - Use the bitmap API instead of open coding - Performance improvements for rtrs - Add the ERDMA driver for Alibaba cloud - Fix a use after free bug in SRP"* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (99 commits) RDMA/ib_srpt: Unify checking rdma_cm_id condition in srpt_cm_req_recv() RDMA/rxe: Fix error unwind in rxe_create_qp() RDMA/mlx5: Add missing check for return value in get namespace flow RDMA/rxe: Split qp state for requester and completer RDMA/rxe: Generate error completion for error requester QP state RDMA/rxe: Update wqe_index for each wqe error completion RDMA/srpt: Fix a use-after-free RDMA/srpt: Introduce a reference count in struct srpt_device RDMA/srpt: Duplicate port name members IB/qib: Fix repeated "in" within comments RDMA/erdma: Add driver to kernel build environment RDMA/erdma: Add the ABI definitions RDMA/erdma: Add the erdma module RDMA/erdma: Add connection management (CM) support RDMA/erdma: Add verbs implementation RDMA/erdma: Add verbs header file RDMA/erdma: Add event queue implementation RDMA/erdma: Add cmdq implementation RDMA/erdma: Add main include file RDMA/erdma: Add the hardware related definitions ... List of files: /linux/drivers/infiniband/hw/erdma/Makefile

3e93c0b8a981b55c8ee45aae2abf6028730ab194 - Merge branch 'erdma' into rdma.git for-next

Wed, 27 Jul 2022 21:09:25 +0200

Merge branch 'erdma' into rdma.git for-nextCheng Xu says====================This v14 patch set introduces the Elastic RDMA Adapter (ERDMA) driver,which released in Apsara Conference 2021 by Alibaba. The PR of ERDMAuserspace provider has already been created [1].ERDMA enables large-scale RDMA acceleration capability in Alibaba ECSenvironment, initially offered in g7re instance. It can improve theefficiency of large-scale distributed computing and communicationsignificantly and expand dynamically with the cluster scale of AlibabaCloud.ERDMA is a RDMA networking adapter based on the Alibaba MOC hardware. Itworks in the VPC network environment (overlay network), and uses iWarptransport protocol. ERDMA supports reliable connection (RC). ERDMA alsosupports both kernel space and user space verbs. Now we have alreadysupported HPC/AI applications with libfabric, NoF and some other internalverbs libraries, such as xrdma, epsl, etc,.For the ECS instance with RDMA enabled, our MOC hardware generates twokinds of PCI devices: one for ERDMA, and one for the original net device(virtio-net). They are separated PCI devices.====================* branch 'erdma': RDMA/erdma: Add driver to kernel build environment RDMA/erdma: Add the ABI definitions RDMA/erdma: Add the erdma module RDMA/erdma: Add connection management (CM) support RDMA/erdma: Add verbs implementation RDMA/erdma: Add verbs header file RDMA/erdma: Add event queue implementation RDMA/erdma: Add cmdq implementation RDMA/erdma: Add main include file RDMA/erdma: Add the hardware related definitions RDMA: Add ERDMA to rdma_driver_id definitionSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/infiniband/hw/erdma/Makefile

ca7fd6cff3b8df436f3e46b8fc80e6989700c8da - RDMA/erdma: Add driver to kernel build environment

Wed, 27 Jul 2022 03:49:27 +0200

RDMA/erdma: Add driver to kernel build environmentAdd erdma to the kernel build environment, and sort the sourceorder in drivers/infiniband/Kconfig.Link: https://lore.kernel.org/r/20220727014927.76564-12-chengyou@linux.alibaba.comSigned-off-by: Cheng Xu Signed-off-by: Jason Gunthorpe List of files: /linux/drivers/infiniband/hw/erdma/Makefile