> From: linux-efi-owner@xxxxxxxxxxxxxxx <linux-efi-owner@xxxxxxxxxxxxxxx> On Behalf Of Ard Biesheuvel >> ... > > Move the variable 'efi_capsule_pstore_info' backward (for removing some function declarations). > > This conflicts badly with the efi/core changes queued up in the tip tree (and hence linux-next) Please rebase and repost OK. Will rebase the patches on top of tip tree and repost. -Qiuxu