Merge remote-tracking branch 'origin/linux-5.15.87-mpi' into linux-5.…

…15.88-mpi

* origin/linux-5.15.87-mpi:
  nfsd: Do no try to us idmapd for sec=mariux
  config-mpi: Enable SENSORS_CORETEMP
  config-mpi: Disable FB_MATROX
  nfs: Add "mariux" to nfs_pseudoflavour_to_name
  config-mpi: Reenable TASK_DELAY_ACCT for iotop
  sunrpc: Fix name in svcauth_mariux struct
  wifi: Fix potential buffer overflow in 'brcmf_fweh_event_worker'
  nfs/nfsd/rpc: Add AUTH_MARIUX
  config: Add TPM driver
  ext4: Suppress sporadic error messages
  Revert "ext4: Avoid writeback path when fs is shut down"
  config-mpi: Reenable /proc/PID/io
  NFSv4: Fixes for nfs4_inode_return_delegation()
  genhd: Supress "detected capacity change" message
  ext4: Avoid writeback path when fs is shut down
  config-mpi: Increase NR_CPUS from 256 to 512
  config-mpi: Update for new kernel version
  ext4: Reduce logging
  config-mpi: Disable SECURITY
  config-mpi: Switch more settings to M
  config-mpi. Disable CONFIG_MODULE_SIG
  config-mpi: Disable SECURITY_LOCKDOWN_LSM
  config-mpi: Set Ethernet drivers to M
  config-mpi: Add
  ext4: Reduce "mounted" log from INFO to DEBUG
  mount: Remove warning for impending timestamp expiry
  md: Avoid sync_action sync->idle transition deadlock
  kernel/rcu: Print out more information when NMI stall
  nfsd: Add trace events for all v4 operations

block/genhd.c

@@ -83,7 +83,7 @@ bool set_capacity_and_notify(struct gendisk *disk, sector_t size)
 	    (disk->flags & GENHD_FL_HIDDEN))
 		return false;
 
-	pr_info("%s: detected capacity change from %lld to %lld\n",
+	if (0) pr_info("%s: detected capacity change from %lld to %lld\n",
 		disk->disk_name, capacity, size);
 
 	/*