From patchwork Tue Jul 21 04:28:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11674947 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC364138A for ; Tue, 21 Jul 2020 04:28:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93AF3208E4 for ; Tue, 21 Jul 2020 04:28:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="kWAnq1pz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726587AbgGUE2z (ORCPT ); Tue, 21 Jul 2020 00:28:55 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:38733 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725294AbgGUE2z (ORCPT ); Tue, 21 Jul 2020 00:28:55 -0400 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 4B9lwJ1slYz9sRR; Tue, 21 Jul 2020 14:28:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595305730; bh=91WFzPEefhKLKMfP1BJFRHM/dzkdTxB3Wion0WWI7Ro=; h=Date:From:To:Cc:Subject:From; b=kWAnq1pz86jpMhs5cbSPQrfSBsvbZ9gtu241uhTRsl+4ayw2wsgTFI1aBYncSXIbJ Vzl+ylJVsXIc4ABwpenqnTS48xV3FTiyUEURRsuRaz1A5jsjUSRbVROCnYlIoBL5/E EJ7gshfxN4B0TtZKMGV8n6Q1XfEkhlXY7QFNU86tmWtuunXJlCPr3XFOazttW0TBll rYC2OqlEkucF9SpVbSwAo8hRSSsBR7Czdu4PfewIzX0Dbe2pnDxOcyksb4QqgYzHiU fMNRl9B10MaMmJNlkFID2mn4/umimah8YsGU0o5/xcUVEnYJN4vCmyBNXSybUIPv8o VlWlludng4YGA== Date: Tue, 21 Jul 2020 14:28:45 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Herbert Xu , Linux Crypto List Cc: Linux Next Mailing List , Linux Kernel Mailing List , "Chang S. Bae" , Sasha Levin , Uros Bizjak Subject: linux-next: manual merge of the tip tree with the crypto tree Message-ID: <20200721142845.76ebea00@canb.auug.org.au> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/include/asm/inst.h between commit: d7866e503bdc ("crypto: x86 - Remove include/asm/inst.h") (also "crypto: x86 - Put back integer parts of include/asm/inst.h" which I have added to the crypto tree merge today) from the crypto tree and commit: eaad981291ee ("x86/entry/64: Introduce the FIND_PERCPU_BASE macro") from the tip 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/x86/include/asm/inst.h index 438ccd4f3cc4,d063841a17e3..000000000000 --- a/arch/x86/include/asm/inst.h