From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753354AbdGGB5h (ORCPT ); Thu, 6 Jul 2017 21:57:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753209AbdGGB5g (ORCPT ); Thu, 6 Jul 2017 21:57:36 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23E5022B52 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=jaegeuk@kernel.org Date: Thu, 6 Jul 2017 18:57:24 -0700 From: Jaegeuk Kim To: Stephen Rothwell Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Michal Hocko Subject: Re: linux-next: manual merge of the f2fs tree with Linus' tree Message-ID: <20170707015724.GA12435@jaegeuk-macbookpro.roam.corp.google.com> References: <20170707104353.7f9ec14e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170707104353.7f9ec14e@canb.auug.org.au> User-Agent: Mutt/1.8.2 (2017-04-18) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/07, Stephen Rothwell wrote: > Hi Jaegeuk, > > Today's linux-next merge of the f2fs tree got a conflict in: > > fs/f2fs/f2fs.h > > between commit: > > a7c3e901a46f ("mm: introduce kv[mz]alloc helpers") > > from Linus' tree and commit: > > 8e9a5c32d310 ("f2fs: support plain user/group quota") > > from the f2fs 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. I've confirmed. Thank you so much. > > -- > Cheers, > Stephen Rothwell > > diff --cc fs/f2fs/f2fs.h > index fd2e651bad6d,0ca49e60002c..000000000000 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@@ -2074,6 -2155,36 +2158,16 @@@ static inline void *f2fs_kmalloc(struc > return kmalloc(size, flags); > } > > -static inline void *f2fs_kvmalloc(size_t size, gfp_t flags) > -{ > - void *ret; > - > - ret = kmalloc(size, flags | __GFP_NOWARN); > - if (!ret) > - ret = __vmalloc(size, flags, PAGE_KERNEL); > - return ret; > -} > - > -static inline void *f2fs_kvzalloc(size_t size, gfp_t flags) > -{ > - void *ret; > - > - ret = kzalloc(size, flags | __GFP_NOWARN); > - if (!ret) > - ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL); > - return ret; > -} > - > + static inline int f2fs_filemap_write_and_wait(struct inode *inode) > + { > + int err; > + retry: > + err = filemap_write_and_wait(inode->i_mapping); > + if (err && err == -EAGAIN) > + goto retry; > + return err; > + } > + > #define get_inode_mode(i) \ > ((is_inode_flag_set(i, FI_ACL_MODE)) ? \ > (F2FS_I(i)->i_acl_mode) : ((i)->i_mode))