Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751725AbdFISKs (ORCPT ); Fri, 9 Jun 2017 14:10:48 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59720 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbdFISKr (ORCPT ); Fri, 9 Jun 2017 14:10:47 -0400 Date: Fri, 9 Jun 2017 20:10:38 +0200 From: Greg Kroah-Hartman To: Aleksa Sarai Cc: mtk.manpages@gmail.com, linux-man@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Brauner , Valentin Rothberg , Jiri Slaby , containers@lists.linux-foundation.org Subject: Re: [PATCH] ioctl_tty.2: add TIOCGPTPEER documentation Message-ID: <20170609181038.GB18740@kroah.com> References: <20170609170147.32311-1-asarai@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170609170147.32311-1-asarai@suse.de> User-Agent: Mutt/1.8.3 (2017-05-23) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 525 Lines: 13 On Sat, Jun 10, 2017 at 03:01:47AM +1000, Aleksa Sarai wrote: > The feature this patch references has currently only been accepted into > tty-testing, but Greg told me to kick this down to man-pages. As a > result, I can't reference upstream commit id's because the code isn't in > Linus' tree yet -- should I resend this once it lands in tty-next or > Linus' tree? It's now merged to tty-next, and will show up in the next linux-next release, and is planned to be merged into 4.13-rc1 when that happens. thanks, greg k-h