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=-1.6 required=3.0 tests=BAYES_00,DATE_IN_PAST_96_XX, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 32BCAC4363C for ; Sun, 4 Oct 2020 05:47:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B6A9206DD for ; Sun, 4 Oct 2020 05:47:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T/wgeoB/"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lixom-net.20150623.gappssmtp.com header.i=@lixom-net.20150623.gappssmtp.com header.b="o1B64Sz5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B6A9206DD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lixom.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qnPV7fyNJLMjbMspOjBcs2Me4/D+iv2nzfHQeCqAJQg=; b=T/wgeoB/KT91LurehgsQ5deBQ 1aeWMb1RaAUtGtEvYVu/gaDPXxtQd5zABbgVpyLPjbfZlUPOasuGDlj6Xo7GygpG8jFRDiat1aXor oE8xaQuL9tG5XdGU7HQfX3UjOkVb/9DR7Vo8ZgV5kGpHHuCc14zhKNy1xAG6lP60AeZw+XrXVZP5k UP3FpwIsRwAC5Kkt3EpWDIy+yj6WiF2SZGN1UmyGn/iQnT97dtgVZdaBjX4EnZowiw+z19X7Hz0st h5FtaYdj0p1xS7yHI2bFXA7i3EGlhrqa7Zwf0Uqz5iA6H3mL34i8VZWWWNgTheo7wa0YZbNJyY0tn SGF7W9Drw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwq3-0002me-NH; Sun, 04 Oct 2020 05:45:39 +0000 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwq0-0002m7-EW for linux-arm-kernel@lists.infradead.org; Sun, 04 Oct 2020 05:45:37 +0000 Received: by mail-ed1-x543.google.com with SMTP id dn5so6049949edb.10 for ; Sat, 03 Oct 2020 22:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lixom-net.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=6apILh/pOBmMJaPWqV+iIu8fFhBDqWAm6/FGBYx5eqA=; b=o1B64Sz5ZHFWERP/mq911Y4fSS4n2fyjhUtxwee9c5J/yiJ4ynyKHSL0CRxxnfUest n3sFQtymgXePC/V3j/DskZ725ur7LFjHihkDAs35AOXQprHRx8ZLoxAMlZxteGIjGCF8 9H/HxFxWFYDuT13gIBBV+l+HslDIdN3Scwa/4PHZmhZ6dhoOoMZyUp/jQj5LZ52KslAw X3HASNGQOkAq2BqBxDtBgwu4VRdVG4nydnEuUsKu1+YhQSniN+b5jePtJ/n2QwW2Bh3z u2fp4L5zp/47y/Iw9afSwP9alSArrbUDg6sSAvtHyOlvP4chmx/90BsXvXcooDJUuxI1 jrNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=6apILh/pOBmMJaPWqV+iIu8fFhBDqWAm6/FGBYx5eqA=; b=lnokY1poZcOFY+Ni3h1WRvPtjbDL5joxB1YgAbuIsnYHi6JcJzQam+rrcLd9pThfGs CFjnxa+6Ik4gkUcrwkbeEkWZqzi0AZlvm4Y1YkS6CCa8GGFzksrBG1EMzxfCTC4bm4ac oyWmSR4t66tlAyaKiwnMZbfjhRn/8moI1x7WCAdpSHsf5StRByIF5ogCJ19ts4cwcBUL iu7nsBwHmAInnaDEbfm8TIPNj6hdJ4AwTDEDps9dsWEo6dC16qYKn4ijovrPkebvYlAt FAkgWsyh7IrumvAyo61aLzo2Xd9QXlVGTwC72MYn+PJ8aoTm8gM/sy8vmn4/b19gEZed QTbw== X-Gm-Message-State: AOAM533dZIYHyde9mM5ZtUmskggnZ0tRg6HnF5Re6VQPFa5zLUcHEwPR lg05/y7KuYt78HFIlQL87A+1WOIBkgfoc+h5 X-Google-Smtp-Source: ABdhPJyOe1QQXBpLdw5uNxP+eiD7p47Cr/n0DtPXX7KSdg7+Ulmgo5tIiP8wiubrO4P3eYbzBvkicg== X-Received: by 2002:ac2:5291:: with SMTP id q17mr2583609lfm.3.1601753360279; Sat, 03 Oct 2020 12:29:20 -0700 (PDT) Received: from localhost (h85-30-9-151.cust.a3fiber.se. [85.30.9.151]) by smtp.gmail.com with ESMTPSA id l188sm1836722lfd.127.2020.10.03.12.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 12:29:18 -0700 (PDT) Date: Sat, 26 Sep 2020 12:50:26 -0700 From: Olof Johansson To: Krzysztof Kozlowski Subject: Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10 Message-ID: <20200926195026.GA2230@lx2k> References: <20200920160705.9651-1-krzk@kernel.org> <20200920160705.9651-5-krzk@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200920160705.9651-5-krzk@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201004_014536_521313_0B5550A2 X-CRM114-Status: GOOD ( 16.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , List-Id: Cc: linux-samsung-soc@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org, soc@kernel.org, arm@kernel.org, Kukjin Kim , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Sun, Sep 20, 2020 at 06:07:04PM +0200, Krzysztof Kozlowski wrote: > Hi, > > This will conflict around renamed/moved files: > > 1. arch/arm/mach-s3c/s3c24xx.c: > Merge both changes to new location, so: > ======= > +#include "s3c24xx.h" > +#include "fb-core-s3c24xx.h" > +#include "nand-core-s3c24xx.h" > +#include "spi-core-s3c24xx.h" > > - static struct map_desc s3c2416_iodesc[] __initdata = { > + static struct map_desc s3c2416_iodesc[] __initdata __maybe_unused = { > ======= > > 2. drivers/soc/samsung/Kconfig > Add DEBUG_LL && MMU to SAMSUNG_PM_DEBUG section, so: > > ======= > config EXYNOS_PM_DOMAINS > bool "Exynos PM domains" if COMPILE_TEST > - depends on PM_GENERIC_DOMAINS || COMPILE_TEST > + depends on (ARCH_EXYNOS && PM_GENERIC_DOMAINS) || COMPILE_TEST > + > +config SAMSUNG_PM_DEBUG > + bool "Samsung PM Suspend debug" > + depends on PM && DEBUG_KERNEL > + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 > + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART > ++ depends on DEBUG_LL && MMU > + help > + Say Y here if you want verbose debugging from the PM Suspend and > + Resume code. See > + for more information. > + > ======= I don't mind doing this conflict resolution, and will merge it now, but next time you can just base this branch on the cleanup branch. -Olof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel