From patchwork Wed Jul 3 10:49:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1126831 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; 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.b="R1uWKAif"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45dyXp4dNhz9s4V for ; Wed, 3 Jul 2019 20:49:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727108AbfGCKt1 (ORCPT ); Wed, 3 Jul 2019 06:49:27 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:50335 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726544AbfGCKt1 (ORCPT ); Wed, 3 Jul 2019 06:49:27 -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 45dyXg5Kw8z9s4Y; Wed, 3 Jul 2019 20:49:23 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1562150964; bh=wcJRF5awK9VFplzQrvl0xSNRx3Qpc7cMbU202oXK/bE=; h=Date:From:To:Cc:Subject:From; b=R1uWKAifUwCwvrVaqOS6ql1oNTIskGbaHY1sAWqqnC2TVj5qIh9eBDRfyeGwNqtxd cDThu0moCJ6dkORD3ioXIzF3cPj7HCIsxmvqd4+SGgTAFMcBA6hYAc+DLqlhYEzBVx uMK15vGPJekJ3bYsYadRGe7bRcVN3t18Ztsp8Bpu0C00U88eRMnl8PWeyVxiCh0S5A S7iUsY+Ho7ODnprGxyjQARSeyMO/UGdLzu0fo1OG2E0IXoHamO6rOdKuatTh4JSYBh WRYkVnWnSDd7kpbJGSAH5XP270rwF25/WSiTRGmDp6Ceze2fqY7dFIT/u71cqVnseJ C1vsaEaaRDhFA== Date: Wed, 3 Jul 2019 20:49:21 +1000 From: Stephen Rothwell To: Andrew Morton , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Eiichi Tsukata Subject: linux-next: manual merge of the akpm tree with the net-next tree Message-ID: <20190703204921.69bc9074@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 akpm tree got a conflict in: net/ipv6/sysctl_net_ipv6.c between commit: 00dc3307c0f7 ("net/ipv6: Fix misuse of proc_dointvec "flowlabel_reflect"") from the net-next tree and patch: "proc-sysctl-add-shared-variables-for-range-check-fix-2-fix" from the akpm 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/sysctl_net_ipv6.c index 57f520d1bf45,e00cf070e542..000000000000 --- a/net/ipv6/sysctl_net_ipv6.c