Merge tag 'efi-next-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

Pull EFI update from Ard Biesheuvel:
 "This is the only remaining EFI change, as everything else was taken
  via -tip this cycle:

   - implement uid/gid mount options for efivarfs"

* tag 'efi-next-for-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
  efivarfs: Add uid/gid mount options

diff --cc fs/efivarfs/inode.c
index 76dd3c7,92e5e06..91290fe
--- 1/fs/efivarfs/inode.c
--- 2/fs/efivarfs/inode.c
+++ b/fs/efivarfs/inode.c
@@@ -21,11 -21,15 +21,15 @@@ struct inode *efivarfs_get_inode(struc
                                dev_t dev, bool is_removable)
  {
        struct inode *inode = new_inode(sb);
+       struct efivarfs_fs_info *fsi = sb->s_fs_info;
+       struct efivarfs_mount_opts *opts = &fsi->mount_opts;
  
        if (inode) {
+               inode->i_uid = opts->uid;
+               inode->i_gid = opts->gid;
                inode->i_ino = get_next_ino();
                inode->i_mode = mode;
 -              inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode);
 +              simple_inode_init_ts(inode);
                inode->i_flags = is_removable ? 0 : S_IMMUTABLE;
                switch (mode & S_IFMT) {
                case S_IFREG:

diff --cc fs/efivarfs/super.c
Simple merge