linux-next: manual merge of the vfs tree with the mips tree

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the vfs tree with the mips tree
Date	Wed, 12 Apr 2017 01:40:02 +0200
Message-ID	<tvdya-5fl-15@gated-at.bofh.it> (permalink)
X-Original-To	Al Viro <viro@ZenIV.linux.org.uk>, Ralf Baechle <ralf@linux-mips.org>, James Hogan <james.hogan@imgtec.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1491953941; bh=Kk0hNoGT856o5J3/QkfgaNMaz00rD2tZURj2U5mtD0M=; h=Date:From:To:Cc:Subject:From; b=j2ENX4X2tkNdKJVhZnRuei/cNNdcQ6SGN1u2S422mHXWV6Rr2LXIkamXa5r9jqTx8 kVp/gClEBeKRZk3MAsWd29lnp4+IhgH6r74hNi8OaQ4i7OkTJrYEQ8GdM8dscAlRad REHaJFJOk1kXeLxlvVOIcBTOXJ3l8LVOFTPdh7XWKgXgni5ID38yVZ4OTvzbOEJICi cdNekwT9RzltwpnPsBg5YP7nNxLknfhN2+9GBHQK5mZs+NGgtuwmhFldkaRhVA2Wma OB448YvFCOta7erPrhsy9tsd885qr/jUyYu49reG+dhu0bibRv1nja86+BO3WmvoWH 0y+BTwnPwsb1w==
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	40
Organization	linux.* mail to news gateway
X-Original-Cc	Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, James Cowgill <James.Cowgill@imgtec.com>
X-Original-Date	Wed, 12 Apr 2017 09:39:01 +1000
X-Original-Message-ID	<20170412093901.01dded8a@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1621694

Show key headers only | View raw

Hi all,

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

  arch/mips/Kconfig

between commit:

  3c81d1369703 ("MIPS: Opt into HAVE_COPY_THREAD_TLS")

from the mips tree and commit:

  28fa21828dbd ("HAVE_ARCH_HARDENED_USERCOPY is unconditional now")

from the vfs 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 arch/mips/Kconfig
index 52d81ca6f74e,81ce5b4b9251..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -69,8 -68,6 +69,7 @@@ config MIP
  	select HANDLE_DOMAIN_IRQ
  	select HAVE_EXIT_THREAD
  	select HAVE_REGS_AND_STACK_ACCESS_API
- 	select HAVE_ARCH_HARDENED_USERCOPY
 +	select HAVE_COPY_THREAD_TLS
  
  menu "Machine selection"

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

Thread

linux-next: manual merge of the vfs tree with the mips tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-12 01:40 +0200

csiph-web