From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753341AbcIBMoQ (ORCPT <rfc822;w@1wt.eu>);
        Fri, 2 Sep 2016 08:44:16 -0400
Received: from mail.linuxfoundation.org ([140.211.169.12]:49983 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751190AbcIBMoO (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 2 Sep 2016 08:44:14 -0400
Date: Fri, 2 Sep 2016 14:44:21 +0200
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Laura Abbott <labbott@redhat.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>,
        John Stultz <john.stultz@linaro.org>,
        Arve =?iso-8859-1?B?SGr4bm5lduVn?= <arve@android.com>,
        Riley Andrews <riandrews@android.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>, linaro-mm-sig@lists.linaro.org,
        devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
        Eun Taik Lee <eun.taik.lee@samsung.com>,
        Liviu Dudau <Liviu.Dudau@arm.com>, Jon Medhurst <tixy@linaro.org>,
        Mitchel Humpherys <mitchelh@codeaurora.org>,
        Jeremy Gebben <jgebben@codeaurora.org>,
        Bryan Huntsman <bryanh@codeaurora.org>,
        Android Kernel Team <kernel-team@android.com>,
        Chen Feng <puck.chen@hisilicon.com>,
        Brian Starkey <brian.starkey@arm.com>
Subject: Re: [PATCHv2 2/4] staging: android: ion: Pull out ion ioctls to a
 separate file
Message-ID: <20160902124421.GA11428@kroah.com>
References: <1472769644-11039-1-git-send-email-labbott@redhat.com>
 <1472769644-11039-3-git-send-email-labbott@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1472769644-11039-3-git-send-email-labbott@redhat.com>
User-Agent: Mutt/1.7.0 (2016-08-17)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Sep 01, 2016 at 03:40:42PM -0700, Laura Abbott wrote:
> 
> The number of Ion ioctls may continue to grow along with necessary
> validation. Pull it out into a separate file for easier management
> and review.
> 
> Signed-off-by: Laura Abbott <labbott@redhat.com>
> ---
>  drivers/staging/android/ion/Makefile    |   3 +-
>  drivers/staging/android/ion/ion-ioctl.c | 144 ++++++++++++++++++++++
>  drivers/staging/android/ion/ion.c       | 210 ++------------------------------
>  drivers/staging/android/ion/ion_priv.h  |  91 ++++++++++++++
>  4 files changed, 244 insertions(+), 204 deletions(-)
>  create mode 100644 drivers/staging/android/ion/ion-ioctl.c

This patch doesn't apply cleanly to my tree, are we out of sync somehow?

Can you rebase your outstanding patches against my staging-testing
branch and resend?

thanks,

greg k-h