From patchwork Mon Jul 25 08:32:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12927886 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 D79F8C43334 for ; Mon, 25 Jul 2022 08:34:19 +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: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=mG9Zkd82FGXSINJrP+3wo1r4JVwFA7+j9phLPhNkGnQ=; b=3iE rhEJvklryMEnxRCDMQkJzlw3QfpSIBk+VbCaaxGoe3UqnQPgblNZ1GXcQ5/VYugp9gf7n2U0i8p6f JUnMTFv/j0qgTlSP07CYRjT6drxVv0eD4rPaAhPgwrnEZN105oPqRBiF6qxE4bejlHpJEutCTEq1z y7Lztga0CQZFVO95dNnAwW15K91tscQ8NzE9TwYWnJIB3mn4sehHCJ7iz8aLj3bIAcBon8Qwaan60 7LEvPD3dk3EeOTa5sT75YDUw59xLbopq7zK8hWMIYQ4ivUv7r5Kjk1L0fSxj4832mcN78ifus4OUK JFmbmsmlK3PR8HLswsyL6DLAuLH/9Og==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFtWc-006xbs-41; Mon, 25 Jul 2022 08:33:14 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oFtWY-006xQz-No for linux-arm-kernel@lists.infradead.org; Mon, 25 Jul 2022 08:33:12 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4LrtbG71qWz4x1b; Mon, 25 Jul 2022 18:32:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1658737980; bh=P9lT9eCsmo9nwgTTK4ek/ReishLdjhBIXxrsysClNMc=; h=Date:From:To:Cc:Subject:From; b=udwEHMMI2jTV9e8MZWkaXVQlYb8gipVKuJBLBLyOJaOCYTX2d+ygZvl+3rfeRcbh3 UyqhbUHmQZ6kwsy5sYwFnosdEtnLWT3IF2qNbRwoKf45gWb4LVlGGZIq4mFwattGYR pbHehnvoxu46FspLhuWYj5wFiyrRdDmMoyuVMpyt2DUs+gf9lp3p+M40rjNSWahBMX hSDOpSRxT3jwc3EOk0nAx0O6Vr8xXs3c0Im2gjtTMndnjI48F/+9BCIgjbXiHOqJE3 BjHklDwBmOrnWUK/y8gqe7fVTEzzTq5/efMDKI2SVOaQ03xE2t98xAe5qLLP5Z+ncP D938AvVjtnnDQ== Date: Mon, 25 Jul 2022 18:32:57 +1000 From: Stephen Rothwell To: Ard Biesheuvel , Olof Johansson , Arnd Bergmann Cc: ARM , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the efi tree with the arm-soc tree Message-ID: <20220725183257.670f4cd0@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220725_013310_957633_6F43A227 X-CRM114-Status: GOOD ( 14.93 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the efi tree got a conflict in: arch/arm/configs/milbeaut_m10v_defconfig between commit: 2002f3968714 ("ARM: refresh defconfig files") from the arm-soc tree and commit: 0f5b2c69a4cb ("efi: vars: Remove deprecated 'efivars' sysfs interface") from the efi 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. diff --cc arch/arm/configs/milbeaut_m10v_defconfig index 37739b61b0c3,9b4789af0201..000000000000 --- a/arch/arm/configs/milbeaut_m10v_defconfig