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=-5.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 582D8C433E6 for ; Mon, 20 Jul 2020 11:59:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E4242070A for ; Mon, 20 Jul 2020 11:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728711AbgGTL74 (ORCPT ); Mon, 20 Jul 2020 07:59:56 -0400 Received: from helcar.hmeau.com ([216.24.177.18]:53842 "EHLO fornost.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728058AbgGTL7z (ORCPT ); Mon, 20 Jul 2020 07:59:55 -0400 Received: from gwarestrin.arnor.me.apana.org.au ([192.168.0.7]) by fornost.hmeau.com with smtp (Exim 4.92 #5 (Debian)) id 1jxURi-0000wa-0h; Mon, 20 Jul 2020 21:59:03 +1000 Received: by gwarestrin.arnor.me.apana.org.au (sSMTP sendmail emulation); Mon, 20 Jul 2020 21:59:01 +1000 Date: Mon, 20 Jul 2020 21:59:01 +1000 From: Herbert Xu To: Uros Bizjak Cc: Stephen Rothwell , 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: <20200720115901.GA12066@gondor.apana.org.au> References: <20200717144656.4bdbf81f@canb.auug.org.au> <20200717064401.GB2504@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 17, 2020 at 09:31:18AM +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. Sorry but you can't send a patch without changing the Subject line as otherwise patchwork will simply treat it as a comment or just ignore it. Please resend. Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt