Merge tag '6.4-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6

Pull smb client fixes from Steve French:
 "Four small smb3 client fixes:

   - two small fixes suggested by kernel test robot

   - small cleanup fix

   - update Paulo's email address in the maintainer file"

* tag '6.4-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: address unused variable warning
  smb: delete an unnecessary statement
  smb3: missing null check in SMB2_change_notify
  smb3: update a reviewer email in MAINTAINERS file

diff --combined MAINTAINERS
index 2a42a75,839cc37..a73e5a9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -956,8 -956,7 +956,8 @@@ F: Documentation/networking/device_driv
  F:    drivers/net/ethernet/amazon/
  
  AMAZON RDMA EFA DRIVER
 -M:    Gal Pressman <galpress@amazon.com>
 +M:    Michael Margolin <mrgolin@amazon.com>
 +R:    Gal Pressman <gal.pressman@linux.dev>
  R:    Yossi Leybovich <sleybo@amazon.com>
  L:    linux-rdma@vger.kernel.org
  S:    Supported
@@@ -2430,15 -2429,6 +2430,15 @@@ X:    drivers/net/wireless/atmel
  N:    at91
  N:    atmel
  
 +ARM/MICROCHIP (ARM64) SoC support
 +M:    Conor Dooley <conor@kernel.org>
 +M:    Nicolas Ferre <nicolas.ferre@microchip.com>
 +M:    Claudiu Beznea <claudiu.beznea@microchip.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Supported
 +T:    git https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git
 +F:    arch/arm64/boot/dts/microchip/
 +
  ARM/Microchip Sparx5 SoC support
  M:    Lars Povlsen <lars.povlsen@microchip.com>
  M:    Steen Hegelund <Steen.Hegelund@microchip.com>
@@@ -2446,7 -2436,8 +2446,7 @@@ M:      Daniel Machon <daniel.machon@microch
  M:    UNGLinuxDriver@microchip.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
 -T:    git git://github.com/microchip-ung/linux-upstream.git
 -F:    arch/arm64/boot/dts/microchip/
 +F:    arch/arm64/boot/dts/microchip/sparx*
  F:    drivers/net/ethernet/microchip/vcap/
  F:    drivers/pinctrl/pinctrl-microchip-sgpio.c
  N:    sparx5
@@@ -3545,7 -3536,7 +3545,7 @@@ F:      Documentation/filesystems/befs.rs
  F:    fs/befs/
  
  BFQ I/O SCHEDULER
 -M:    Paolo Valente <paolo.valente@linaro.org>
 +M:    Paolo Valente <paolo.valente@unimore.it>
  M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-block@vger.kernel.org
  S:    Maintained
@@@ -5139,7 -5130,7 +5139,7 @@@ X:      drivers/clk/clkdev.
  
  COMMON INTERNET FILE SYSTEM CLIENT (CIFS and SMB3)
  M:    Steve French <sfrench@samba.org>
- R:    Paulo Alcantara <pc@cjr.nz> (DFS, global name space)
+ R:    Paulo Alcantara <pc@manguebit.com> (DFS, global name space)
  R:    Ronnie Sahlberg <lsahlber@redhat.com> (directory leases, sparse files)
  R:    Shyam Prasad N <sprasad@microsoft.com> (multichannel)
  R:    Tom Talpey <tom@talpey.com> (RDMA, smbdirect)
@@@ -9344,7 -9335,7 +9344,7 @@@ F:      include/linux/hisi_acc_qm.
  
  HISILICON ROCE DRIVER
  M:    Haoyue Xu <xuhaoyue1@hisilicon.com>
 -M:    Wenpeng Liang <liangwenpeng@huawei.com>
 +M:    Junxian Huang <huangjunxian6@hisilicon.com>
  L:    linux-rdma@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/infiniband/hisilicon-hns-roce.txt