From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753179AbcDEDDc (ORCPT ); Mon, 4 Apr 2016 23:03:32 -0400 Received: from ozlabs.org ([103.22.144.67]:49089 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbcDEDDa (ORCPT ); Mon, 4 Apr 2016 23:03:30 -0400 Date: Tue, 5 Apr 2016 13:03:26 +1000 From: Stephen Rothwell To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Irina Tirdea , Jonathan Cameron Subject: linux-next: manual merge of the staging tree with the staging.current tree Message-ID: <20160405130326.03c74125@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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