From: Jan Kara <jack@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Jan Kara <jack@suse.cz>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Shakeel Butt <shakeelb@google.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the ext3 tree
Date: Tue, 27 Feb 2018 10:36:15 +0100 [thread overview]
Message-ID: <20180227093615.rjdlert2bd5smurb@quack2.suse.cz> (raw)
In-Reply-To: <20180227141153.417a520e@canb.auug.org.au>
Hi Stephen!
On Tue 27-02-18 14:11:53, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> fs/notify/fanotify/fanotify.c
> fs/notify/fanotify/fanotify.h
> fs/notify/fanotify/fanotify_user.c
> fs/notify/inotify/inotify_fsnotify.c
>
> between commits:
>
> 1e301852d657 ("fanotify: Avoid lost events due to ENOMEM for unlimited queues")
> b900420e4109 ("fsnotify: Let userspace know about lost events due to ENOMEM")
>
> from the ext3 tree and commit:
>
> d519ceef2ad6 ("fs: fsnotify: account fsnotify metadata to kmemcg")
>
> from the akpm-current tree.
>
> I fixed it up (see below - I simplified the obvious resolution a bit) 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.
Thanks for the conflict resolution. It looks good!
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2018-02-27 9:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-27 3:11 linux-next: manual merge of the akpm-current tree with the ext3 tree Stephen Rothwell
2018-02-27 9:36 ` Jan Kara [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-11 6:55 Stephen Rothwell
2014-02-26 7:32 Stephen Rothwell
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=20180227093615.rjdlert2bd5smurb@quack2.suse.cz \
--to=jack@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shakeelb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).