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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

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_sensitive()")

from the akpm-current 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 drivers/s390/crypto/ap_bus.h
index 1a1d5e3c8d45,823de10479bd..000000000000
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@@ -219,8 -218,8 +219,8 @@@ static inline void ap_init_message(stru
   */
  static inline void ap_release_message(struct ap_message *ap_msg)
  {
- 	kzfree(ap_msg->msg);
- 	kzfree(ap_msg->private);
 -	kfree_sensitive(ap_msg->message);
++	kfree_sensitive(ap_msg->msg);
+ 	kfree_sensitive(ap_msg->private);
  }
  
  /*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1630 bytes --]

Hi all,

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

  arch/s390/kernel/setup.c

between commit:

  e035389b73b1 ("s390/setup: use virtual address for STSI instruction")

from the s390 tree and commits:

  0d52db59796e ("memblock: rename memblock_free to memblock_phys_free")
  13ab40b0e60e ("memblock: use memblock_free for freeing virtual pointers")

from the akpm-current tree.

I fixed it up (thanks, Vasily for the heads up and resolution) 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 arch/s390/kernel/setup.c
index e738a45057ac,8a378d426239..000000000000
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@@ -878,12 -884,14 +879,12 @@@ static void __init setup_randomness(voi
  {
  	struct sysinfo_3_2_2 *vmms;
  
 -	vmms = (struct sysinfo_3_2_2 *) memblock_phys_alloc(PAGE_SIZE,
 -							    PAGE_SIZE);
 +	vmms = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
  	if (!vmms)
  		panic("Failed to allocate memory for sysinfo structure\n");
 -
  	if (stsi(vmms, 3, 2, 2) == 0 && vmms->count)
  		add_device_randomness(&vmms->vm, sizeof(vmms->vm[0]) * vmms->count);
- 	memblock_free_ptr(vmms, PAGE_SIZE);
 -	memblock_phys_free((unsigned long)vmms, PAGE_SIZE);
++	memblock_free(vmms, PAGE_SIZE);
  }
  
  /*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

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 write 'bool'")

from the akpm-current tree.

I fixed it up (the former removed the file, so I just did that) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]