From patchwork Wed Oct 7 02:08:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1377749 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.a=rsa-sha256 header.s=201702 header.b=MQlXzIWx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C5d6P1DLLz9sSf for ; Wed, 7 Oct 2020 13:08:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726645AbgJGCIU (ORCPT ); Tue, 6 Oct 2020 22:08:20 -0400 Received: from ozlabs.org ([203.11.71.1]:34679 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725970AbgJGCIU (ORCPT ); Tue, 6 Oct 2020 22:08:20 -0400 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 4C5d694KBLz9sSG; Wed, 7 Oct 2020 13:08:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1602036497; bh=JYAiyTM40zSDyus2/9je1I8wA9ZePbLcDmG6dt6zgZM=; h=Date:From:To:Cc:Subject:From; b=MQlXzIWxh/0l9yS3Y0Dps2P9aaFA3lb9ZG5eD4icw1vzS1k+9L8t1IfpdvzI5O89R a20IqV3Ebw6mUmuFmgg+kKJzct2IwjB232xXswIp+r+gv/qAewlKvi+tUAmUemeTex 9nmx4moCsk0zDIk7lSdjk4LS7sV2ZRbgXHdTt0YBMKP8kwZd10FlCOp80IPho1RMZl Vvi3SuGov4rFDKlGJk/R6LuXlSSq9sNLtsjPQNPsLLz6EcYfjLAf8zAw+N+wXZwdWk /v99AFqB4Fgtmclf6w3cvG3ZZGSgpXjeanIHDna9uem4WZix5jK0PtwdXKEd/ftnXd dOfalmLXTR7Ug== Date: Wed, 7 Oct 2020 13:08:13 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: David Howells , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20201007130813.2f00ceba@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/rxrpc/conn_event.c between commit: fa1d113a0f96 ("rxrpc: Fix some missing _bh annotations on locking conn->state_lock") from the net tree and commit: 245500d853e9 ("rxrpc: Rewrite the client connection manager") from the net-next tree. I fixed it up (see below) 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. diff --cc net/rxrpc/conn_event.c index 64ace2960ecc,0628dad2bdea..000000000000 --- a/net/rxrpc/conn_event.c