tree 0ca1395babe6aa2ebf70b1a44ee6f636c1eb4ef4
parent 1b597e1cf0a226ff1a3b0e117238cfe6c5168de9
parent 6abe2a90808192a5a8b2825293e5f10e80fdea56
author Linus Torvalds <torvalds@linux-foundation.org> 1731696508 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1731696508 -0800
mergetag object 6abe2a90808192a5a8b2825293e5f10e80fdea56
 type commit
 tag for-linus
 tagger Jason Gunthorpe <jgg@nvidia.com> 1731683300 -0400
 
 RDMA v6.12 third rc pull
 
 - Revert a change to the VLAN logic, this broke previously work ROCE
   configurations
 
 - Fix a memory leak on error unwinding in bnxt_re
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQRRRCHOFoQz/8F5bUaFwuHvBreFYQUCZzdj8AAKCRCFwuHvBreF
 YcsYAQCEv9kx5iw+Z0hoAyUw4a8nXZN75FMQZuQqJNfQAdhexgD+MorBq4RgZgD8
 EIHxQPMyK0S9dlS12J55yVDu72dZ8gg=
 =H/X8
 -----END PGP SIGNATURE-----

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/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()