linux-next: manual merge of the akpm-current tree with the s390 tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: drivers/s390/crypto/ap_bus.h between commit: 74ecbef7b908 ("s390/zcrypt: code beautification and struct field renames") from the s390 tree and commit: a0062965cc01 ("mm, treewide: rename kzfree() to kfree_sensi

linux-next: manual merge of the akpm-current tree with the s390 tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/s390/mm/gup.c between commit: 1a42010cdc26 ("s390/mm: convert to the generic get_user_pages_fast code") from the s390 tree and commit: 0dbe0ed39fa1 ("mm/gup: change GUP fast to use flags rather than a w