From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Benjamin LaHaise <bcrl@kvack•org>, Al Viro <viro@ZenIV•linux.org.uk>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Deepa Dinamani <deepa.kernel@gmail•com>
Subject: linux-next: manual merge of the aio tree with the vfs tree
Date: Mon, 11 Sep 2017 11:29:13 +1000 [thread overview]
Message-ID: <20170911112913.4b24f40f@canb.auug.org.au> (raw)
Hi Benjamin,
Today's linux-next merge of the aio tree got a conflict in:
fs/aio.c
between commit:
32ec9f249d65 ("io_getevents: Use timespec64 to represent timeouts")
from the vfs tree and commit:
eb5263749f68 ("aio: handle integer overflow in io_getevents() timespec usage")
from the aio tree.
I fixed it up (I just dropped the change in the latter commit) 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
next reply other threads:[~2017-09-11 1:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 1:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-15 4:06 linux-next: manual merge of the aio tree with the vfs tree Stephen Rothwell
2016-03-15 4:34 ` Al Viro
2016-03-15 4:53 ` Stephen Rothwell
2016-03-15 5:07 ` Al Viro
2016-03-15 5:19 ` Al Viro
2016-03-15 13:12 ` Benjamin LaHaise
2016-03-14 4:32 Stephen Rothwell
2016-03-14 4:36 ` Stephen Rothwell
2016-03-14 4:41 ` Stephen Rothwell
2016-03-14 7:35 ` Christoph Hellwig
2016-03-14 15:24 ` Benjamin LaHaise
2016-03-15 5:35 ` Al Viro
2016-03-15 13:24 ` Benjamin LaHaise
2016-03-15 8:37 ` Christoph Hellwig
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=20170911112913.4b24f40f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bcrl@kvack$(echo .)org \
--cc=deepa.kernel@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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