[PATCH] net: sort Kconfig menu items alphabetically

From: Bjorn Helgaas <bhelgaas@google.com>

6c541b4595a2 ("net: ethernet: Sort Kconfig sourcing alphabetically")
sorted Kconfig sourcing based on directory names, but in a couple cases,
the menu item text is quite different from the directory name and is not
sorted correctly:

  drivers/net/ethernet/neterion/Kconfig    => "Exar devices"
  drivers/net/ethernet/brocade/Kconfig     => "QLogic BR-series devices"

Move these entries so the Kconfig menu items are sorted.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/net/ethernet/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index af766fd61151..b21febba458e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig

@@ -34,7 +34,6 @@ source "drivers/net/ethernet/arc/Kconfig"
 source "drivers/net/ethernet/atheros/Kconfig"
 source "drivers/net/ethernet/aurora/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
-source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/cadence/Kconfig"
 source "drivers/net/ethernet/calxeda/Kconfig"
 source "drivers/net/ethernet/cavium/Kconfig"

@@ -71,6 +70,7 @@ config DNET
 source "drivers/net/ethernet/dec/Kconfig"
 source "drivers/net/ethernet/dlink/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
+source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/ezchip/Kconfig"
 source "drivers/net/ethernet/faraday/Kconfig"
 source "drivers/net/ethernet/freescale/Kconfig"

@@ -81,7 +81,6 @@ source "drivers/net/ethernet/huawei/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
-source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/xscale/Kconfig"
 
 config JME

@@ -160,6 +159,7 @@ config ETHOC
 source "drivers/net/ethernet/packetengines/Kconfig"
 source "drivers/net/ethernet/pasemi/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
+source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/qualcomm/Kconfig"
 source "drivers/net/ethernet/rdc/Kconfig"
 source "drivers/net/ethernet/realtek/Kconfig"

On Mon, Jul 23, 2018 at 04:01:14PM -0500, Bjorn Helgaas wrote:

From: Bjorn Helgaas <bhelgaas@google.com>

6c541b4595a2 ("net: ethernet: Sort Kconfig sourcing alphabetically")
sorted Kconfig sourcing based on directory names, but in a couple cases,
the menu item text is quite different from the directory name and is not
sorted correctly:

  drivers/net/ethernet/neterion/Kconfig    => "Exar devices"

Stupid question, does it make more sense to clarify the names in the
Kconfig to more naturally follow what people are expecting?  In the
case of Neterion, it was standalone for several years, then aquired by
Exar and shutdown in 11 months without ever making any Exar branded
adatpers.  Users, if they still exist, would probably think of it as
Neterion and not Exar (as there have been no follow-on adapters and I
don't believe any plans to ever do so).

So, this might be better as a rename of the Kconfig to something like
"Neterion (Exar) devices".  Of course, there is a fair amount of Exar
names in the Kconfig.  If you agree, I can do a clean-up of this to
match the expectations.

Thoughts?

Thanks,
Jon

From: Jon Mason <jdmason@kudzu.us>
Date: Tue, 24 Jul 2018 11:43:41 -0400

On Mon, Jul 23, 2018 at 04:01:14PM -0500, Bjorn Helgaas wrote:

quoted

From: Bjorn Helgaas <bhelgaas@google.com>

6c541b4595a2 ("net: ethernet: Sort Kconfig sourcing alphabetically")
sorted Kconfig sourcing based on directory names, but in a couple cases,
the menu item text is quite different from the directory name and is not
sorted correctly:

  drivers/net/ethernet/neterion/Kconfig    => "Exar devices"

Stupid question, does it make more sense to clarify the names in the
Kconfig to more naturally follow what people are expecting?  In the
case of Neterion, it was standalone for several years, then aquired by
Exar and shutdown in 11 months without ever making any Exar branded
adatpers.  Users, if they still exist, would probably think of it as
Neterion and not Exar (as there have been no follow-on adapters and I
don't believe any plans to ever do so).

So, this might be better as a rename of the Kconfig to something like
"Neterion (Exar) devices".  Of course, there is a fair amount of Exar
names in the Kconfig.  If you agree, I can do a clean-up of this to
match the expectations.

Thoughts?

I think this is a better way to handle this.

That way, a developer can read the Kconfig file and see if the entries
are sorted properly without having to check the text of every
sub-directory entry.