* linux-next: manual merge of the bitmap tree with the mm tree
@ 2024-05-03 5:52 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-05-03 5:52 UTC (permalink / raw)
To: Yury Norov, Andrew Morton
Cc: Kuan-Wei Chiu, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
include/linux/bitops.h
between commit:
120c5991cbae ("bitops: optimize fns() for improved performance")
from the mm-nonmm-unstable branch of the mm tree and commit:
1b6ef2812522 ("bitops: Optimize fns() for improved performance")
from the bitmap tree.
I fixed it up (I just used the latter as it had a more recent date) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the bitmap tree with the mm tree
@ 2024-08-05 3:39 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-08-05 3:39 UTC (permalink / raw)
To: Yury Norov, Andrew Morton
Cc: Anshuman Khandual, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 764 bytes --]
Hi all,
Today's linux-next merge of the bitmap tree got a conflict in:
lib/test_bits.c
between commit:
ec8f4b0906bb ("lib/test_bits.c: add tests for GENMASK_U128()")
from the mm-nonmm-unstable branch of the mm tree and commit:
358e4153fa62 ("lib/test_bits.c: Add tests for GENMASK_U128()")
from the bitmap tree.
I fixed it up (I just used the latter) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-05 3:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-05 3:39 linux-next: manual merge of the bitmap tree with the mm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-05-03 5:52 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox