Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/linux-5.15.70-mpi' into linux-5.…
Browse files Browse the repository at this point in the history
…15.71-mpi

* origin/linux-5.15.70-mpi:
  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
  • Loading branch information
donald committed Sep 28, 2022
2 parents 90c7e9b + 8c032fb commit f730c34
Show file tree
Hide file tree
Showing 10 changed files with 1,146 additions and 32 deletions.
2 changes: 1 addition & 1 deletion block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*
Expand Down
Loading

0 comments on commit f730c34

Please sign in to comment.