Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1323796
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| 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 | Tue, 02 Feb 2016 06:20:02 +0100 |
| Message-ID | <qXBxE-5VB-3@gated-at.bofh.it> (permalink) |
| References | <qXw4W-1KM-13@gated-at.bofh.it> |
| X-Original-To | Stephen Rothwell <sfr@canb.auug.org.au> |
| X-Ibm-Helo | d28relay05.in.ibm.com |
| X-Ibm-Mailfrom | chandan@linux.vnet.ibm.com |
| X-Ibm-Rcptto | linux-kernel@vger.kernel.org;linux-next@vger.kernel.org |
| User-Agent | KMail/4.14.7 (Linux/3.17.4-301.fc21.x86_64; KDE/4.14.9; x86_64; ; ) |
| MIME-Version | 1.0 |
| Content-Transfer-Encoding | 7Bit |
| Content-Type | text/plain; charset="us-ascii" |
| X-Tm-As-Mml | disable |
| X-Cbid | 16020205-0025-0000-0000-000009B2A0BA |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 24 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | David Sterba <dsterba@suse.cz>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk> |
| X-Original-Date | Tue, 02 Feb 2016 10:46:20 +0530 |
| X-Original-Message-ID | <3386269.jJKUEthxLy@localhost.localdomain> |
| X-Original-References | <20160202102216.60d1d550@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1323796 |
Show key headers only | View raw
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