From patchwork Sat Sep 5 04:10:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1357891 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=LjFj2AIz; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bk1Km1glMz9sTS for ; Sat, 5 Sep 2020 14:10:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726381AbgIEEKH (ORCPT ); Sat, 5 Sep 2020 00:10:07 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:41349 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725554AbgIEEKG (ORCPT ); Sat, 5 Sep 2020 00:10:06 -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 4Bk1KQ1tPwz9sTM; Sat, 5 Sep 2020 14:10:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599279003; bh=9eB4K8KoHD4blH4JPzEEGzol5NGmZwBzc3bm9jCe0kI=; h=Date:From:To:Cc:Subject:From; b=LjFj2AIzb35wjXOq5pROkUpUqJfsZ6YyZkkOOecS7cAUKK4vIXLmByARMLfthuVGe Q7bWJGGDIBmOotHRuDu6fh3n4sUbw+ldg6pnVo8PESucg0kKIsh+wajsD4xAgV3GlB AJkSbwIaH7SmyEv0gF/MP8s5tZhCUX/8OAImWwn/ZItEv3AVcGYadcYl8dm9zIdChJ WACX2fAiccSg6+/SUZA/ooj0k34U+s3metO5SxJmW9Ey17/pmuHcZmow5wtQfF4sL4 Buf1qIy7rby0N0UnM0rUrpAW3j4MyJb4ncs1xSMzwwGXujdF9YR9UYKwchZNwhbJIP yTFWyoOrVmm7w== Date: Sat, 5 Sep 2020 14:10:01 +1000 From: Stephen Rothwell To: Andrew Morton , David Miller , Networking Cc: "Matthew Wilcox (Oracle)" , Alexei Starovoitov , Daniel Borkmann , Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the akpm-current tree with the net-next tree Message-ID: <20200905141001.18356cd4@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/filemap.c between commit: 76cd61739fd1 ("mm/error_inject: Fix allow_error_inject function signatures.") from the net-next tree and commit: 2cb138387ead ("mm/filemap: fix storing to a THP shadow entry") 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/filemap.c index 78d07a712112,054d93a86f8a..000000000000 --- a/mm/filemap.c