Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1540104 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-12-12 02:40 +0100 |
| Last post | 2016-12-12 03:10 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the block tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-12-12 02:40 +0100
Re: linux-next: manual merge of the block tree with the vfs tree Al Viro <viro@ZenIV.linux.org.uk> - 2016-12-12 02:50 +0100
Re: linux-next: manual merge of the block tree with the vfs tree Ming Lei <tom.leiming@gmail.com> - 2016-12-12 03:10 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-12-12 02:40 +0100 |
| Subject | linux-next: manual merge of the block tree with the vfs tree |
| Message-ID | <sNnKV-6pJ-7@gated-at.bofh.it> |
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/logfs/dev_bdev.c
between commit:
6b4fbde3b979 ("logfs: remove from tree")
from the vfs tree and commitis:
3a83f4677539 ("block: bio: pass bvec table to bio_init()")
739a9975468c ("fs: logfs: convert to bio_add_page() in sync_request()")
d4f98a89f9cd ("fs: logfs: use bio_add_page() in __bdev_writeseg()")
c12484367865 ("fs: logfs: use bio_add_page() in do_erase()")
05aea81b4bc9 ("fs: logfs: remove unnecesary check")
from the block tree.
I fixed it up (I removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
Al: that vfs tree commit has a bad email address for Christoph in it :-(
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Al Viro <viro@ZenIV.linux.org.uk> |
|---|---|
| Date | 2016-12-12 02:50 +0100 |
| Message-ID | <sNnUB-6t3-1@gated-at.bofh.it> |
| In reply to | #1540104 |
On Mon, Dec 12, 2016 at 12:31:40PM +1100, Stephen Rothwell wrote: > Al: that vfs tree commit has a bad email address for Christoph in it :-( Gyah... OK, will fix (the bulk of the diff, of course, had been regenerated while commit message came from his old mail; unfortunately, it had been long gone from my mailbox, so I'd picked it from archives and completely missed the mangled address).
[toc] | [prev] | [next] | [standalone]
| From | Ming Lei <tom.leiming@gmail.com> |
|---|---|
| Date | 2016-12-12 03:10 +0100 |
| Message-ID | <sNodX-6Ok-3@gated-at.bofh.it> |
| In reply to | #1540104 |
On Mon, Dec 12, 2016 at 9:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> fs/logfs/dev_bdev.c
>
> between commit:
>
> 6b4fbde3b979 ("logfs: remove from tree")
>
> from the vfs tree and commitis:
>
> 3a83f4677539 ("block: bio: pass bvec table to bio_init()")
> 739a9975468c ("fs: logfs: convert to bio_add_page() in sync_request()")
> d4f98a89f9cd ("fs: logfs: use bio_add_page() in __bdev_writeseg()")
> c12484367865 ("fs: logfs: use bio_add_page() in do_erase()")
> 05aea81b4bc9 ("fs: logfs: remove unnecesary check")
>
> from the block tree.
>
> I fixed it up (I removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Looks every time the logfs changes have been posted in fsdev mail list.
--
Ming Lei
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web