From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Nov 2024 18:48:28 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
X-Git-Tag: microblaze-v6.16~704
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=f5395732841802fcfd04fa7faa9a6cf2d4a8a714;p=linux-2.6-microblaze.git

Merge tag 'for-linus' of git://git./linux/kernel/git/rdma/rdma

Pull rdma fixes from Jason Gunthorpe:

 - Revert a change to the VLAN logic, this broke previously working ROCE
   configurations

 - Fix a memory leak on error unwinding in bnxt_re

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  Revert "RDMA/core: Fix ENODEV error for iWARP test over vlan"
  RDMA/bnxt_re: Remove some dead code
  RDMA/bnxt_re: Fix some error handling paths in bnxt_re_probe()
---

f5395732841802fcfd04fa7faa9a6cf2d4a8a714