Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

* 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore: gracefully handle NULL pstore_info functions
  pstore: pass reason to backend write callback

diff --combined drivers/firmware/efivars.c
index b0a8117,0a53a05..d25599f
--- 1/drivers/firmware/efivars.c
--- 2/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@@ -495,7 -495,8 +495,8 @@@ static ssize_t efi_pstore_read(u64 *id
        return 0;
  }
  
- static int efi_pstore_write(enum pstore_type_id type, u64 *id,
+ static int efi_pstore_write(enum pstore_type_id type,
+               enum kmsg_dump_reason reason, u64 *id,
                unsigned int part, size_t size, struct pstore_info *psi)
  {
        char name[DUMP_NAME_LEN];
@@@ -565,7 -566,7 +566,7 @@@
  static int efi_pstore_erase(enum pstore_type_id type, u64 id,
                            struct pstore_info *psi)
  {
-       efi_pstore_write(type, &id, (unsigned int)id, 0, psi);
+       efi_pstore_write(type, 0, &id, (unsigned int)id, 0, psi);
  
        return 0;
  }
@@@ -581,13 -582,13 +582,14 @@@ static int efi_pstore_close(struct psto
  }
  
  static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
 -                             struct timespec *time, struct pstore_info *psi)
 +                             struct timespec *timespec,
 +                             char **buf, struct pstore_info *psi)
  {
        return -1;
  }
  
- static int efi_pstore_write(enum pstore_type_id type, u64 *id,
+ static int efi_pstore_write(enum pstore_type_id type,
+               enum kmsg_dump_reason reason, u64 *id,
                unsigned int part, size_t size, struct pstore_info *psi)
  {
        return 0;