From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97D9CC07545 for ; Sun, 22 Oct 2023 10:25:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231799AbjJVKZE (ORCPT ); Sun, 22 Oct 2023 06:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231806AbjJVKZC (ORCPT ); Sun, 22 Oct 2023 06:25:02 -0400 Received: from mxout70.expurgate.net (mxout70.expurgate.net [194.37.255.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A624D60; Sun, 22 Oct 2023 03:24:58 -0700 (PDT) Received: from [127.0.0.1] (helo=localhost) by relay.expurgate.net with smtp (Exim 4.92) (envelope-from ) id 1quVdg-005dUP-O3; Sun, 22 Oct 2023 12:24:56 +0200 Received: from [195.243.126.94] (helo=securemail.tdt.de) by relay.expurgate.net with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1quVdg-004cAb-Ap; Sun, 22 Oct 2023 12:24:56 +0200 Received: from securemail.tdt.de (localhost [127.0.0.1]) by securemail.tdt.de (Postfix) with ESMTP id 113B3240049; Sun, 22 Oct 2023 12:24:56 +0200 (CEST) Received: from mail.dev.tdt.de (unknown [10.2.4.42]) by securemail.tdt.de (Postfix) with ESMTP id C0246240040; Sun, 22 Oct 2023 12:24:55 +0200 (CEST) Received: from mail.dev.tdt.de (localhost [IPv6:::1]) by mail.dev.tdt.de (Postfix) with ESMTP id 7873A213BE; Sun, 22 Oct 2023 12:24:55 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sun, 22 Oct 2023 12:24:55 +0200 From: Florian Eckert To: Greg KH Cc: Eckert.Florian@googlemail.com, jirislaby@kernel.org, pavel@ucw.cz, lee@kernel.org, kabel@kernel.org, u.kleine-koenig@pengutronix.de, ansuelsmth@gmail.com, m.brock@vanmierlo.com, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-leds@vger.kernel.org Subject: Re: [PATCH v4 1/3] tty: whitespaces in descriptions corrected by replacing tabs with spaces In-Reply-To: <2023102110-starlight-wispy-1f28@gregkh> References: <20231019112809.881730-1-fe@dev.tdt.de> <20231019112809.881730-2-fe@dev.tdt.de> <2023102110-starlight-wispy-1f28@gregkh> Message-ID: X-Sender: fe@dev.tdt.de User-Agent: Roundcube Webmail/1.3.17 X-purgate: clean X-purgate-type: clean X-purgate-ID: 151534::1697970296-6D0F3018-70AAFCAB/0/0 Precedence: bulk List-ID: X-Mailing-List: linux-serial@vger.kernel.org On 2023-10-21 18:28, Greg KH wrote: > On Thu, Oct 19, 2023 at 01:28:07PM +0200, Florian Eckert wrote: >> Tabs were used in the function description, to make this look more >> uniform, the tabs were replaced by spaces where necessary. >> >> While we're at it, I also replaced the 'ndashes' with simple dashes, >> since >> only those are supported by sphinx. >> >> Reviewed-by: Jiri Slaby >> Signed-off-by: Florian Eckert >> --- >> drivers/tty/tty_io.c | 102 >> +++++++++++++++++++++---------------------- >> 1 file changed, 51 insertions(+), 51 deletions(-) > > This didn't apply cleanly as portions of this patch were already in my > tree, what did tree did you make it against? I have already seen that I should add a base commit next time. So I made it against the master from last week. However, I was not sure which tree to use as I am changing something in the tty and led subsystem- > Anyway, I've fixed it up and taken it now. Thank you for adopting my change and correcting my commit so that it can be applied cleanly. I will not add this patch in the next series, as it is already in the tty-testing branch [1] from you? --- Florian Links: [1] https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git/commit/?h=tty-testing&id=838eb763c3e939a8de8d4c55a17ddcce737685c1