From patchwork Mon Jul 13 08:20:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1327754 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=iZZEY+7x; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B4xRP6JPRz9sRk for ; Mon, 13 Jul 2020 18:20:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729359AbgGMIUa (ORCPT ); Mon, 13 Jul 2020 04:20:30 -0400 Received: from ozlabs.org ([203.11.71.1]:42531 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725818AbgGMIUa (ORCPT ); Mon, 13 Jul 2020 04:20:30 -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 4B4xRF6KT1z9sDX; Mon, 13 Jul 2020 18:20:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1594628427; bh=LH4FOtl0Z+kfpRZwAFFiDHlO3qpDI4fH8c6WKE5JlK4=; h=Date:From:To:Cc:Subject:From; b=iZZEY+7xZ4Owu8dkWATmnMr4gMb/dpivDUmtJ7lyVWzea/p5ORoLHse3jdw3hpjyE IoBD9RIB/IXngv2BCsIhlVlOsnZGx9STLcdBLR/SQhaqyFCfFKLHrjkCqXHtG3/X0g WzuEoHcTa+I6NruoM+iBog+hzu35DPsYp/quZZW8YcnrnOsdjTB+6vd+osgXksOyE1 j6tXhvP+HYm4cPeYlhCVuRhrVov4Gz8u5yi+gCuDRq06foymER6+5M5Z/7bCoFzQYK RYL58kXANKz39/8G4Ujz46lvQpXDiXRY18p5NlX4c3JCs2wlzpge0GIdAd+R+LO8jV EyH5WWTyyNWwg== Date: Mon, 13 Jul 2020 18:20:23 +1000 From: Stephen Rothwell To: Andrew Morton , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jakub Kicinski , Barry Song Subject: linux-next: manual merge of the akpm-current tree with the net-next tree Message-ID: <20200713182023.3f08605e@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-current tree got a conflict in: mm/cma.h between commit: a2b992c828f7 ("debugfs: make sure we can remove u32_array files cleanly") from the net-next tree and commit: bc7212aceef6 ("mm: cma: fix the name of CMA areas") from the akpm-current 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 mm/cma.h index 6698fa63279b,27d3f0e9f68f..000000000000 --- a/mm/cma.h