From: Matthew Wilcox <willy@infradead.org>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: broonie@kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
linux-kselftest@vger.kernel.org
Subject: Re: linux-next: manual merge of the xarray tree with the kselftest tree
Date: Tue, 14 Dec 2021 16:54:04 +0000 [thread overview]
Message-ID: <YbjMLHCRXNMwp4nU@casper.infradead.org> (raw)
In-Reply-To: <1dcd2d43-cf39-3b4c-49b5-138d94f34433@linuxfoundation.org>
On Tue, Dec 14, 2021 at 09:39:25AM -0700, Shuah Khan wrote:
> 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've dropped that commit from the XArray tree since d6e6a27d960f9
was essentially f2aa11fd51440 applied to Linus' tree. The only change
left in the XArray tree today is a documentation update.
> Thank you. I will keep track of this when I send pull request.
As long as what you have merges cleanly against Linus' tree (and I see
the "conflict" -- __round_mask() is defined adjacent to ARRAY_SIZE()),
then it'll be fine. You might want to rebase to a more recent Linus
tree to get rid of the conflict.
next prev parent reply other threads:[~2021-12-14 16:54 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
2021-12-14 16:54 ` Matthew Wilcox [this message]
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=YbjMLHCRXNMwp4nU@casper.infradead.org \
--to=willy@infradead.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=skhan@linuxfoundation.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).