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 S1757611AbcBADwK (ORCPT <rfc822;w@1wt.eu>);
	Sun, 31 Jan 2016 22:52:10 -0500
Received: from ozlabs.org ([103.22.144.67]:37906 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757572AbcBADvs (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 31 Jan 2016 22:51:48 -0500
Date: Mon, 1 Feb 2016 14:51:46 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Peter Hurley <peter@hurleysoftware.com>,
        Shraddha Barke <shraddha.6596@gmail.com>
Subject: linux-next: manual merge of the staging tree with the tty tree
Message-ID: <20160201145146.670ad8ce@canb.auug.org.au>
X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Greg,

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

  drivers/staging/dgap/dgap.c

between commits:

  6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
  2d73b069f816 ("staging: dgap: Remove redundant write_wait wakeups")
  9db276f8f021 ("tty: Use termios c_*flag macros")

from the tty tree and commit:

  7e3933df9874 ("Staging: dgap: Remove obsolete driver")

from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell