From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Michal Hocko <mhocko@suse•com>
Subject: linux-next: manual merge of the f2fs tree with Linus' tree
Date: Fri, 7 Jul 2017 10:43:53 +1000 [thread overview]
Message-ID: <20170707104353.7f9ec14e@canb.auug.org.au> (raw)
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.
--
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))
next reply other threads:[~2017-07-07 0:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-07 0:43 Stephen Rothwell [this message]
2017-07-07 1:57 ` linux-next: manual merge of the f2fs tree with Linus' tree Jaegeuk Kim
-- strict thread matches above, loose matches on Subject: below --
2016-02-22 23:09 Stephen Rothwell
2016-02-23 0:24 ` Jaegeuk Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170707104353.7f9ec14e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhocko@suse$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox