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 9BDEDC433EF for ; Wed, 13 Jul 2022 23:27:55 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fsqoTGv+MpcrSoiikTH2F5zabDffItJa9ivQJ0/KL/M=; b=nHnTNzo/E5eg33 wxwc8aRa+X4dvQ0O+adqABVWplCCT1v60zMRnJpxWuZdwBVZuX2l6oRP5TuudDSKq2z05uyUPybA6 Wqk+/pOMqC/9XL1nzDBWl6EXgS3efWv+seJqQ4xLuS/DglwMsgt0NWbIDv8KNJF1fr7K9vHavUEBB eV04q1/xVWHNVIJg1gTkXIwbCiSI7e6C+VQ4YTAakJ7RHKN61l8SreQX4GUj4oY3GmPWDNKbYY10M HVqXCLk8v9+7hoq73KClv72XRQivsZ/96UVtRvJ+MEMvvkMHaTimLFJ5b62djgkbqL9AbfoImHfbx iEhF5npzDpY0uDs+XVSQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBlkm-009AFX-N4; Wed, 13 Jul 2022 23:26:48 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBlkj-009ADI-Ma for linux-arm-kernel@lists.infradead.org; Wed, 13 Jul 2022 23:26:46 +0000 Received: by mail-pj1-x1030.google.com with SMTP id cp18-20020a17090afb9200b001ef79e8484aso4735330pjb.1 for ; Wed, 13 Jul 2022 16:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=PnsH/rzjlHhH91hBVi1N1J8lv6U1Lk9dQ+G06Dj91pc=; b=k8rO8PGtaYTYg3cEA+f5u/w7Rav+orTpIczJ1DQsYtLTfS4OF5+3ByCAP/PVZ/MzpR y0ETgXeXrpQVG/0MW+grpKDjpImI23flwTQb066kzUaYsZrYfzhF2SSK8x3DtrTTNY0t UXjd28kalMawS+FZ7GgTg83PNL4LbHBkv8mtaUWQflA5wPGEgFWMpyaaDuGbEsWZ7dZn lYirkc9W1pB6PYbBHK3rdUBBR8dQJl1VgV2br3hrHUBk4JgQ1Kzy0i55AT7eSgl82m+W wHDiXK9C/9VZvt0ctyWRB9rkWwbGXYpoBgBZOyX4sWFGLxIsNTF1WLx/1fzHnorav8jn ynMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=PnsH/rzjlHhH91hBVi1N1J8lv6U1Lk9dQ+G06Dj91pc=; b=5J2jocy1lwC8ap+fyWv1zqG0J3oBlNVKq9/L/78j/go4CxqTWgdbKzNfNolvKx8073 BRWOkqcjbC5zUsDx9l37G7oGI7y1PjITjk/IP0q62i22KiDEsm7EahqlveenbDGqf0x9 0kNvaIgPieYgqNLsh9qlA7z1SERJg4YENmR8Iz4mFwLD18BnTloqTedcTlADTzTnNmo+ k9qjn2ygLZmSWyxSEqYSTSo+u6G18t6hBWJtG6f9GJVZLmQK2ro9L/8GvSo1hdT0vL+K bOOzhl5IsGErxTa1aWHNejY1Yu6Pd1O7BAY6803NA1elWuCJCDpJzbBRtuBDFwbt1lXW a/bw== X-Gm-Message-State: AJIora9jFHyyi3f92odbsew7la1YzH7LKJexJQReN9e4KHhtNcD9vjoX fOcN1/H+eqwzedFER2tBPGc= X-Google-Smtp-Source: AGRyM1tFZ4adlJu3CfLsP7JosSH3B5ELiXwpY8eowsQR36GEWeBo6GYD8IGt8yckPWzB9t8GrlWb6A== X-Received: by 2002:a17:903:2308:b0:16c:47a6:c026 with SMTP id d8-20020a170903230800b0016c47a6c026mr5439247plh.160.1657754803904; Wed, 13 Jul 2022 16:26:43 -0700 (PDT) Received: from [10.67.48.245] ([192.19.223.252]) by smtp.googlemail.com with ESMTPSA id 31-20020a63165f000000b00416073ced8csm5894141pgw.73.2022.07.13.16.26.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Jul 2022 16:26:43 -0700 (PDT) Message-ID: <8a37363d-f4d9-669c-9cc6-3e76b9417352@gmail.com> Date: Wed, 13 Jul 2022 16:26:33 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: linux-next: manual merge of the broadcom tree with the spdx tree Content-Language: en-US To: Stephen Rothwell , Greg KH , Olof Johansson , Arnd Bergmann Cc: Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Gleixner , William Zhang , ARM References: <20220711095520.4fad4c97@canb.auug.org.au> <20220714091321.4ecfe830@canb.auug.org.au> From: Florian Fainelli In-Reply-To: <20220714091321.4ecfe830@canb.auug.org.au> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220713_162645_784885_6199BF47 X-CRM114-Status: GOOD ( 21.81 ) 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 7/13/22 16:13, Stephen Rothwell wrote: > Hi all, > > On Mon, 11 Jul 2022 09:55:20 +1000 Stephen Rothwell wrote: >> >> Today's linux-next merge of the broadcom tree got a conflict in: >> >> arch/arm/mach-bcm/bcm63xx.c >> >> between commit: >> >> 52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX - gpl-2.0_30.RULE (part 1)") >> >> from the spdx tree and commit: >> >> 889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA") >> >> from the broadcom tree. >> >> I fixed it up (I just 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. > > This is now a conflict between the arm-soc tree and the spdx tree. There was a link in the cover letter that I sent to the arm-soc maintainers referencing your first email. Not sure what else we could have done to prevent that conflict. -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel