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=-4.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 4E598C433DF for ; Mon, 20 Jul 2020 04:03:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2614A2080D for ; Mon, 20 Jul 2020 04:03:58 +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="CTBxu60h" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726032AbgGTED4 (ORCPT ); Mon, 20 Jul 2020 00:03:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725263AbgGTED4 (ORCPT ); Mon, 20 Jul 2020 00:03:56 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B379C0619D2; Sun, 19 Jul 2020 21:03:56 -0700 (PDT) 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 4B97Pw6sbYz9sRW; Mon, 20 Jul 2020 14:03:48 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595217833; bh=OcY+Ne7vqBdLxjtQfG1gVX1Q4F+5772mkCwouUBaQZ0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=CTBxu60hNGJAbPCCy/hV+e51xBKhf698iS1sOhbF9n9//gKUw9Kmw/UCS7vWsD7Y4 3ix8hChWp7WlhNgaewECkLABV7YSI7+aY0LxY34wj/dBfO1bIGSMbTspUlqE60ZwJt r7EfhWA76xnOMX19tHemU7eag8Are/HlPLpbxjMdR8FtZy9oTg/FX5nN12gtffY7c+ PAY7ncIqqn0RJ6Us8cYAIhOeBq50KQvmbJ9w43/y5qw/8+QsYK5aZNO+bCYug27tx3 CtUGjh/H9YQg1WY4xNUzw5Fj/qTDVDQdaayfIBqLG5QYzvfpi/vMnjKNJj8Mtmj6XN szOdiJoXQzzow== Date: Mon, 20 Jul 2020 14:03:46 +1000 From: Stephen Rothwell To: Uros Bizjak Cc: Herbert Xu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Linux Crypto List , Linux Next Mailing List , Linux Kernel Mailing List , "Chang S. Bae" , Sasha Levin Subject: Re: linux-next: manual merge of the tip tree with the crypto tree Message-ID: <20200720140346.109a3006@canb.auug.org.au> In-Reply-To: References: <20200717144656.4bdbf81f@canb.auug.org.au> <20200717064401.GB2504@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qJXKyrG4d4dA/22o/ihB5O8"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/qJXKyrG4d4dA/22o/ihB5O8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Uros, On Fri, 17 Jul 2020 09:31:18 +0200 Uros Bizjak wrote: > > Please find attached the incremental patch that puts back integer > parts of inst.h. This resolves the conflict with the tip tree. The tip tree change needs the XMM parts kept as well, sorry. So I ended up just removing the actual now unused crypto instruction macros. --=20 Cheers, Stephen Rothwell --Sig_/qJXKyrG4d4dA/22o/ihB5O8 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8VF6IACgkQAVBC80lX 0Gz6GQf+OKDf0YYb4uBRmcWB0VQx2DEFV1NAm1t1xR5m8NNS+PMR3EBdAWPueiTe enkl3448LXZiuKvqycKJz7AHqMu/fNPKQJrLnCS1d7NLj6UcTrNEaXrFHUym4D7/ M1PEFlnRsDWkhmBM2/f93KJ8R2q543YQjT6HRswTn1vm3wTXPUuqxX2d0P9kClNg Vt4nYDrs0jXnQ/F9FcIeCz/hXV+cCrlLk5K8bwwnITO2bXBu91DED/TuEQfFel2B D8zrMaT0uf4KbaaQxVpkIdtN0IyvbGcbfdM+THHt/k/zK49LfilUBbEPYQLrc9n6 lK8pEYAYZzuTyDNVjjXpeS83dzwWNw== =CZ+b -----END PGP SIGNATURE----- --Sig_/qJXKyrG4d4dA/22o/ihB5O8--