linux-next: manual merge of the akpm-current tree with the xfs tree

Path	csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.us.feeder.erje.net!newsfeed.fsmpi.rwth-aachen.de!newsfeed.straub-nv.de!news.unit0.net!news.panservice.it!diesel.cu.mi.it!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the akpm-current tree with the xfs tree
Date	Fri, 10 Feb 2017 07:50:01 +0100
Message-ID	<t9dbP-8le-9@gated-at.bofh.it> (permalink)
X-Original-To	Andrew Morton <akpm@linux-foundation.org>, "Darrick J. Wong" <darrick.wong@oracle.com>, David Chinner <david@fromorbit.com>, linux-xfs@vger.kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1486709106; bh=+tDCjv9BC4IXyDXCDNiY+UYeoJCRqhdpvpL9LPjal9I=; h=Date:From:To:Cc:Subject:From; b=P880n9RERCfbgrESi1gSuPTU2T5tbeJ0WRQo3RyA5z5j8oMvuktE6R7/F0xSK/CSQ 05Dm0K8HBkbr+aASmnQVUwcfZ1mghfJ66igqbL6HFyiUlrLnD9gU/VnBgJJR9w/yl5 Mwci5aOgTmL3aDc5zGuIK4gecq4v9IQ2qzDO9Ucw=
MIME-Version	1.0
Content-Type	text/plain; charset=US-ASCII
Content-Transfer-Encoding	7bit
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	46
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig <hch@lst.de>, Dave Jiang <dave.jiang@intel.com>
X-Original-Date	Fri, 10 Feb 2017 17:45:05 +1100
X-Original-Message-ID	<20170210174505.03a1aacc@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1578198

Show key headers only | View raw

Hi Andrew,

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

  fs/iomap.c

between commit:

  8ff6daa17b6a ("iomap: constify struct iomap_ops")

from the xfs tree and commit:

  d6fb008f420c ("mm, fs: reduce fault, page_mkwrite, and pfn_mkwrite to take only vmf")

from the akpm-current tree.

I fixed it up (see below) 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

diff --cc fs/iomap.c
index d89f70bbb952,ccba165bed49..000000000000
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@@ -445,11 -445,10 +445,10 @@@ iomap_page_mkwrite_actor(struct inode *
  	return length;
  }
  
- int iomap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
- 		const struct iomap_ops *ops)
 -int iomap_page_mkwrite(struct vm_fault *vmf, struct iomap_ops *ops)
++int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
  {
  	struct page *page = vmf->page;
- 	struct inode *inode = file_inode(vma->vm_file);
+ 	struct inode *inode = file_inode(vmf->vma->vm_file);
  	unsigned long length;
  	loff_t offset, size;
  	ssize_t ret;

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

Thread

linux-next: manual merge of the akpm-current tree with the xfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-10 07:50 +0100

csiph-web