Skip to contentSkip to conversation

linux-next: manual merge of the xarray tree with the kselftest tree

PATCH [email protected] 3 participants 4 messages Dec 13, 2021 – Dec 14, 2021

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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.

tools/include/linux/kernel.h +0 -0
diff --cc tools/include/linux/kernel.h
index 9701e8307db02,3e8df500cfbd4..0000000000000
maintainer
#1 lore raw

tools/include/linux/kernel.h

Quoted 29 lines · On 12/13/21 3:24 PM, [email protected] 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.

tools/include/linux/kernel.h +0 -0
diff --cc tools/include/linux/kernel.h
index 9701e8307db02,3e8df500cfbd4..0000000000000

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

thanks,
-- Shuah

#2 lore raw
Quoted 9 lines · Shuah Khan
Quoted 8 lines · On 12/13/21 3:24 PM, [email protected] wrote:

Hi all,

Today's linux-next merge of the xarray tree got a conflict in:

tools/include/linux/kernel.h

between commits:

Quoted 8 lines
Quoted 8 lines

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.

Quoted 1 line

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.

maintainer
#3 lore raw
Quoted 23 lines · Matthew Wilcox
Quoted 9 lines · Shuah Khan
Quoted 8 lines · On 12/13/21 3:24 PM, [email protected] wrote:

Hi all,

Today's linux-next merge of the xarray tree got a conflict in:

tools/include/linux/kernel.h

between commits:

Quoted 8 lines
Quoted 8 lines

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.

Quoted 7 lines
Quoted 1 line

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.

When I applied on rc4 base, I didn't see any problems. This is a minor one - I can mention this when I send my pull request. Shouldn't be a problem.

thanks,
-- Shuah