linux-next: manual merge of the userns tree with the tip tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the userns tree with the tip tree
Date	2015-06-04 12:50 +0200
Message-ID	<pxASK-6NR-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Hi Eric,

Today's linux-next merge of the userns tree got a conflict in
drivers/firmware/efi/efi.c between commit 0bb549052d33 ("efi: Add esrt
support") from the tip tree and commit c2f0fd2c640e ("sysfs: Create
mountpoints with sysfs_create_mount_point") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/firmware/efi/efi.c
index ca617f40574a,e14363d12690..000000000000
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@@ -65,8 -64,7 +65,7 @@@ static int __init parse_efi_cmdline(cha
  }
  early_param("efi", parse_efi_cmdline);
  
 -static struct kobject *efi_kobj;
 +struct kobject *efi_kobj;
- static struct kobject *efivars_kobj;
  
  /*
   * Let's not leave out systab information that snuck into

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the userns tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-06-04 12:50 +0200

csiph-web