From: Christian Borntraeger <borntraeger@linux•ibm.com>
To: Anthony Krowiak <akrowiak@linux•ibm.com>,
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>
Subject: Re: linux-next: manual merge of the kvms390 tree with the s390 tree
Date: Tue, 24 Jan 2023 12:19:23 +0100 [thread overview]
Message-ID: <0fae8ad5-8dcd-3864-a532-4760f3f2a95c@linux.ibm.com> (raw)
In-Reply-To: <c988b032-d076-bda6-ee38-3c83e9cad711@linux.ibm.com>
hAm 23.01.23 um 20:02 schrieb Anthony Krowiak:
>
> On 1/22/23 8:12 PM, Stephen Rothwell wrote:
>> 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.
>
>
> That's odd, the patch series posted to the kernel mailing lists did not have both of those patches. I think the problem may have occurred because there was an earlier version of the patch in question that was used to debug a problem in our CI. That patch should have been reverted prior to installing the latest version.
Yes, that patch was part of the kvms390 tree and it was old. I removed it. Sorry for the left-over
The one in the s390 tree is the correct one:
https://lore.kernel.org/all/20230118203111.529766-3-akrowiak@linux.ibm.com/
is now
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=for-next&id=0daf9878a7990058e74025493820bce0f67654c4
this should be ok now?
Christian
next prev parent reply other threads:[~2023-01-24 11:19 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
2023-01-23 19:02 ` Anthony Krowiak
2023-01-24 11:19 ` Christian Borntraeger [this message]
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=0fae8ad5-8dcd-3864-a532-4760f3f2a95c@linux.ibm.com \
--to=borntraeger@linux$(echo .)ibm.com \
--cc=akrowiak@linux$(echo .)ibm.com \
--cc=frankja@linux$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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