Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/linux-6.12.10-mpi' into linux-6.…
Browse files Browse the repository at this point in the history
…12.11-mpi

* origin/linux-6.12.10-mpi:
  config-mpi: Update for new kernel version
  config-mpi: Reenable NFSD_LEGACY_CLIENT_TRACKING
  config-mpi: Update for new kernel version
  lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat
  config-mpi: Disable NFS_V2
  config-mpi: Update for new kernel version
  config-mpi: Enable NTF3_FS
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  config-mpi: Re-Add CONFIG_FB=y
  config-mpi: Re-add CONFIG_AUTOFS
  config-mpi: Re-add CONFIG_UNIX
  Revert "drm/amdgpu: install stub fence into potential unused fence pointers"
  config-mpi: (Re-)enable MICROCODE_LATE_LOADING
  config-mpi: Update for new kernel version
  config-mpi: Remove CONFIG_HID_APPLE=m (now implied)
  config-mpi: Disable frame buffer drivers
  config-mpi: Build DRM driver for simple platform-provided framebuffers (DRM_SIMPLE=y)
  config-mpi: Build coreboot framebuffer into Linux (GOOGLE_FRAMEBUFFER_COREBOOT=y)
  config-mpi: Switch HID devices from Y to M
  scsi: mpt3sas: Rate-limit scsi_dma_map() error messages
  Revert "scsi: mpt3sas: Remove scsi_dma_map() error messages"
  config-mpi: Built host kernel accelerator for virtio net as module (VHOST_NET=m)
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  nfs: Do not try to use idmap for sec=mariux
  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
  sunrpc: Fix name in svcauth_mariux struct
  nfs/nfsd/rpc: Add AUTH_MARIUX
  config: Add TPM driver
  config-mpi: Update for new kernel version
  config-mpi: Update for new kernel version
  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 Jan 24, 2025
2 parents 62b2447 + b0b3d98 commit 59ae99a
Show file tree
Hide file tree
Showing 26 changed files with 1,291 additions and 25 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 59ae99a

Please sign in to comment.