From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <paul@pwsan.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the risc-v tree
Date: Mon, 14 Dec 2020 19:37:47 +0200 [thread overview]
Message-ID: <20201214173747.GO4077@smile.fi.intel.com> (raw)
In-Reply-To: <20201214202107.66932c18@canb.auug.org.au>
On Mon, Dec 14, 2020 at 08:21:07PM +1100, Stephen Rothwell wrote:
> 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.
Looks good enough (*) to me, thanks!
*) I think we might group that new line with an existing one(s) of the same
level (GENERIC_LIB) but it doesn't really matter.
> --
> 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
--
With Best Regards,
Andy Shevchenko
next prev parent reply other threads:[~2020-12-14 18:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 9:21 linux-next: manual merge of the akpm-current tree with the risc-v tree Stephen Rothwell
2020-12-14 17:37 ` Andy Shevchenko [this message]
2020-12-15 0:55 ` Palmer Dabbelt
2020-12-17 1:25 ` Stephen Rothwell
2020-12-17 9:40 ` Andy Shevchenko
2020-12-17 10:05 ` Stephen Rothwell
2020-12-17 17:06 ` Palmer Dabbelt
-- strict thread matches above, loose matches on Subject: below --
2021-06-01 6:27 Stephen Rothwell
2021-03-12 6:37 Stephen Rothwell
2021-05-06 1:33 ` Stephen Rothwell
2020-11-27 7:34 Stephen Rothwell
2020-12-17 1:26 ` Stephen Rothwell
2020-12-17 2:18 ` Kefeng Wang
2020-10-06 10:39 Stephen Rothwell
2020-10-07 4:32 ` Palmer Dabbelt
2020-10-07 4:48 ` Atish Patra
2020-10-07 21:58 ` Atish Patra
2020-07-10 7:44 Stephen Rothwell
2020-04-28 6:55 Stephen Rothwell
2019-09-02 11:48 Stephen Rothwell
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=20201214173747.GO4077@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul@pwsan.com \
--cc=sfr@canb.auug.org.au \
/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