diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 16:13:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 16:13:56 -0700 |
| commit | e19eede54240d64b4baf9b0df4dfb8191f7ae48b (patch) | |
| tree | b89be38417badbbe7877fc430df37de3c74c9ab5 | |
| parent | f0728bfeb21a24bbb7d5ad1828b67a359550fa17 (diff) | |
| parent | 3cb4d29a2633170208c96240c7e85148679ceee3 (diff) | |
| download | linux-e19eede54240d64b4baf9b0df4dfb8191f7ae48b.tar.bz2 | |
Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull dmi update from Jean Delvare.
* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
MAINTAINERS: The DMI/SMBIOS tree has moved
firmware/dmi: Include product_sku info to modalias
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/firmware/dmi-id.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c17055895e2d..5780300d9b0d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5443,7 +5443,7 @@ F: drivers/hwmon/dme1737.c DMI/SMBIOS SUPPORT M: Jean Delvare <jdelvare@suse.com> S: Maintained -T: quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi-for-next F: Documentation/ABI/testing/sysfs-firmware-dmi-tables F: drivers/firmware/dmi-id.c F: drivers/firmware/dmi_scan.c diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index 86d71b0212b1..4d5421d14a41 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c @@ -85,6 +85,7 @@ static ssize_t get_modalias(char *buffer, size_t buffer_size) { "svn", DMI_SYS_VENDOR }, { "pn", DMI_PRODUCT_NAME }, { "pvr", DMI_PRODUCT_VERSION }, + { "sku", DMI_PRODUCT_SKU }, { "rvn", DMI_BOARD_VENDOR }, { "rn", DMI_BOARD_NAME }, { "rvr", DMI_BOARD_VERSION }, |