linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
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>
Subject: linux-next: manual merge of the btrfs-kdave tree with Linus' tree
Date: Thu, 19 Sep 2019 12:31:06 +0100	[thread overview]
Message-ID: <20190919113106.GC3642@sirena.co.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

Hi all,

Today's linux-next merge of the btrfs-kdave tree got conflicts in:

  fs/btrfs/block-group.c
  fs/btrfs/ctree.h
  fs/btrfs/extent-tree.c
  fs/btrfs/send.c
  fs/btrfs/space-info.c
  include/uapi/linux/btrfs_tree.h

between a number of commits in Linus' tree and a number of commits in
the btrfs-kdave tree.  I don't feel comfortable that I can resolve these
safely and the btrfs-kdave tree hasn't changed since August with the
last non-merge commit in June so I've dropped the tree for today.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-09-19 11:31 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-19 11:31 Mark Brown [this message]
2019-09-23 11:59 ` linux-next: manual merge of the btrfs-kdave tree with Linus' tree David Sterba
  -- strict thread matches above, loose matches on Subject: below --
2018-02-06 23:49 Stephen Rothwell
2018-02-06 23:45 Stephen Rothwell
2017-08-24 23:58 Stephen Rothwell
2017-09-04  6:02 ` Stephen Rothwell
2017-07-24  0:54 Stephen Rothwell
2017-07-18  0:18 Stephen Rothwell
2017-07-21 13:49 ` David Sterba
2016-12-14 23:25 Stephen Rothwell
2016-09-05  1:47 Stephen Rothwell
2016-04-05  0:32 Stephen Rothwell
2016-04-05  0:32 Stephen Rothwell
2016-04-05  0:32 Stephen Rothwell
2016-02-01 23:22 Stephen Rothwell
2016-02-02  5:16 ` Chandan Rajendra

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=20190919113106.GC3642@sirena.co.uk \
    --to=broonie@kernel.org \
    --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).