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 S1752237AbcBWXvP (ORCPT <rfc822;w@1wt.eu>);
	Tue, 23 Feb 2016 18:51:15 -0500
Received: from mail.linuxfoundation.org ([140.211.169.12]:35533 "EHLO
	mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751872AbcBWXvN (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 23 Feb 2016 18:51:13 -0500
Date: Tue, 23 Feb 2016 15:51:12 -0800
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Soeren Grunewald <soeren.grunewald@desy.de>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: Re: [PATCH 3.14 35/37] serial: 8250_pci: Add support for 16 port
 Exar boards
Message-ID: <20160223235112.GA28578@kroah.com>
References: <20151106192410.681850286@linuxfoundation.org>
 <20151106192413.036873566@linuxfoundation.org>
 <56532146.1040005@desy.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56532146.1040005@desy.de>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Nov 23, 2015 at 03:23:02PM +0100, Soeren Grunewald wrote:
> Dear Greg,
> 
> Could you please also add upstream commit
> 899f0c1c7dbcc487fdc8756a49ff70b1d5d75f89
> 
> There was a merge conflict in the 4-1.y tree with another back-ported patch.
> But in 3.14 this shouldn't be the case.

Now added, thanks.

greg k-h