From patchwork Mon Jul 27 09:27:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1336793 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=gimK/+ka; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BFZGB46fGz9sRk for ; Mon, 27 Jul 2020 19:27:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727919AbgG0J11 (ORCPT ); Mon, 27 Jul 2020 05:27:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726315AbgG0J10 (ORCPT ); Mon, 27 Jul 2020 05:27:26 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D3ACC061794; Mon, 27 Jul 2020 02:27:26 -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 4BFZG315Vtz9sPf; Mon, 27 Jul 2020 19:27:23 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595842044; bh=HjZ6HWlM+TvsH3PGn+uqnFohYSwGdbHy00hry1c1fkk=; h=Date:From:To:Cc:Subject:From; b=gimK/+kaNDoRsZWOXMGLIW9JUBka/I2FtlfghSswBw1awmeGw4lx+I4fBmkmZDn5d WFLjE+tviOyETb0frEl5KOqOH7VWLZh6Gp7Lqhv/omE+Vw3oc59oYA8FRk7UxZRzcp f1B2eoOHy/n5pJTZWp6odr240Mhitgc4S2v+ztYqy1QrgLgxrfWxEpB/yqOZQHs7OL VheC5WvV1wAsh+KepoINrGvJNHC99qykWfn4NrohODkQN+8psmkdqvGsM+tC50CK0O CcP1+cNROPYTRxdPNCODAf7T/vNW3zsiXj+Fo/ofo6tguJX48ciEA92i/tcToNKZrf DlGooCSFux6xg== Date: Mon, 27 Jul 2020 19:27:21 +1000 From: Stephen Rothwell To: Kees Cook , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Christoph Hellwig Subject: linux-next: manual merge of the kspp tree with the net-next tree Message-ID: <20200727192721.53af345a@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the kspp tree got a conflict in: net/ipv6/ip6_flowlabel.c between commit: ff6a4cf214ef ("net/ipv6: split up ipv6_flowlabel_opt") from the net-next tree and commit: 3f649ab728cd ("treewide: Remove uninitialized_var() usage") from the kspp 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/ipv6/ip6_flowlabel.c index 215b6f5e733e,73bb047e6037..000000000000 --- a/net/ipv6/ip6_flowlabel.c