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,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 8DCF0C433DF for ; Mon, 20 Jul 2020 06:14:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69E762080D for ; Mon, 20 Jul 2020 06:14:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="guPVm8Cq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726680AbgGTGOD (ORCPT ); Mon, 20 Jul 2020 02:14:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725872AbgGTGOD (ORCPT ); Mon, 20 Jul 2020 02:14:03 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F497C0619D2; Sun, 19 Jul 2020 23:14:03 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id a32so12143056qtb.5; Sun, 19 Jul 2020 23:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=4WkbcnELK8qF7TZXeRSjvQCVSZidMYemBo24Bv/PnJE=; b=guPVm8CqCO4pIK7JhMgK5yI5MrFSSmXLjjXWlSJmeypBxID9d53IlPs/V7oJz+20Ng pHWheuRToTZJNuEq9682UtjPy4Aw2DHCHD68oB4dVX6R9uaAnD/cHlZQxAWCe0vyc505 dG47UsVf9GcnyTdwmdI+rC1ulnQHQ/z4zVWiSxHmElAPcwGf4OAzYrWQDii4Tcyt12xs xdpSNsClbZrzvwzL/g9tpCAnGpu16643EXV1276dslLkXdok2yQz6CNzLyMxFIs2u303 SbB/foTgcHk8+LYrLZHgKGHQt4P9fdfVBHwyX/PsyWXFN92dN5RSx20fFBkmaSbfkO4L Pzvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4WkbcnELK8qF7TZXeRSjvQCVSZidMYemBo24Bv/PnJE=; b=lEQUms/b9CcMWn3ikzyTPgs5B3cHtAzTcS9PliDZbxB5IFfrGEL+jmZbEldDoelssb GMl0nSCnu5cYmXwWnzLbjFIhapR6pAJ8lf0KJfQv/5pR3k3Pnx/rgMcOh5YsnO7obHIu GTsC8CMNZgkaJUVuomkNqgZwBoLBpiB3k7lNHNvJxb+i5BHTyg1agfyTooGb1vDus2GJ ibJ1Fb5pxAj93U0aawL6iQn0eOQkTbuxvNjfJokVfr97PNWLFn49xhWvnQ2TCnl7pdak MV6ypG8PGPlfNKjsWdOxkH0uxWQXQduaMhfsW8BtpVD8zl9fxxgeptV8dJ4Kxb7UPyYr tqqg== X-Gm-Message-State: AOAM531m7172wmGe+/gFiOBTWvHvUU9wsTLobzAfPCSx7dTEyIHFTdMf BwzNBnNqtlfgh3EFAqXzJ6vdPMCCh8iTAlkEmGU= X-Google-Smtp-Source: ABdhPJyNjaM9Ss6Z8LkNDDjMhEDzwYL9DpjRxCnbGGdjfEI6LVo+Cpd7WfwWL9m1KtJ0BPc/g6OfUuccM5XohrXWmWs= X-Received: by 2002:ac8:4cc2:: with SMTP id l2mr23168875qtv.225.1595225642589; Sun, 19 Jul 2020 23:14:02 -0700 (PDT) MIME-Version: 1.0 References: <20200717144656.4bdbf81f@canb.auug.org.au> <20200717064401.GB2504@gondor.apana.org.au> <20200720140346.109a3006@canb.auug.org.au> In-Reply-To: <20200720140346.109a3006@canb.auug.org.au> From: Uros Bizjak Date: Mon, 20 Jul 2020 08:13:51 +0200 Message-ID: Subject: Re: linux-next: manual merge of the tip tree with the crypto tree To: Stephen Rothwell 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 Content-Type: text/plain; charset="UTF-8" Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On Mon, Jul 20, 2020 at 6:03 AM Stephen Rothwell 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. Strange, because I did test my patch with the tip tree from 'origin/master' at commit a282cddefe90c4b21ef2c22a76a7c3ebd3ec6b86 and the compilation produced the same lonely rdpid %eax in .altinstr_replacement section. AFAICS, the header is included only for RDPID macro, where XMM registers are unused. > So I ended up just removing the actual now unused crypto instruction > macros. To avoid any further troubles, this is also OK with me. Uros.