From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ming Lei Subject: Re: linux-next: manual merge of the block tree with the fscrypt tree Date: Wed, 16 Jan 2019 11:13:02 +0800 Message-ID: <20190116031301.GC26146@ming.t460p> References: <20190116132522.1b756433@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Jens Axboe Cc: Stephen Rothwell , Theodore Ts'o , Linux Next Mailing List , Linux Kernel Mailing List , Eric Biggers List-Id: linux-next.vger.kernel.org On Tue, Jan 15, 2019 at 07:55:39PM -0700, Jens Axboe wrote: > On 1/15/19 7:25 PM, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the block tree got a conflict in: > > > > fs/ext4/readpage.c > > > > between commit: > > > > acc9eb0a6073 ("ext4: add fs-verity read support") > > > > from the fscrypt tree and commit: > > > > eb754eb2a953 ("block: allow bio_for_each_segment_all() to iterate over multi-page bvec") > > > > from the block tree. > > > > I fixed it up (see below - the former moved the code modified by the > > latter) 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. > > Ming, I'm pulling this, I thought we agreed none of these bullshit > renames? The fact that a patch looks like this: > > - for_each_bvec(bv, (it)->bvecs, __cur_iter, __cur_iter) \ > + for_each_segment(bv, (it)->bvecs, __cur_iter, __cur_iter) \ > > is SUPER annoying and does NOTHING but to cause merge conflicts. > > Resend it without that. We need to differentiate 'segment' with 'bvec' in bvec helpers, which is usually seldom used by drivers. For example, only two in-tree users(ceph, iov_iter). That is why I rename it, and seems Christoph prefers to do it too. Thanks, Ming