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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAFD2C54EBC for ; Tue, 10 Jan 2023 17:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AK+mG0DABmmWxqgpaSskoVUtSr3Oz7sxH7xivJMNAkE=; b=qhe7UQ0bWdaiqF eOZbRHZKtmVlCg1b51GjdEttec0aKkK5YJd4CX1kzpYUn07P8nOGnME/sHOLO0deWEwBmQF5t+Tjg qW3dh3ElUEBM1oFiO4C0T5ZQtqk7tYil1bb/icE7bGqYejejcjLFtEaDfEFCakNIRKewAy0LANlHN rmCqoKHs8OPMzxM3ehr0gOr+1xSID1blSuuvHxrDJaa1ki5cCxyfxU6gqvagSw8FnaXOcVlRHZpQF DuQq1AfMQSrnI2ISuAXJ7rBHylLW9vaciwlGFoDHdsLPwiaRYLISVBQZFH548TTe12jS3qKgX6lPb GdRqvMpknB29bkxkKkzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFIHI-007wzY-Ct; Tue, 10 Jan 2023 17:19:12 +0000 Received: from mail-yw1-x1131.google.com ([2607:f8b0:4864:20::1131]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFIHF-007wyU-2s for linux-arm-kernel@lists.infradead.org; Tue, 10 Jan 2023 17:19:10 +0000 Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-4b718cab0e4so162819657b3.9 for ; Tue, 10 Jan 2023 09:19:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=+pIR1imfCvqODCp5Ce7sb3iOjvWIQIzon43M7wnw22o=; b=MRbadR54PUQDdCIai9nJWMaeKj5ncad8pWKlcT7e04GbC6M3gwJlojUB0qAc+uLpvO IS08JsnGRYIs97dXEH7k2Q27+tW9YdC8Dh/XNqNj09mf5jo/rR5oxo2scQafRDgKp30/ S/siWqkNp+nC6Kxf9I6OGhIOiG5UVIyQmaF/OX/YvyGoPhwGFcFlbUoAI7ZekIEqJmLw SXlKkiXfX83tS/To0WX2f3RELMAm+6+991rB3ALW0DoT5bK+4hVVBVB18B72jKkaudnz pGOSCLklBu09OTvj3xkSFairxub63+6L262bEdHQzwtpsg/U6Kl5eF2kDQi9nQNS1i8f G2Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+pIR1imfCvqODCp5Ce7sb3iOjvWIQIzon43M7wnw22o=; b=7SXcGz6NzPsjDBD94tRw6yFwHh6PViibBf26AhWAahi40Vi9EFt32TTaqhPz1JIVVy 0HJy3Nvr8rDV2ex/kLQ6BeSOC6bSJnDuaajlV7DayrvyENDhttOrt5pfEWQjWmW2f+Kn 0JGrj8o5YNCZmvxGEvJE1jGVPuCw8PPTZZTiJY3kIRHQMjtnC2C9KqE/urv5YFPrYpL/ QedrBUMIh/Ok2lCe0EVEcBsLNuQ5VjLnX8m3M8SUkEdya/Wjx6884BUtrbhhV2R4mOqv sFsvE5aMKjZUH4E8j+g9DTMjhsUK96nRyoqIv3aEVAthOM+nZMruaZh933pcxh38ClAk DDwQ== X-Gm-Message-State: AFqh2kpfS6iGbaGFsXydNy5grIpmUj8DLe7Se+KxZP/5qoW4HKCgJOX/ iAj3bNDfWfaucmYLMF92Peo8iWtcV25+LnCW0zyXHzlj4VLETg== X-Google-Smtp-Source: AMrXdXsqgQXm7Kgt01NaJGDiQufRhFUocj8hmyB9Qed/vzpPjWBQitOJZD0yCuctSmrr6bZGwmuCrBiI6yHbWm7eyLk= X-Received: by 2002:a81:4a56:0:b0:4aa:36f9:a625 with SMTP id x83-20020a814a56000000b004aa36f9a625mr3236828ywa.269.1673371146769; Tue, 10 Jan 2023 09:19:06 -0800 (PST) MIME-Version: 1.0 References: <20230110094246.1497d12e@canb.auug.org.au> In-Reply-To: <20230110094246.1497d12e@canb.auug.org.au> From: Bartosz Golaszewski Date: Tue, 10 Jan 2023 18:18:55 +0100 Message-ID: Subject: Re: linux-next: manual merge of the davinci tree with the arm-soc tree To: Stephen Rothwell Cc: Bartosz Golaszewski , Olof Johansson , Arnd Bergmann , ARM , Jilin Yuan , Linux Kernel Mailing List , Linux Next Mailing List X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230110_091909_147045_C7432A47 X-CRM114-Status: GOOD ( 18.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 On Mon, 9 Jan 2023 at 23:42, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the davinci tree got a conflict in: > > arch/arm/mach-davinci/board-dm365-evm.c > > between commit: > > fef6ca600ba7 ("ARM: davinci: remove unused board support") > > from the arm-soc tree and commit: > > 84bde55c050b ("ARM: davinci: fix repeated words in comments") > > from the davinci tree. > > I fixed it up (I removed the file) 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 I backed out this patch, thanks! Bart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel