linux-next: manual merge of the efi tree with the efi-fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the efi tree got a conflict in:

  include/linux/efi.h

between commit:

  fd936fd8ac10 ("efi: fix missing prototype warnings")

from the efi-fixes tree and commit:

  5b6e3aa08c62 ("efi: expose efivar generic ops register function")

from the efi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/efi.h
index 571d1a6e1b74,657f7e203374..000000000000
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@@ -1338,6 -1350,7 +1350,9 @@@ bool efi_config_table_is_usable(const e
  	return xen_efi_config_table_is_usable(guid, table);
  }
  
 +umode_t efi_attr_is_visible(struct kobject *kobj, struct attribute *attr, int n);
 +
+ void efivars_generic_ops_register(void);
+ void efivars_generic_ops_unregister(void);
+ 
  #endif /* _LINUX_EFI_H */

Attachment: pgpwYjPs2HcId.pgp
Description: OpenPGP digital signature