linux-next: manual merge of the staging tree with the block tree

Path	csiph.com!goblin1!goblin.stu.neva.ru!nntpspool.opticnetworks.net!nntpspool01.opticnetworks.net!aioe.org!gothmog.csi.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 staging tree with the block tree
Date	Tue, 14 Jun 2016 07:10:01 +0200
Message-ID	<rJOLT-e2-3@gated-at.bofh.it> (permalink)
X-Original-To	Greg KH <greg@kroah.com>, Jens Axboe <axboe@kernel.dk>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1465880857; bh=3zQMKLFRGS7I0Lwu1rliP+eRz0nZ5hJo8TtFTzXPXJY=; h=Date:From:To:Cc:Subject:From; b=oJ9/N5eih62wSJCZBp/O2CIG7vSBS+jEeELt0sK74ggMhbs2M6/yuLOHWqARVGurk 8MAxc5sg/E+pfVfZVizZX/bEkV+fUct2PKBT84ufsNmZNOkJrnVAFWgh2zfovGFKEL B7L9k651X2XhUCdIbKu4LWePd3/3zOOF65NLjqB4=
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@vger.kernel.org, linux-kernel@vger.kernel.org, James Simmons <jsimmons@infradead.org>, Mike Christie <mchristi@redhat.com>
X-Original-Date	Tue, 14 Jun 2016 15:07:37 +1000
X-Original-Message-ID	<20160614150737.015362de@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1421577

Show key headers only | View raw

Hi Greg,

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

  drivers/staging/lustre/lustre/llite/lloop.c

between commit:

  95fe6c1a209e ("block, fs, mm, drivers: use bio set/get op accessors")

from the block tree and commit:

  67b1a24e883c ("staging: lustre: llite: remove lloop device")

from the staging 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.

-- 
Cheers,
Stephen Rothwell

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

Thread

linux-next: manual merge of the staging tree with the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-14 07:10 +0200

csiph-web