diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-11-11 03:05:28 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-11-22 13:37:46 +0000 |
| commit | 7fd9c93a8ce52264c1c63d8ee0ea0f17c4d6fec1 (patch) | |
| tree | 3f75785c15e70f583c2482d1f95c5d507bb44d08 /pkg/subsystem/linux | |
| parent | cdd4e8035d2aa20897d97cece8607c8177e0aacd (diff) | |
pkg/subsystem: regenerate Linux subsystems
Adjust subsystem generation code to the latest changes.
Diffstat (limited to 'pkg/subsystem/linux')
| -rw-r--r-- | pkg/subsystem/linux/names.go | 15 | ||||
| -rw-r--r-- | pkg/subsystem/linux/rules.go | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkg/subsystem/linux/names.go b/pkg/subsystem/linux/names.go index 19f2c2cb3..02683755b 100644 --- a/pkg/subsystem/linux/names.go +++ b/pkg/subsystem/linux/names.go @@ -14,15 +14,15 @@ import ( // setSubsystemNames assigns unique names to the presented subsystems. // If it failed to assign a name to a subsystem, the Name field remains empty. func setSubsystemNames(list []*subsystem.Subsystem) error { - dups := map[string]bool{} + dups := map[string]string{} for _, item := range list { if item.Name == "" { continue } - if dups[item.Name] { - return fmt.Errorf("duplicate name: %s", item.Name) + if dups[item.Name] != "" { + return fmt.Errorf("duplicate name: %q", item.Name) } - dups[item.Name] = true + dups[item.Name] = item.Name } for _, item := range list { @@ -38,11 +38,11 @@ func setSubsystemNames(list []*subsystem.Subsystem) error { if !validateName(name) { return fmt.Errorf("failed to extract a name from %s", email) } - if dups[name] { - return fmt.Errorf("duplicate subsystem name: %s", item.Name) + if dups[name] != "" { + return fmt.Errorf("duplicate subsystem name: %q and %q", dups[name], email) } item.Name = name - dups[name] = true + dups[name] = email } return nil } @@ -113,6 +113,7 @@ var ( "kernel-tls-handshake@lists.linux.dev": "tls", "bcm-kernel-feedback-list@broadcom.com": "broadcom", "linux@ew.tq-group.com": "tq-systems", + "linux-imx@nxp.com": "nxp", } stripPrefixes = []string{"linux-"} stripSuffixes = []string{ diff --git a/pkg/subsystem/linux/rules.go b/pkg/subsystem/linux/rules.go index f597e53dd..b9e78a9a5 100644 --- a/pkg/subsystem/linux/rules.go +++ b/pkg/subsystem/linux/rules.go @@ -90,7 +90,7 @@ var ( "kernfs": {"KERNFS"}, "udf": {"UDF FILESYSTEM"}, "nfc": {"NFC SUBSYSTEM"}, - "iomap": {"IOMAP FILESYSTEM LIBRARY"}, + "iomap": {"FILESYSTEMS [IOMAP]"}, "xfs": {"XFS FILESYSTEM"}, }, noReminders: map[string]struct{}{ |