From: Michal Nazarewicz <mina86@mina86.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Chris Mason <clm@fb.com>,
Josef Bacik <jbacik@fb.com>, Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the btrfs tree with Linus' tree
Date: Wed, 29 Jan 2014 14:07:35 +0100 [thread overview]
Message-ID: <xa1t7g9jym08.fsf@mina86.com> (raw)
In-Reply-To: <20140129115403.4d2772c096a4fc7a4c9cb156@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 852 bytes --]
On Wed, Jan 29 2014, Stephen Rothwell wrote:
> Today's linux-next merge of the btrfs tree got a conflict in
> fs/btrfs/acl.c between commit 996a710d4641 ("btrfs: use generic posix ACL
> infrastructure") from the tree and commit cfad95253440 ("btrfs: remove
> dead code") from the btrfs tree.
>
> I fixed it up (I used the version from Linus' tree) and can carry the fix
> as necessary (no action is required).
That sounds correct. My commit [cfad95253440: btrfs: remove dead code]
can be dropped, since Christoph's commit completely rewrites
btrfs_init_acl function.
--
Best regards, _ _
.o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o
..o | Computer Science, Michał “mina86” Nazarewicz (o o)
ooo +--<mpn@google.com>--<xmpp:mina86@jabber.org>--ooO--(_)--Ooo--
[-- Attachment #2.1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 835 bytes --]
next prev parent reply other threads:[~2014-01-29 13:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 0:54 linux-next: manual merge of the btrfs tree with Linus' tree Stephen Rothwell
2014-01-29 13:07 ` Michal Nazarewicz [this message]
2014-02-03 0:13 Stephen Rothwell
2020-10-15 0:35 Stephen Rothwell
2020-10-15 14:42 ` David Sterba
2021-10-31 23:53 Stephen Rothwell
2021-11-02 10:42 ` David Sterba
2021-11-02 11:44 ` Stephen Rothwell
2023-10-31 0:18 Stephen Rothwell
2024-01-08 22:54 Stephen Rothwell
2024-01-10 23:03 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=xa1t7g9jym08.fsf@mina86.com \
--to=mina86@mina86.com \
--cc=clm@fb.com \
--cc=hch@infradead.org \
--cc=jbacik@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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).