linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Janosch Frank <frankja@linux.ibm.com>,
	Heiko Carstens <hca@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Tony Krowiak <akrowiak@linux.ibm.com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the s390 tree
Date: Mon, 23 Jan 2023 08:07:05 +0100	[thread overview]
Message-ID: <e6768d2d-d27a-09bd-8219-8af62e6fa3d6@de.ibm.com> (raw)
In-Reply-To: <20230123121245.526d262b@canb.auug.org.au>

Am 23.01.23 um 02:12 schrieb Stephen Rothwell:
> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>    drivers/s390/crypto/vfio_ap_ops.c
> 
> between commit:
> 
>    0daf9878a799 ("s390/vfio_ap: check TAPQ response code when waiting for queue reset")
> 
> from the s390 tree and commit:
> 
>    bedac519eefa ("s390/vfio-ap: check TAPQ response code when waiting for queue reset")
> 
> from the kvms390 tree.
> 
> They seem to do the same thing, so I used the version of this file from
> the s390 tree as it's commit is much newer and has other changes to this
> file i.e. I effectively dropped the kvms390 tree commit.
> 
> I fixed it up (see above) 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.

Yes thanks, will drop from the kvms390 tree.

  reply	other threads:[~2023-01-23  7:07 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-23  1:12 linux-next: manual merge of the kvms390 tree with the s390 tree Stephen Rothwell
2023-01-23  7:07 ` Christian Borntraeger [this message]
2023-01-23 19:02 ` Anthony Krowiak
2023-01-24 11:19   ` Christian Borntraeger
2023-01-24 14:43     ` Anthony Krowiak
  -- strict thread matches above, loose matches on Subject: below --
2022-11-08  2:41 Stephen Rothwell
2017-06-22  2:59 Stephen Rothwell
2017-07-03  1:55 ` Stephen Rothwell
2017-04-27  3:29 Stephen Rothwell
2017-04-27  6:47 ` Christian Borntraeger
2016-11-23  3:45 Stephen Rothwell
2016-11-23  8:24 ` Christian Borntraeger
2016-11-23  9:17   ` Heiko Carstens
2016-06-14  4:51 Stephen Rothwell
2016-06-14  4:52 ` Heiko Carstens
2016-06-14  8:45 ` Christian Borntraeger
2015-07-22  2:31 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e6768d2d-d27a-09bd-8219-8af62e6fa3d6@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=akrowiak@linux.ibm.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=frankja@linux.ibm.com \
    --cc=gor@linux.ibm.com \
    --cc=hca@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).