tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'driver-core-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg KH:
"Here are two tiny driver core fixes for 6.0-rc7 that resolve some
oft-reported problems.

The first is a revert of the "fw_devlink.strict=1" default option that
we keep trying to enable, but we keep finding platforms that this just
breaks everything on. So again, we need it reverted and hopefully it
can be worked on in future releases.

The second is a sysfs file-size bugfix that resolves an issue that
many people are starting to hit as the fix it is fixing also was
backported to stable kernels. The util-linux developers are starting
to get bugreports about sysfs files that contain no data because of
this problem, and this fix which has been in linux-next in the
bitfield tree for a long time, resolves it. I'm submitting it here as
it needs to be merged for 6.0-final, not for 6.1-rc1.

Both of these have been in linux-next with no reported issues, only
reports were that these fixed problems"

* tag 'driver-core-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
drivers/base: Fix unsigned comparison to -1 in CPUMAP_FILE_MAX_BYTES
Revert "driver core: Set fw_devlink.strict=1 by default"

Linus Torvalds 1707c39a 33a4e37e

+4 -3
+1 -1
drivers/base/core.c
··· 1625 1625 } 1626 1626 early_param("fw_devlink", fw_devlink_setup); 1627 1627 1628 - static bool fw_devlink_strict = true; 1628 + static bool fw_devlink_strict; 1629 1629 static int __init fw_devlink_strict_setup(char *arg) 1630 1630 { 1631 1631 return strtobool(arg, &fw_devlink_strict);
+3 -2
include/linux/cpumask.h
··· 1127 1127 * cover a worst-case of every other cpu being on one of two nodes for a 1128 1128 * very large NR_CPUS. 1129 1129 * 1130 - * Use PAGE_SIZE as a minimum for smaller configurations. 1130 + * Use PAGE_SIZE as a minimum for smaller configurations while avoiding 1131 + * unsigned comparison to -1. 1131 1132 */ 1132 - #define CPUMAP_FILE_MAX_BYTES ((((NR_CPUS * 9)/32 - 1) > PAGE_SIZE) \ 1133 + #define CPUMAP_FILE_MAX_BYTES (((NR_CPUS * 9)/32 > PAGE_SIZE) \ 1133 1134 ? (NR_CPUS * 9)/32 - 1 : PAGE_SIZE) 1134 1135 #define CPULIST_FILE_MAX_BYTES (((NR_CPUS * 7)/2 > PAGE_SIZE) ? (NR_CPUS * 7)/2 : PAGE_SIZE) 1135 1136