From patchwork Fri Jul 15 02:01:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12918664 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31F8AC43334 for ; Fri, 15 Jul 2022 02:01:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241192AbiGOCBl (ORCPT ); Thu, 14 Jul 2022 22:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241184AbiGOCBk (ORCPT ); Thu, 14 Jul 2022 22:01:40 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 008016E8AA; Thu, 14 Jul 2022 19:01:38 -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 4LkZNK2VFPz4xj3; Fri, 15 Jul 2022 12:01:37 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1657850497; bh=DYH80/QwUNARf0Y6SX2i3c5FMfQQTdmC0PDzRMVMNm4=; h=Date:From:To:Cc:Subject:From; b=L3/Zp/uGt7WBaZ4cWMcOfSVAPbyvFl5QxnaOV7REmqNRihryrP4sBWDngLvI0KFI9 zLNCXX3nQVYh8nFY4fXw4O2V3fAjDx7A+XQ6Y9Q2yHXdlHXpfVohYEDe5D2CM7c06s je2ags07Xm0kZ2JCUgrfcjQ3jLacXjZiTNghiICoNwvR1Mh7MK4iJE6X79krB3LMC1 y2YmSjGBWqHbxD2CbJuj7VifhHzJN1qYUtGEPiiCklcSEdXvEknHDNaoGjM9wm5S1Z s5XFGe/gJ7AiR1SK404x8aVfPcM109swUR7OiP5DsZQPeI+s8R9WlaAeHujlWAp8/c CJ56edubRDmRQ== Date: Fri, 15 Jul 2022 12:01:36 +1000 From: Stephen Rothwell To: David Miller Cc: Networking , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List , Tariq Toukan Subject: linux-next: manual merge of the net-next tree with Linus' tree Message-ID: <20220715120136.479ab661@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/net/tls.h between commit: 3d8c51b25a23 ("net/tls: Check for errors in tls_device_init") from Linus' tree and commit: 587903142308 ("tls: create an internal header") from the net-next tree. I fixed it up (I used the latter version of this file and applied the following merge resolution patch) 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. From: Stephen Rothwell Date: Fri, 15 Jul 2022 11:57:39 +1000 Subject: [PATCH] fix up for "net/tls: Check for errors in tls_device_init" conflicting with "tls: create an internal header" Signed-off-by: Stephen Rothwell --- net/tls/tls.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/tls/tls.h b/net/tls/tls.h index 8005ee25157d..e0ccc96a0850 100644 --- a/net/tls/tls.h +++ b/net/tls/tls.h @@ -133,7 +133,7 @@ static inline struct tls_msg *tls_msg(struct sk_buff *skb) } #ifdef CONFIG_TLS_DEVICE -void tls_device_init(void); +int tls_device_init(void); void tls_device_cleanup(void); int tls_set_device_offload(struct sock *sk, struct tls_context *ctx); void tls_device_free_resources_tx(struct sock *sk); @@ -143,7 +143,7 @@ void tls_device_rx_resync_new_rec(struct sock *sk, u32 rcd_len, u32 seq); int tls_device_decrypted(struct sock *sk, struct tls_context *tls_ctx, struct sk_buff *skb, struct strp_msg *rxm); #else -static inline void tls_device_init(void) {} +static inline int tls_device_init(void) { return 0; } static inline void tls_device_cleanup(void) {} static inline int