mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
Merge tag 'driver-core-7.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core
Pull driver core fixes from Danilo Krummrich: - Fix an unused-function warning in the Rust I/O code that breaks builds with CONFIG_PCI disabled and CONFIG_WERROR enabled - Fix kernfs sparse warnings on SMP Alpha when inheriting a parent node's group ID - Add Johan Hovold as an auxiliary bus maintainer * tag 'driver-core-7.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core: MAINTAINERS: update auxiliary bus entry kernfs: avoid READ_ONCE() on a kgid_t in kernfs_new_node() rust: io: fix unused Flags::from_raw warning without CONFIG_PCI
This commit is contained in:
@@ -4484,6 +4484,7 @@ AUXILIARY BUS DRIVER
|
||||
M: Greg Kroah-Hartman <[email protected]>
|
||||
M: "Rafael J. Wysocki" <[email protected]>
|
||||
M: Danilo Krummrich <[email protected]>
|
||||
M: Johan Hovold <[email protected]>
|
||||
R: Dave Ertman <[email protected]>
|
||||
R: Ira Weiny <[email protected]>
|
||||
R: Leon Romanovsky <[email protected]>
|
||||
|
||||
+1
-1
@@ -750,7 +750,7 @@ struct kernfs_node *kernfs_new_node(struct kernfs_node *parent,
|
||||
struct kernfs_iattrs *attrs = READ_ONCE(parent->iattr);
|
||||
|
||||
if (attrs)
|
||||
gid = READ_ONCE(attrs->ia_gid);
|
||||
gid = KGIDT_INIT(READ_ONCE(attrs->ia_gid.val));
|
||||
|
||||
if (flags & KERNFS_DIR)
|
||||
mode |= S_ISGID;
|
||||
|
||||
@@ -164,7 +164,7 @@ impl Resource {
|
||||
// SAFETY: Safe as per the invariants of `Resource`.
|
||||
let flags = unsafe { (*inner).flags };
|
||||
|
||||
Flags(flags)
|
||||
Flags::from_raw(flags)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user