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=-4.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 183A3C43461 for ; Tue, 8 Sep 2020 06:20:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C82252166E for ; Tue, 8 Sep 2020 06:20:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599546055; bh=b4N0Wzo0LlxmMMNaMUj5p464U5T00RHGDqLtbBe11xc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=qpEvG58UGruIj9CAkthtlINyWf+ZrZRR17FO9Ku8rlPRZcUrdm/qwLIwmOtnbpSxw oDFkPFGJkXDoOO+Q9MoDuWSmF+OtrTEQaaoRGqlRds6xD5ilA/n1m0ZLXaLNTKNy8v c+yelAhzEPWBmnKcu91UfBnrg5vt1F7UDT4fThlQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729010AbgIHGUU (ORCPT ); Tue, 8 Sep 2020 02:20:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:53726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726787AbgIHGUT (ORCPT ); Tue, 8 Sep 2020 02:20:19 -0400 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1358D218AC; Tue, 8 Sep 2020 06:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599546019; bh=b4N0Wzo0LlxmMMNaMUj5p464U5T00RHGDqLtbBe11xc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=x+BES2N4uZlqJfb5/nwqjhUJICLuiQCKQLaY67m+Tz1tFLkZh9B4XO2eOxQOgEls/ G74xASvcaa+Hn2fVqe2VcjF9sOcLMuW9bwiIExEwWF605JE0tXJXTSNozHCxTEGta2 DI88WbufabDj0YxutyGxzFr7Qeg3SVu8GwxEWtGA= Received: by mail-ed1-f54.google.com with SMTP id ay8so14764189edb.8; Mon, 07 Sep 2020 23:20:19 -0700 (PDT) X-Gm-Message-State: AOAM530uTZvM3BjwuDvT6tLVGt0tdxTPYLsTu86zGi1TKmnHRdRJApB9 W90DvZJiRPomP+GzloXalyacWC9pgV/A538hnfg= X-Google-Smtp-Source: ABdhPJxm6MgtUFHojJp4O+2jexj7kbpsA8Qrd0PhJH8gKMswfOGXw5c/YTd1KwZLwV84tza8C5lzYwBWlIheSBozyVI= X-Received: by 2002:a50:ab1d:: with SMTP id s29mr26477632edc.246.1599546017743; Mon, 07 Sep 2020 23:20:17 -0700 (PDT) MIME-Version: 1.0 References: <20200908144622.09385c88@canb.auug.org.au> In-Reply-To: <20200908144622.09385c88@canb.auug.org.au> From: Krzysztof Kozlowski Date: Tue, 8 Sep 2020 08:20:06 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: linux-next: manual merge of the mmc tree with the samsung-krzk tree To: Stephen Rothwell Cc: Ulf Hansson , Arnd Bergmann , Linux Next Mailing List , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, 8 Sep 2020 at 06:46, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the mmc tree got a conflict in: > > drivers/mmc/host/Kconfig > > between commits: > > cb6c03019cdd ("ARM: exynos: stop selecting PLAT_SAMSUNG") > db8230d29c3a ("ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG") > > from the samsung-krzk tree and commit: > > 54d8454436a2 ("mmc: host: Enable compile testing of multiple drivers") > > from the mmc 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 drivers/mmc/host/Kconfig > index 0d7c61d8d1d9,dc646359b4ff..000000000000 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@@ -289,7 -301,8 +301,8 @@@ config MMC_SDHCI_TEGR > > config MMC_SDHCI_S3C > tristate "SDHCI support on Samsung S3C SoC" > - depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS) > + depends on MMC_SDHCI > - depends on PLAT_SAMSUNG || COMPILE_TEST > ++ depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST Thanks, this is the expected resolution. Best regards, Krzysztof