linux-next: manual merge of the staging tree with the staging.current 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 staging tree with the staging.current tree
Date	Tue, 14 Jun 2016 07:10:02 +0200
Message-ID	<rJOLU-e2-9@gated-at.bofh.it> (permalink)
X-Original-To	Greg KH <greg@kroah.com>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1465880662; bh=xOMYCSzgd2okinjwfZYnHU/0vlWRqlggz1nLmbba13M=; h=Date:From:To:Cc:Subject:From; b=QFbsn1njjRA41xslCJWGezSmUk6okleZ4zrcw+AojyvKRpZfUwZoNnl42D8BnhG4e fLMzG1Xjszcp4Rf23hU7QyOqqufIOoYBshQeST6lRGBTJItyK5H+Qk7rEvuHXeue8A BBOhSX5ovO7/+Y3tiPU6Y6Ev43rf/SDojRGP55uY=
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	52
Organization	linux.* mail to news gateway
X-Original-Cc	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Crestez Dan Leonard <leonard.crestez@intel.com>, Jonathan Cameron <jic23@kernel.org>
X-Original-Date	Tue, 14 Jun 2016 15:04:22 +1000
X-Original-Message-ID	<20160614150422.66d652de@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1421578

Show key headers only | View raw

Hi Greg,

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

  drivers/iio/industrialio-trigger.c

between commit:

  995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func")

from the staging.current tree and commit:

  ef2d71d6b7fb ("iio: triggers: Make trigger ops structure explicitly non optional.")

from the staging 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 drivers/iio/industrialio-trigger.c
index 0c52dfe64977,672911293987..000000000000
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@@ -220,14 -217,15 +223,14 @@@ static int iio_trigger_attach_poll_func
  	ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
  				   pf->type, pf->name,
  				   pf);
 -	if (ret < 0) {
 -		module_put(pf->indio_dev->info->driver_module);
 -		return ret;
 -	}
 +	if (ret < 0)
 +		goto out_put_irq;
  
 +	/* Enable trigger in driver */
- 	if (trig->ops && trig->ops->set_trigger_state && notinuse) {
+ 	if (trig->ops->set_trigger_state && notinuse) {
  		ret = trig->ops->set_trigger_state(trig, true);
  		if (ret < 0)
 -			module_put(pf->indio_dev->info->driver_module);
 +			goto out_free_irq;
  	}
  
  	return ret;

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

Thread

linux-next: manual merge of the staging tree with the  staging.current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-14 07:10 +0200
  Re: linux-next: manual merge of the staging tree with the  staging.current tree Jonathan Cameron <jic23@kernel.org> - 2016-06-19 22:20 +0200

csiph-web