linux-next: manual merge of the staging tree with the staging.current tree

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	2016-04-05 05:10 +0200
Message-ID	<rkpxn-4WF-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Greg,

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

  drivers/iio/gyro/bmg160_core.c

between commit:

  b475c59b113d ("iio: gyro: bmg160: fix buffer read values")

from the staging.current tree and commit:

  7e3d1eb123d8 ("iio: accel: bmg160: optimize transfers in trigger handler")

from the staging tree.

I fixed it up (I used the version from the staging tree) 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 — 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-04-05 05:10 +0200
  Re: linux-next: manual merge of the staging tree with the  staging.current tree Greg KH <greg@kroah.com> - 2016-04-05 06:50 +0200

csiph-web