Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1323796
| From | Chandan Rajendra <chandan@linux.vnet.ibm.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the btrfs-kdave tree with Linus' tree |
| Date | 2016-02-02 06:20 +0100 |
| Message-ID | <qXBxE-5VB-3@gated-at.bofh.it> (permalink) |
| References | <qXw4W-1KM-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Tuesday 02 Feb 2016 10:22:16 Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the btrfs-kdave tree got a conflict in:
>
> fs/btrfs/file.c
>
> between commit:
>
> 5955102c9984 ("wrappers for ->i_mutex access")
>
> from Linus' tree and commit:
>
> 9703fefe0b13 ("Btrfs: fallocate: Work with sectorsized blocks")
>
> from the btrfs-kdave tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The fixes look good to me. Thanks for doing this.
--
chandan
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the btrfs-kdave tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-02 00:30 +0100 Re: linux-next: manual merge of the btrfs-kdave tree with Linus' tree Chandan Rajendra <chandan@linux.vnet.ibm.com> - 2016-02-02 06:20 +0100
csiph-web