From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753227Ab3IWFwd (ORCPT ); Mon, 23 Sep 2013 01:52:33 -0400 Received: from saturn.retrosnub.co.uk ([178.18.118.26]:49009 "EHLO saturn.retrosnub.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752335Ab3IWFwc (ORCPT ); Mon, 23 Sep 2013 01:52:32 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <20130923132122.584a5166d14d0ec6d6f1a3a4@canb.auug.org.au> References: <20130923132122.584a5166d14d0ec6d6f1a3a4@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: linux-next: manual merge of the staging tree with the staging.current tree From: Jonathan Cameron Date: Mon, 23 Sep 2013 06:52:26 +0100 To: Stephen Rothwell , Greg KH CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Yann Droneaud , Lars-Peter Clausen Message-ID: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks Stephen. Sorry Greg, I meant to mention these two would occur but clean forgot when sending that pull request. Both are are correctly merged by Stephen. Jonathan Stephen Rothwell wrote: >Hi Greg, > >Today's linux-next merge of the staging tree got a conflict in >drivers/iio/industrialio-event.c between commit cadc2125e140 ("iio: >fix: >Keep a reference to the IIO device for open file descriptors") from the >staging.current tree and commit a646fbf0fd11 ("iio: use >anon_inode_getfd >() with O_CLOEXEC flag") from the staging tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required). -- Sent from my Android phone with K-9 Mail. Please excuse my brevity.