From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Jan Kara <jack@suse•cz>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
David Howells <dhowells@redhat•com>,
Phillip Potter <phil@philpotter•co.uk>,
Amir Goldstein <amir73il@gmail•com>
Subject: linux-next: manual merge of the vfs tree with the ext3 tree
Date: Wed, 2 Jan 2019 12:09:10 +1100 [thread overview]
Message-ID: <20190102120910.7a673e28@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/Makefile
between commit:
d44170a7ba48 ("fs: common implementation of file type")
from the ext3 tree and commits:
fe43eec04841 ("vfs: Introduce fs_context, switch vfs_kern_mount() to it.")
82685adaccb3 ("vfs: Add configuration parser helpers")
from the vfs 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/Makefile
index da0d43eb2bc5,9a0b8003f069..000000000000
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -13,7 -13,7 +13,7 @@@ obj-y := open.o read_write.o file_table
seq_file.o xattr.o libfs.o fs-writeback.o \
pnode.o splice.o sync.o utimes.o d_path.o \
stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
- fs_types.o
- fs_context.o fs_parser.o
++ fs_types.o fs_context.o fs_parser.o
ifeq ($(CONFIG_BLOCK),y)
obj-y += buffer.o block_dev.o direct-io.o mpage.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-01-02 1:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-02 1:09 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-03 22:56 linux-next: manual merge of the vfs tree with the ext3 tree Stephen Rothwell
2022-09-26 13:01 broonie
2018-11-27 23:10 Stephen Rothwell
2018-06-01 1:56 Stephen Rothwell
2018-06-01 15:32 ` Jan Kara
2018-06-11 23:53 ` Stephen Rothwell
2017-11-08 22:55 Stephen Rothwell
2015-03-18 0:32 Stephen Rothwell
2012-01-05 2:06 Stephen Rothwell
2011-07-18 3:36 Stephen Rothwell
2011-07-18 19:32 ` Jan Kara
2010-05-28 1:31 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=20190102120910.7a673e28@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amir73il@gmail$(echo .)com \
--cc=dhowells@redhat$(echo .)com \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=phil@philpotter$(echo .)co.uk \
--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