Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/linux-6.1.38-mpi' into linux-6.1…
Browse files Browse the repository at this point in the history
….39-mpi

* origin/linux-6.1.38-mpi:
  config-mpi: Update for new kernel version
  nfs: Do not try to use idmap for sec=mariux
  firmware: coreboot: Check size of table entry and use flex-array
  nfsd: Do no try to use idmapd for sec=mariux
  config-mpi: Enable SENSORS_CORETEMP
  config-mpi: Disable FB_MATROX
  nfs: Add "mariux" to nfs_pseudoflavour_to_name
  sunrpc: Fix name in svcauth_mariux struct
  nfs/nfsd/rpc: Add AUTH_MARIUX
  config: Add TPM driver
  ext4: Avoid writeback path when fs is shut down
  ext4: Suppress sporadic error messages
  genhd: Supress "detected capacity change" message
  config-mpi: Increase NR_CPUS from 256 to 512
  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: Update for new kernel version
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  ext4: Reduce logging
  floppy: disable FDRAWCMD by default
  fs: Restore mnt_warn_timestamp_expiry
  config-mpi: Update for new kernel version
  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
  • Loading branch information
donald committed Jul 19, 2023
2 parents a456e17 + a205fbe commit 9b4917c
Show file tree
Hide file tree
Showing 25 changed files with 1,303 additions and 18 deletions.
2 changes: 1 addition & 1 deletion block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,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);

/*
Expand Down
Loading

0 comments on commit 9b4917c

Please sign in to comment.