Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753786AbdF1CCI (ORCPT ); Tue, 27 Jun 2017 22:02:08 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:33168 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753605AbdF1CCB (ORCPT ); Tue, 27 Jun 2017 22:02:01 -0400 Subject: Re: linux-next: manual merge of the block tree with the file-locks tree To: Stephen Rothwell , Jeff Layton Cc: Linux-Next Mailing List , Linux Kernel Mailing List References: <20170628115721.3e594e2c@canb.auug.org.au> From: Jens Axboe Message-ID: <4feec680-6d4f-abbe-c025-61b462612dde@kernel.dk> Date: Tue, 27 Jun 2017 20:01:56 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170628115721.3e594e2c@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 576 Lines: 22 On 06/27/2017 07:57 PM, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in: > > include/linux/fs.h > > between commit: > > 3f64df8a51ce ("fs: new infrastructure for writeback error handling and reporting") > > from the file-locks tree and commit: > > c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints") > > from the block tree. Looks like we stole the same hole! Let's just merge it like this, then post merge I (or Jeff) can move the member to a better location. -- Jens Axboe