linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Niklas Schnelle <schnelle@linux.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Alex Williamson <alex.williamson@redhat.com>,
	Heiko Carstens <hca@linux.ibm.com>,
	Vasily Gorbik <gor@linux.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Matthew Rosato <mjrosato@linux.ibm.com>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the vfio tree with the s390 tree
Date: Thu, 24 Sep 2020 10:25:16 +0200	[thread overview]
Message-ID: <b9f4f5d2-ea40-aa58-3c4d-bebfa828ce72@linux.ibm.com> (raw)
In-Reply-To: <20200924142651.28382ed7@canb.auug.org.au>

Hi Stephen,

first thanks for the manual fix it's exactly the same resolution I would
have used. Sorry this conflict ended up on your desk without warning,
I had made Vasily and Heiko aware of this as an upcoming conflict but failed
to alert Alex who finally ended up carrying the change so I this is my fault.

Best regards,
Niklas Schnelle

On 9/24/20 6:26 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vfio tree got a conflict in:
> 
>   arch/s390/pci/pci_bus.c
> 
> between commit:
> 
>   abb95b7550f8 ("s390/pci: consolidate SR-IOV specific code")
> 
> from the s390 tree and commit:
> 
>   08b6e22b850c ("s390/pci: Mark all VFs as not implementing PCI_COMMAND_MEMORY")
> 
> from the vfio 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.
> 

  reply	other threads:[~2020-09-24  8:25 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24  4:26 linux-next: manual merge of the vfio tree with the s390 tree Stephen Rothwell
2020-09-24  8:25 ` Niklas Schnelle [this message]
2022-07-25  6:33 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=b9f4f5d2-ea40-aa58-3c4d-bebfa828ce72@linux.ibm.com \
    --to=schnelle@linux.ibm.com \
    --cc=alex.williamson@redhat.com \
    --cc=borntraeger@de.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=mjrosato@linux.ibm.com \
    --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).