Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1676319
| From | Jens Axboe <axboe@kernel.dk> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the block tree with the file-locks tree |
| Date | 2017-06-28 04:10 +0200 |
| Message-ID | <tXaAy-Ds-7@gated-at.bofh.it> (permalink) |
| References | <tXaqR-ld-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On 06/27/2017 07:57 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> include/linux/fs.h
>
> between commit:
>
> 3f64df8a51ce ("fs: new infrastructure for writeback error handling and reporting")
>
> from the file-locks tree and commit:
>
> c75b1d9421f8 ("fs: add fcntl() interface for setting/getting write life time hints")
>
> from the block tree.
Looks like we stole the same hole! Let's just merge it like this, then
post merge I (or Jeff) can move the member to a better location.
--
Jens Axboe
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the block tree with the file-locks tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-28 04:00 +0200
Re: linux-next: manual merge of the block tree with the file-locks tree Jens Axboe <axboe@kernel.dk> - 2017-06-28 04:10 +0200
Re: linux-next: manual merge of the block tree with the file-locks tree Jeff Layton <jlayton@poochiereds.net> - 2017-06-28 12:00 +0200
Re: linux-next: manual merge of the block tree with the file-locks tree Jens Axboe <axboe@kernel.dk> - 2017-06-28 14:50 +0200
csiph-web