public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Shuah Khan <skhan@linuxfoundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
	Andrew Morton <akpm@linux-foundation•org>,
	Shuah Khan <shuah@kernel•org>
Cc: Joe Perches <joe@perches•com>, John Hubbard <jhubbard@nvidia•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Shuah Khan <skhan@linuxfoundation•org>
Subject: Re: linux-next: manual merge of the akpm tree with the kselftest-fixes tree
Date: Tue, 6 Oct 2020 12:55:30 -0600	[thread overview]
Message-ID: <ebb15a68-0bef-ecb7-c323-2358f72ee183@linuxfoundation.org> (raw)
In-Reply-To: <20201006220711.0ec49da3@canb.auug.org.au>

On 10/6/20 5:07 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm tree got a conflict in:
> 
>    tools/testing/selftests/vm/gup_test.c
> 
> between commit:
> 
>    aa803771a80a ("tools: Avoid comma separated statements")
> 
> from the kselftest-fixes tree and commit:
> 
>    5c64830675a6 ("mm/gup_benchmark: rename to mm/gup_test")
> 
> from the akpm 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.
> 

Hi Stephen,

Thanks for fixing it. I will mention it in my pull request to Linus

thanks,
-- Shuah

     prev parent reply	other threads:[~2020-10-06 18:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-06 11:07 linux-next: manual merge of the akpm tree with the kselftest-fixes tree Stephen Rothwell
2020-10-06 18:55 ` 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=ebb15a68-0bef-ecb7-c323-2358f72ee183@linuxfoundation.org \
    --to=skhan@linuxfoundation$(echo .)org \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=jhubbard@nvidia$(echo .)com \
    --cc=joe@perches$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=shuah@kernel$(echo .)org \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox