Patch "s390/pci: add extra padding to function measurement block" has been added to the 4.5-stable tree

This is a note to let you know that I've just added the patch titled

s390/pci: add extra padding to function measurement block

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
s390-pci-add-extra-padding-to-function-measurement-block.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Sebastian Ott <[email protected]>
Date: Thu, 31 Mar 2016 11:48:31 +0200
Subject: s390/pci: add extra padding to function measurement block

From: Sebastian Ott <[email protected]>

commit 9d89d9e61d361f3adb75e1aebe4bb367faf16cfa upstream.

Newer machines might use a different (larger) format for function measurement blocks. To ensure that we comply with the alignment requirement on these machines and prevent memory corruption (when firmware writes more data than we expect) add 16 padding bytes at the end of the fmb.

---
 arch/s390/include/asm/pci.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -45,7 +45,8 @@ struct zpci_fmb {
 	u64 rpcit_ops;
 	u64 dma_rbytes;
 	u64 dma_wbytes;
-} __packed __aligned(64);
+	u64 pad[2];
+} __packed __aligned(128);
 
 enum zpci_state {
 	ZPCI_FN_STATE_RESERVED,

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/s390-pci-add-extra-padding-to-function-measurement-block.patch