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=-7.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 06612C433DB for ; Mon, 29 Mar 2021 11:33:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0BF76195C for ; Mon, 29 Mar 2021 11:33:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230237AbhC2Lc5 (ORCPT ); Mon, 29 Mar 2021 07:32:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231520AbhC2LcW (ORCPT ); Mon, 29 Mar 2021 07:32:22 -0400 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 888ECC061574; Mon, 29 Mar 2021 04:32:22 -0700 (PDT) Received: by mail-pl1-x632.google.com with SMTP id d8so4250978plh.11; Mon, 29 Mar 2021 04:32:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TwCNUI2IXe0SVeP2zDv3NgU8ThjpzCczkm9IKaW8+e8=; b=IXWW2R9psjyfQ6Hz2lQvPrDrJrz+3VXwIqSnc4PtQ2IXYha/GI7nchwVVoH6WVcQd+ oajcG6o9tU2oAqMpL79GOmq3z6rfDlTTYaf3Pw9+SLwfm/5k3ezBrpgerx5q0hruTbWZ YHBoKoe/AI/17stjEY7A+EzjT+5fSX8mgV57LIH17I85mFbRVY1o1KcwWtSZXUnuz4Ux rjRhvNh3pJUhUiQIKimLi22s8jVZ8VZlURb69uz+icJ6gvJSbFybIydYhLgCMnOMhVvF tqHAJEu6CeZha3tFo7V2E0RxIWllpD6bDcs5+BUVH5BJplcdg8swFhlMXMaDxntIVfag XQaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TwCNUI2IXe0SVeP2zDv3NgU8ThjpzCczkm9IKaW8+e8=; b=asKZ7odExHsxnioBC+f5wbFiLBj1uaBs8BTg2K070erdTL5KVF44x4Yx+AorAe87aY s3llVTstgOIxF3nmSiYGDef4Q5u+PYf4LReYGBGTGYrxoUAQ1evdIfNkQcZyqYi70pjp QLdwcHudfVe9tupe3I2pQud9+TUdPhmghYCGGbW/21Rj0CwTvqx88umWD2BiYWw0EQqo lQWwGZM4ZC7sIFpwKp9+E0+lb3y1asSZu/FsMfDaAnZVsiNF5NatP0IfUpGctFvTPdiA G7zyAFwFpTNCVRPdrE6ghbO3XsJLP83k1bvLS8hvlImsBVpUFxCCDyKJqXITSDpbF6vD VgUQ== X-Gm-Message-State: AOAM531ywTRwPpVZe63YHjTxyv3/KCbXFF1wBZTMOOJU2rv4cHbSyp8l ALnnDq9Z0f9IIzCfJLVZd4nbKEyEZXWWc3xbCJkvLNVzagekOg== X-Google-Smtp-Source: ABdhPJzunwKWuEyrRiU1hdw/Vg8CKcbpCoNEivUT68tHY55yxPhzuKcqXufpft0DDp/CwLsJb5nwG8RGYjLB29cu+7Q= X-Received: by 2002:a17:90a:b311:: with SMTP id d17mr26657786pjr.228.1617017542094; Mon, 29 Mar 2021 04:32:22 -0700 (PDT) MIME-Version: 1.0 References: <20210329194719.6d37fe53@canb.auug.org.au> In-Reply-To: <20210329194719.6d37fe53@canb.auug.org.au> From: Andy Shevchenko Date: Mon, 29 Mar 2021 14:32:06 +0300 Message-ID: Subject: Re: linux-next: manual merge of the akpm-current tree with the gpio-brgl tree To: Stephen Rothwell Cc: Andrew Morton , Bartosz Golaszewski , Andy Shevchenko , Bartosz Golaszewski , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Mon, Mar 29, 2021 at 12:07 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/bitmap.h > > between commit: > > f7d5fbad07a4 ("lib: bitmap: order includes alphabetically") > > from the gpio-brgl tree and commit: > > f3b90426c407 ("kernel.h: drop inclusion in bitmap.h") > > 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 to me, thanks, Stephen! > diff --cc include/linux/bitmap.h > index 73d039476fa4,6cbcd9d9edd2..000000000000 > --- a/include/linux/bitmap.h > +++ b/include/linux/bitmap.h > @@@ -4,12 -4,11 +4,13 @@@ > > #ifndef __ASSEMBLY__ > > + #include > -#include > #include > - #include > + #include > #include > +#include > + > +struct device; > > /* > * bitmaps provide bit arrays that consume one or more unsigned -- With Best Regards, Andy Shevchenko