All of lore.kernel.org
 help / color / mirror / Atom feed
From: helgaas at kernel.org (Bjorn Helgaas)
Subject: [Linux-kernel-mentees] [PATCH] lspci: Make output for empty range behind a bridge consistent
Date: Thu, 9 May 2019 07:42:42 -0500	[thread overview]
Message-ID: <20190509124242.GA168700@google.com> (raw)
In-Reply-To: <20190509053540.GA29343@asus>

On Wed, May 08, 2019 at 11:35:41PM -0600, Kelsey Skunberg wrote:
> On Wed, May 08, 2019 at 08:40:36AM -0500, Bjorn Helgaas wrote:
> > On Tue, May 07, 2019 at 11:21:18PM -0600, Kelsey Skunberg wrote:

> > > show_range() is only called when verbose (-v). Code checking for
> > > 'not verbose' is not needed.
> > 
> > Nice simplification!  I would split this into a separate patch because
> > it's not logically related to changing the text and it will make both
> > patches easier to read.  Also, it would make it easy for Martin to
> > choose whether he wants to apply one, both, or neither.
> 
> In the event the two patches would cause a merge conflict if both
> applied, is it still proper to submit them both? I can place the
> '!verbose' check back into this patch, though there would still be
> some changes to make it fit the new structure. 

The two patches would constitute a "series".  If applied in order they
should not cause conflicts.  What I would do in this situation is make
the first one do the cleanup because that should be uncontroversial
(if it's correct and causes no user-visible change) and make the
second do the wording change.  Then Martin could easily apply the
first and ignore the second.

> Ah! I was so focused on the leading whitespace I didn't check the trailing!
> I'll keep closer attention to this. Thank you! 

Many editors can highlight whitespace errors for you.  I have the
following in my .vimrc:

  " Show trailing whitespace and spaces before tabs
  hi link localWhitespaceError Error
  au Syntax * syn match localWhitespaceError /\(\zs\%#\|\s\)\+$/ display
  au Syntax * syn match localWhitespaceError / \+\ze\t/ display

But in general you should look through the diff and make sure it
includes only the changes you intend.

Bjorn

WARNING: multiple messages have this Message-ID (diff)
From: helgaas@kernel.org (Bjorn Helgaas)
Subject: [Linux-kernel-mentees] [PATCH] lspci: Make output for empty range behind a bridge consistent
Date: Thu, 9 May 2019 07:42:42 -0500	[thread overview]
Message-ID: <20190509124242.GA168700@google.com> (raw)
Message-ID: <20190509124242.yvrqEgwGly7P6yF6JcqbKFTXrOC7wl8xO7Bri-HAvl0@z> (raw)
In-Reply-To: <20190509053540.GA29343@asus>

On Wed, May 08, 2019 at 11:35:41PM -0600, Kelsey Skunberg wrote:
> On Wed, May 08, 2019 at 08:40:36AM -0500, Bjorn Helgaas wrote:
> > On Tue, May 07, 2019 at 11:21:18PM -0600, Kelsey Skunberg wrote:

> > > show_range() is only called when verbose (-v). Code checking for
> > > 'not verbose' is not needed.
> > 
> > Nice simplification!  I would split this into a separate patch because
> > it's not logically related to changing the text and it will make both
> > patches easier to read.  Also, it would make it easy for Martin to
> > choose whether he wants to apply one, both, or neither.
> 
> In the event the two patches would cause a merge conflict if both
> applied, is it still proper to submit them both? I can place the
> '!verbose' check back into this patch, though there would still be
> some changes to make it fit the new structure. 

The two patches would constitute a "series".  If applied in order they
should not cause conflicts.  What I would do in this situation is make
the first one do the cleanup because that should be uncontroversial
(if it's correct and causes no user-visible change) and make the
second do the wording change.  Then Martin could easily apply the
first and ignore the second.

> Ah! I was so focused on the leading whitespace I didn't check the trailing!
> I'll keep closer attention to this. Thank you! 

Many editors can highlight whitespace errors for you.  I have the
following in my .vimrc:

  " Show trailing whitespace and spaces before tabs
  hi link localWhitespaceError Error
  au Syntax * syn match localWhitespaceError /\(\zs\%#\|\s\)\+$/ display
  au Syntax * syn match localWhitespaceError / \+\ze\t/ display

But in general you should look through the diff and make sure it
includes only the changes you intend.

Bjorn

  reply	other threads:[~2019-05-09 12:42 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08  5:21 [Linux-kernel-mentees] [PATCH] lspci: Make output for empty range behind a bridge consistent skunberg.kelsey
2019-05-08  5:21 ` Kelsey Skunberg
2019-05-08 13:40 ` helgaas
2019-05-08 13:40   ` Bjorn Helgaas
2019-05-09  5:35   ` skunberg.kelsey
2019-05-09  5:35     ` Kelsey Skunberg
2019-05-09 12:42     ` helgaas [this message]
2019-05-09 12:42       ` Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190509124242.GA168700@google.com \
    --to=unknown@example.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.