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=-3.9 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 2BDF7C43463 for ; Fri, 18 Sep 2020 08:05:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DCF692100A for ; Fri, 18 Sep 2020 08:05:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="CncC44iR"; dkim=temperror (0-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="LVa8wL8l" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726835AbgIRIFH (ORCPT ); Fri, 18 Sep 2020 04:05:07 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58293 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726040AbgIRIFG (ORCPT ); Fri, 18 Sep 2020 04:05:06 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 076895C03CF; Fri, 18 Sep 2020 04:05:05 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Fri, 18 Sep 2020 04:05:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=GYZrs3ZrnzLZ5pRK1bLyJotKq+S TI0/t/EY5xE4WRI0=; b=CncC44iR8csm2o/5cF2nSi4wSvdeiAtskjhZTnD4cPC CVYTw3kfzpyhTzh8bs5pIkotvDFeGGL0p8aL0DL9d74MM1nYEHWkNgRMO19z4dS7 ncgR2ZOB5juHNzIioeeNECcRDj1G/xRXbtVrZeMDJKCo0XDAhyaZWdjxM8ipAUk5 lRTYk/a7WSqC8WVlyvvGMUcgCyXeyz/CkdB7l4F0tNXNfSM68nCFCHHYRgoFhso2 +UtuXefNJwRTtaigg/XMqwY6OQhHIokxAoJ/C25cfG5GNEBZWiRYc6YNf4O1/DFg ukTm9bMTNTL/bG7hwLM6XFzsci/z08DmSHhZ/yvEvgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=GYZrs3 ZrnzLZ5pRK1bLyJotKq+STI0/t/EY5xE4WRI0=; b=LVa8wL8lpLAlo2fG3KcYNM kpUdMYVhWQOlzhiUriJIjGd70OvvgqwRzHyKjkNI8W5W6dCDuiL7T1ejvJYQ3jgG o2trMFaigAIsHxodB5V8J9iCfPIwJaodyCEurFxbcjeZ1OCGMv+Y16Rn3yEyilco 9xTOsW5RNWHlkp5qfL3jRXzu1WIuwmnQG3rGQVRvxeP8PxwPkPKm5SAWiPlxdhXW UYWqDsnp+pm4a8CeLj+uh5bEgV7flt8LLKHkC8fjEGIWVCHAxD3vGu4bDBnh27rV L8XF5Aw4LzuNydWvzBeJkkiEXbydcC3HQ/RoTYV41k/XRlKs2Odnd4AvXvbKLspg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrtdeiucetufdoteggodetrfdotffvucfrrh hofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgenuceurghi lhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurh epfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcumffjuceo ghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehjefgfffgie dvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucfkphepkeefrdekiedr jeegrdeigeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehgrhgvgheskhhrohgrhhdrtghomh X-ME-Proxy: Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) by mail.messagingengine.com (Postfix) with ESMTPA id 49E9C3064685; Fri, 18 Sep 2020 04:05:03 -0400 (EDT) Date: Fri, 18 Sep 2020 10:05:33 +0200 From: Greg KH To: Herbert Xu Cc: Stephen Rothwell , Linux Crypto List , Ard Biesheuvel , Necip Fazil Yildiran , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the staging tree with the crypto tree Message-ID: <20200918080533.GA994032@kroah.com> References: <20200918152127.4414b524@canb.auug.org.au> <20200918054134.GA9252@gondor.apana.org.au> <20200918074911.GA987884@kroah.com> <20200918075036.GA24315@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200918075036.GA24315@gondor.apana.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 18, 2020 at 05:50:36PM +1000, Herbert Xu wrote: > On Fri, Sep 18, 2020 at 09:49:11AM +0200, Greg KH wrote: > > > > Ok, I'll go revert these. > > Thanks! > > > > As the driver has been converted over to the lib arc4 API, it > > > does not need to select CRYPTO at all. > > > > Is it converted in your tree? If so, have a branch/tag I can pull in to > > prevent merge issues in the future? > > It's in the cryptodev tree, but unfortunately it's not in a > topic branch so you'd be pulling all other crypto changes along > with it. Ok, no worries, I'll just revert the above commits and all should be good. thanks, greg k-h