From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, Theodore Ts'o <tytso@mit•edu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jaegeuk Kim <jaegeuk@kernel•org>,
Mike Christie <mchristi@redhat•com>
Subject: linux-next: manual merge of the block tree with the ext4 tree
Date: Fri, 15 Jul 2016 14:33:27 +1000 [thread overview]
Message-ID: <20160715143327.219961ef@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/ext4/crypto.c
between commit:
a7550b30ab70 ("ext4 crypto: migrate into vfs's crypto engine")
from the ext4 tree and commits:
4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
60a40096a3b2 ("ext4: use bio op helprs in ext4 crypto code")
from the block tree.
I fixed it up (the ext4 tree removed the file, so I did that) 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:[~2016-07-15 4:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 4:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 3:09 linux-next: manual merge of the block tree with the ext4 tree Stephen Rothwell
2023-06-26 8:00 ` Christoph Hellwig
2023-06-27 0:46 ` Stephen Rothwell
2023-06-13 2:54 Stephen Rothwell
2023-06-13 5:00 ` Christoph Hellwig
2014-11-27 3:53 Stephen Rothwell
2014-11-27 7:38 ` Christoph Hellwig
2014-11-29 10:08 ` Sabrina Dubroca
2014-11-29 17:38 ` Theodore Ts'o
2014-11-29 22:08 ` Jeremiah Mahler
2014-11-26 2:41 Stephen Rothwell
2010-09-21 4:04 Stephen Rothwell
2010-10-23 2:47 ` Stephen Rothwell
2010-04-29 3:51 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=20160715143327.219961ef@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchristi@redhat$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/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