linux-next: manual merge of the akpm tree with the wberr tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm tree with the wberr tree
Date	2017-08-01 07:50 +0200
Message-ID	<u9ye5-7FJ-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/linux/fs.h

between commit:

  9dcc0577f2a4 ("mm: remove optimizations based on i_size in mapping writeback waits")

from the wberr tree and patch:

  "mm: remove optimizations based on i_size in mapping writeback waits"

from the akpm tree.

I fixed it up (I just dropped the akpm tree patch) 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.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the akpm tree with the wberr tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-01 07:50 +0200
  Re: linux-next: manual merge of the akpm tree with the wberr tree Jeff Layton <jlayton@poochiereds.net> - 2017-08-01 13:00 +0200
    Re: linux-next: manual merge of the akpm tree with the wberr tree Jeff Layton <jlayton@poochiereds.net> - 2017-08-01 13:40 +0200
      Re: linux-next: manual merge of the akpm tree with the wberr tree Andrew Morton <akpm@linux-foundation.org> - 2017-08-02 00:40 +0200

csiph-web