linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shuah Khan <skhan@linuxfoundation.org>
To: broonie@kernel.org, Matthew Wilcox <willy@infradead.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	linux-kselftest@vger.kernel.org,
	Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the xarray tree with the kselftest tree
Date: Tue, 14 Dec 2021 09:39:25 -0700	[thread overview]
Message-ID: <1dcd2d43-cf39-3b4c-49b5-138d94f34433@linuxfoundation.org> (raw)
In-Reply-To: <20211213222443.474487-1-broonie@kernel.org>

On 12/13/21 3:24 PM, broonie@kernel.org wrote:
> Hi all,
> 
> Today's linux-next merge of the xarray tree got a conflict in:
> 
>    tools/include/linux/kernel.h
> 
> between commits:
> 
>    d6e6a27d960f9 ("tools: Fix math.h breakage")
>    066b34aa5461f ("tools: fix ARRAY_SIZE defines in tools and selftests hdrs")
> 
> from the kselftest and origin trees and commit:
> 
>    f2aa11fd51440 ("tools: Fix math.h breakage")
> 
> from the xarray 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.
> 
> diff --cc tools/include/linux/kernel.h
> index 9701e8307db02,3e8df500cfbd4..0000000000000
> --- a/tools/include/linux/kernel.h
> +++ b/tools/include/linux/kernel.h
> 

Thank you. I will keep track of this when I send pull request.

thanks,
-- Shuah

  reply	other threads:[~2021-12-14 16:39 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-13 22:24 linux-next: manual merge of the xarray tree with the kselftest tree broonie
2021-12-14 16:39 ` Shuah Khan [this message]
2021-12-14 16:54   ` Matthew Wilcox
2021-12-14 17:06     ` Shuah Khan

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=1dcd2d43-cf39-3b4c-49b5-138d94f34433@linuxfoundation.org \
    --to=skhan@linuxfoundation.org \
    --cc=broonie@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=willy@infradead.org \
    /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).