linux-next: manual merge of the akpm-current tree with the risc-v tree

Stephen Rothwell
2020-12-14T09:30:24Z

[-- Attachment #1: Type: text/plain, Size: 1687 bytes --]

Hi all,

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

lib/Makefile

between commit:

527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")

from the risc-v tree and commits:

8250e121c672 ("lib/list_kunit: follow new file name convention for KUnit tests")
17bf776cf09a ("lib/linear_ranges_kunit: follow new file name convention for KUnit tests")
23fa4e39ee62 ("lib/bits_kunit: follow new file name convention for KUnit tests")
1987f84faec6 ("lib/cmdline_kunit: add a new test suite for cmdline API")

from the akpm-current 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.

--
Cheers,
Stephen Rothwell

diff --cc lib/Makefile
index bcedd691ef63,dc623561ef9d..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -350,8 -350,7 +350,9 @@@ obj-$(CONFIG_PLDMFW) += pldmfw

# KUnit tests
obj-$(CONFIG_BITFIELD_KUNIT) += bitfield_kunit.o
- obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o
- obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o
- obj-$(CONFIG_BITS_TEST) += test_bits.o
+ obj-$(CONFIG_BITS_TEST) += bits_kunit.o
+ obj-$(CONFIG_CMDLINE_KUNIT_TEST) += cmdline_kunit.o
+ obj-$(CONFIG_LINEAR_RANGES_TEST) += linear_ranges_kunit.o
+ obj-$(CONFIG_LIST_KUNIT_TEST) += list_kunit.o
+
+obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o