From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754178AbeBFXpi (ORCPT ); Tue, 6 Feb 2018 18:45:38 -0500 Received: from ozlabs.org ([103.22.144.67]:52963 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753346AbeBFXpg (ORCPT ); Tue, 6 Feb 2018 18:45:36 -0500 Date: Wed, 7 Feb 2018 10:45:33 +1100 From: Stephen Rothwell To: David Sterba Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Masami Hiramatsu , Alexei Starovoitov , Nikolay Borisov Subject: linux-next: manual merge of the btrfs-kdave tree with Linus' tree Message-ID: <20180207104533.216ef09b@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 Hi David, Today's linux-next merge of the btrfs-kdave tree got a conflict in: fs/btrfs/disk-io.c between commit: 540adea3809f ("error-injection: Separate error-injection from kprobe") from Linus' tree and commit: 8bd2a9b19fd7 ("btrfs: Remove custom crc32c init code") from the btrfs-kdave 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. -- Cheers, Stephen Rothwell diff --cc fs/btrfs/disk-io.c index f9cef2f8d1a5,ff64113ec5f0..000000000000 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@@ -30,7 -30,7 +30,8 @@@ #include #include #include +#include + #include #include #include "ctree.h" #include "disk-io.h"