All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shuah Khan <shuah@kernel.org>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Stephen Rothwell" <sfr@canb.auug.org.au>,
	"Radim Krčmář" <rkrcmar@redhat.com>, KVM <kvm@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Andrea Parri <andrea.parri@amarulasolutions.com>,
	Shuah Khan <shuah@kernel.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the kvm tree
Date: Thu, 18 Oct 2018 08:16:46 -0600	[thread overview]
Message-ID: <6b0dd0f6-ff79-97e8-9972-907cff0dcbcb@kernel.org> (raw)
In-Reply-To: <2e7090d2-5c80-7fcf-6e50-7155280b998a@redhat.com>

On 10/18/2018 04:51 AM, Paolo Bonzini wrote:
> On 18/10/2018 06:50, Stephen Rothwell wrote:
>> Hi Shuah,
>>
>> Today's linux-next merge of the kselftest tree got a conflict in:
>>
>>   tools/testing/selftests/kvm/dirty_log_test.c
>>
>> between commit:
>>
>>   fff8dcd7b4a2 ("kvm: selftests: port dirty_log_test to aarch64")
>>
>> from the kvm tree and commit:
>>
>>   cda94d9ffa0e ("selftests: kvm: Fix -Wformat warnings")
>>
>> from the kselftest 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.
>>
> 
> 
> Shuah, I think it's best if in the future the
> tools/testing/selftests/kvm/ changes go through my tree, unless they
> affect many selftests subdirectories.
> 

Yes. That makes sense. Looked like an harmless patch that might not have
any dependencies. Should have checked with you.

Thanks for taking care of the problem.

thanks,
-- Shuah


      parent reply	other threads:[~2018-10-18 14:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-18  4:50 linux-next: manual merge of the kselftest tree with the kvm tree Stephen Rothwell
2018-10-18 10:51 ` Paolo Bonzini
2018-10-18 11:50   ` Andrea Parri
2018-10-18 12:05     ` Paolo Bonzini
2018-10-18 14:16   ` Shuah Khan [this message]

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=6b0dd0f6-ff79-97e8-9972-907cff0dcbcb@kernel.org \
    --to=shuah@kernel.org \
    --cc=andrea.parri@amarulasolutions.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.