Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1631898

Re: linux-next: manual merge of the kvms390 tree with the s390 tree

Show all headers | View raw

On 04/27/2017 05:29 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>   arch/s390/include/asm/cpacf.h
> 
> between commit:
> 
>   985a9d20daa6 ("s390/crypto: Renaming PPNO to PRNO.")
> 
> from the s390 tree and commit:
> 
>   152c1c8d60eb ("s390/cpacf: Introduce kma instruction")
> 
> from the kvms390 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.
> 

Correct fix, thanks. It should be ok again tomorrow as Martin has merged
my topic branch.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the kvms390 tree with the s390 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-27 05:30 +0200
  Re: linux-next: manual merge of the kvms390 tree with the s390 tree Christian Borntraeger <borntraeger@de.ibm.com> - 2017-04-27 08:50 +0200

csiph-web