From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 47C0B1F463 for ; Sun, 1 Dec 2019 01:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727059AbfLABpP (ORCPT ); Sat, 30 Nov 2019 20:45:15 -0500 Received: from ms.lwn.net ([45.79.88.28]:36406 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726878AbfLABpO (ORCPT ); Sat, 30 Nov 2019 20:45:14 -0500 Received: from lwn.net (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id 1192030D; Sun, 1 Dec 2019 01:45:14 +0000 (UTC) Date: Sat, 30 Nov 2019 18:45:12 -0700 From: Jonathan Corbet To: Linus Torvalds Cc: Git List Mailing , Junio Hamano C , LKML , "open list:DOCUMENTATION" , Jonathan =?UTF-8?B?TmV1?= =?UTF-8?B?c2Now6RmZXI=?= Subject: Re: [PATCH] Documentation: networking: device drivers: Remove stray asterisks Message-ID: <20191130184512.23c6faaa@lwn.net> In-Reply-To: References: <20191130180301.5c39d8a4@lwn.net> Organization: LWN.net MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sat, 30 Nov 2019 17:20:10 -0800 Linus Torvalds wrote: > Do you use some special options for git? Like --whitespace=nowarn or > --3way or something like that? Sigh, that has to be it. I have --ignore-whitespace in my script. When I take that option out, the patch in question no longer applies. Docs patches often come from relatively new folks, and I've found that I needed that to apply a lot of their patches. But clearly that was not a good choice; among other things, I've lost the opportunity to tell people when their patches have the types of whitespace issues that this option covers over. I've taken it out of the script and will only use it by hand in cases where I'm sure that it won't cause problems. Sorry for the screwup... jon