From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0872C4361B for ; Tue, 15 Dec 2020 00:56:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B3759206A5 for ; Tue, 15 Dec 2020 00:56:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729653AbgLOA4Z (ORCPT ); Mon, 14 Dec 2020 19:56:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728512AbgLOA4M (ORCPT ); Mon, 14 Dec 2020 19:56:12 -0500 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33C71C06179C for ; Mon, 14 Dec 2020 16:55:32 -0800 (PST) Received: by mail-pg1-x532.google.com with SMTP id c12so13593704pgm.4 for ; Mon, 14 Dec 2020 16:55:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=date:subject:in-reply-to:cc:from:to:message-id:mime-version :content-transfer-encoding; bh=8UGCbk740l8AwsQmKCSzWqwpxPJ2TRvHUyI785jzr+s=; b=C3Eu9v/JC+HEc++CyyC2LiTQeYcR3zbEurj+/YK5BAEMvh0BXC3mUkLvk2d+Fu2rhI 1qKOd8DanyFu1rDT6Wj2OLOqf20e5WrQPBldRgxAdJeHFcOrqPj9rOsQ9lN1mOgoh41a jKNuMp0PJdmltMyJj0YW35aguOXeaY0UaFl6noQLOeh1LsIy8kOG1nUQL1B6L104DTsJ N7VgZQ01Qa5GjPYs4hn6ToHtz482VKxhtTt+ECOfA2ZSs/hxBRviX+1iJaA1koViTUAM GvM5EpDxPo8LM5LVxJAKy/ibvhj29hwev4QiKdvN2LM/PIYcyBeeEp4y7KtWA6P+XH0i 6fWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:subject:in-reply-to:cc:from:to:message-id :mime-version:content-transfer-encoding; bh=8UGCbk740l8AwsQmKCSzWqwpxPJ2TRvHUyI785jzr+s=; b=onW1+asCtiBOwatYSJ9xbp1yeaUd7H4x6SYFByyQ9wL5AAzNj4wNkvTKEqHixvCQ9V T+y/eCP5UkZU5Dpo+H6Kjm8NKOqxRX96prrsiKcK5GooDccjyj0hbR+FeN9Gd6vO4qWm 3EkvDWysyREhVCB9fcPguVEuyMS//xFw6hjCrzM/XRecG/Hc8FNWeEquqEiADMWren2x FMdxWocC7B3cXTVL5nm/kdBQ36hrqc4mnjF0GiBHSTUiZHmvIlGgozCgXdJRhEwCIvKx 0Q+LS+ITrIdc5uMucPz/pj5a8f2g0iu+rrK1a9X8XKed18Pfmza5ycrx/ZrS+miDZzhV nOGw== X-Gm-Message-State: AOAM531WS1XKbIKDT+YQxg6uRyJ8FUsZDWnW7mtZm+Y49OgvyueQKgs/ GSlNZBUfX95E4M1thvbFT+unr12F304xwSwr X-Google-Smtp-Source: ABdhPJxTYioF4+57NaOOcmZIW9bmvWR6Lt30hsVq0Sotszns7R3IxlPnc3sv/UxSt3vyNPWyG2LvQQ== X-Received: by 2002:a65:5bcd:: with SMTP id o13mr26774344pgr.81.1607993731614; Mon, 14 Dec 2020 16:55:31 -0800 (PST) Received: from localhost (76-210-143-223.lightspeed.sntcca.sbcglobal.net. [76.210.143.223]) by smtp.gmail.com with ESMTPSA id l13sm14976045pgq.51.2020.12.14.16.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 16:55:30 -0800 (PST) Date: Mon, 14 Dec 2020 16:55:30 -0800 (PST) X-Google-Original-Date: Mon, 14 Dec 2020 16:55:25 PST (-0800) Subject: Re: linux-next: manual merge of the akpm-current tree with the risc-v tree In-Reply-To: <20201214173747.GO4077@smile.fi.intel.com> CC: Stephen Rothwell , akpm@linux-foundation.org, Paul Walmsley , linux-kernel@vger.kernel.org, linux-next@vger.kernel.org From: Palmer Dabbelt To: andriy.shevchenko@linux.intel.com Message-ID: Mime-Version: 1.0 (MHng) Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 14 Dec 2020 09:37:47 PST (-0800), andriy.shevchenko@linux.intel.com wrote: > 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. I went back and forth on that one: it's got the same Kconfig name, but it's not a libgcc function. Maybe we shouldn't have had the "_LIB" in there? I don't remember if that was meant to stand for libgcc or lib/... I'm happy to just re-spin my patch to avoid the conflict. It's near/at the top of my tree, so it's not a big deal, but I'm also just OK merging second and pointing out the conflict. Unless you care one way or the other I'll just do whatever ends up being easier for me :) >> -- >> 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