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

Path	csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news.mb-net.net!open-news-network.org!aioe.org!news.servidellagleba.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 net-next tree with the vfs tree
Date	Fri, 07 Apr 2017 02:30:01 +0200
Message-ID	<ttpWN-87i-7@gated-at.bofh.it> (permalink)
X-Original-To	David Miller <davem@davemloft.net>, Networking <netdev@vger.kernel.org>, Al Viro <viro@ZenIV.linux.org.uk>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1491524552; bh=c4dKpaS8REU4PBYCLR6F4aDp9ieJBX1Aa+tKOZlpGLA=; h=Date:From:To:Cc:Subject:From; b=LOmnj/hBnpUE1CXpxRgU58i3tgwKzfVMuuLDT0qAv9OiBoG9PCwtm4AT8FOvasu6+ KXJlasswwOqW9FvC4RSHLNr1/UqyrKOFTQ2c5/t9hqKBCYfvNOKItkq53VCBQAqUEm 2FLK1cARSycPgzv6VlyDRDhHvvKsbCy0ueWLuZQ3Hkxw6aA7yMja2tL2RdiUUKhCrP lxt1QioZBn7W7ryyzjkwVZc0HKwwADOdzUFoiNZh65BcWsbUcfDPFPTaZd8h0oR1hH FWBT2pqRVMiDIvX83kFwqEnx630/zdVoSiEK8Yg43GOmLR4o6G6kYOUsA6loAs35O1 A0Tm71AI/8azg==
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	26
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>, Nathan Fontenot <nfont@linux.vnet.ibm.com>
X-Original-Date	Fri, 7 Apr 2017 10:22:32 +1000
X-Original-Message-ID	<20170407102232.34195bed@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1618421

Show key headers only | View raw

Hi all,

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

  drivers/net/ethernet/ibm/ibmvnic.c

between commit:

  98998345a579 ("ibmvnic: fix kstrtoul, copy_from_user and copy_to_user misuse")

from the vfs tree and commit:

  e704f0434ea6 ("ibmvnic: Remove debugfs support")

from the net-next tree.

I fixed it up (the latter removed all the code modified by the former,
so I just did that) 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 | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the vfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 02:30 +0200

csiph-web