Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751707AbdHAFqh (ORCPT ); Tue, 1 Aug 2017 01:46:37 -0400 Received: from ozlabs.org ([103.22.144.67]:41351 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750914AbdHAFqg (ORCPT ); Tue, 1 Aug 2017 01:46:36 -0400 Date: Tue, 1 Aug 2017 15:46:34 +1000 From: Stephen Rothwell To: Andrew Morton , Jeff Layton Cc: Linux-Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the akpm tree with the wberr tree Message-ID: <20170801154634.0a01acdc@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 759 Lines: 26 Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/fs.h between commit: 9dcc0577f2a4 ("mm: remove optimizations based on i_size in mapping writeback waits") from the wberr tree and patch: "mm: remove optimizations based on i_size in mapping writeback waits" from the akpm tree. I fixed it up (I just dropped the akpm tree patch) 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. -- Cheers, Stephen Rothwell