From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Anand Jain <anand.jain@oracle.com>
Subject: linux-next: manual merge of the btrfs-kdave tree with the btrfs-fixes tree
Date: Fri, 5 Apr 2019 10:03:29 +1100 [thread overview]
Message-ID: <20190405100329.1fab45a8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 844 bytes --]
Hi all,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/props.c
between commits:
50398fde997f ("btrfs: prop: fix zstd compression parameter validation")
272e5326c783 ("btrfs: prop: fix vanished compression property after failed set")
from the btrfs-fixes tree and commit:
10e02a8f96ea ("btrfs: drop redundant forward declaration in props.c")
from the btrfs-kdave 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-04 23:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 23:03 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-08-08 0:54 linux-next: manual merge of the btrfs-kdave tree with the btrfs-fixes tree Stephen Rothwell
2018-05-15 23:47 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=20190405100329.1fab45a8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anand.jain@oracle.com \
--cc=dsterba@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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).