diff --git a/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch b/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch new file mode 100644 index 0000000..ffe9b63 --- /dev/null +++ b/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch @@ -0,0 +1,34 @@ +From cd1338b7abe6d300ce66051f3490f35c8b4d1443 Mon Sep 17 00:00:00 2001 +From: Igor Zhbanov +Date: Tue, 15 Oct 2013 14:35:13 +0400 +Subject: [PATCH] Fix for SIGSEGV in systemd-bootchart on short-living + processes + +The function svg_ps_bars() dereferencess NULL pointer in the line + endtime = ps->last->sampledata->sampletime; +because of partially initialized ps_struct (ps->last == NULL). + +If some process terminates between scaning /proc directory in the log_sample() +function and reading additional information from /proc/PID/... files, +the files couldn't be read, the loop will be continued and partially +initialized structure returned. +--- + src/bootchart/store.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootchart/store.c b/src/bootchart/store.c +index f8c97c2..7f86cfe 100644 +--- a/src/bootchart/store.c ++++ b/src/bootchart/store.c +@@ -275,7 +275,7 @@ schedstat_next: + pscount++; + + /* mark our first sample */ +- ps->first = ps->sample; ++ ps->first = ps->last = ps->sample; + ps->sample->runtime = atoll(rt); + ps->sample->waittime = atoll(wt); + +-- +1.8.4.652.g0d6e0ce + diff --git a/0042-build-sys-libudev-get-rid-of-the-needless-selinux-li.patch b/0042-build-sys-libudev-get-rid-of-the-needless-selinux-li.patch deleted file mode 100644 index eb44130..0000000 --- a/0042-build-sys-libudev-get-rid-of-the-needless-selinux-li.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 90144377494d06804b55b915e1321a2e85a957fe Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Tue, 15 Oct 2013 02:11:56 +0200 -Subject: [PATCH] build-sys: libudev - get rid of the needless selinux linking - (again) - ---- - Makefile.am | 6 +----- - src/libudev/libudev.pc.in | 1 - - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8d9c587..94d3358 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2141,9 +2141,7 @@ libudev_la_LDFLAGS = \ - - libudev_la_LIBADD = \ - libsystemd-shared.la \ -- libsystemd-label.la \ - libsystemd-daemon-internal.la \ -- $(RT_LIBS) \ - libsystemd-id128-internal.la - - pkgconfiglib_DATA += \ -@@ -2315,7 +2313,6 @@ libudev_core_la_LIBADD = \ - libudev-private.la \ - libsystemd-label.la \ - libsystemd-daemon-internal.la \ -- $(RT_LIBS) \ - libsystemd-shared.la \ - $(BLKID_LIBS) \ - $(KMOD_LIBS) -@@ -2377,6 +2374,7 @@ udevadm_SOURCES = \ - - udevadm_LDADD = \ - libudev-core.la \ -+ libsystemd-label.la \ - libsystemd-shared.la - - # Update hwdb on installation. Do not bother if installing -@@ -2704,7 +2702,6 @@ libsystemd_id128_la_LDFLAGS = \ - - libsystemd_id128_la_LIBADD = \ - libsystemd-shared.la \ -- libsystemd-label.la \ - libsystemd-daemon-internal.la \ - $(RT_LIBS) - -@@ -2956,7 +2953,6 @@ libsystemd_journal_internal_la_CFLAGS = \ - $(AM_CFLAGS) - - libsystemd_journal_internal_la_LIBADD = \ -- libsystemd-label.la \ - libsystemd-audit.la \ - libsystemd-daemon.la \ - libudev.la \ -diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in -index 2b183e9..a0f3f52 100644 ---- a/src/libudev/libudev.pc.in -+++ b/src/libudev/libudev.pc.in -@@ -14,5 +14,4 @@ Name: libudev - Description: Library to access udev device information - Version: @VERSION@ - Libs: -L${libdir} -ludev --Libs.private: -lrt - Cflags: -I${includedir} --- -1.8.4.652.g0d6e0ce - diff --git a/0043-build-sys-libsystemd-id128-get-rid-of-the-needless-s.patch b/0043-build-sys-libsystemd-id128-get-rid-of-the-needless-s.patch deleted file mode 100644 index 9f44f31..0000000 --- a/0043-build-sys-libsystemd-id128-get-rid-of-the-needless-s.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c028fc20a15e274f1bfa0febbc21d5ac5ea84be4 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Tue, 15 Oct 2013 02:26:37 +0200 -Subject: [PATCH] build-sys: libsystemd-id128 - get rid of the needless selinux - linking (again) - -$ ldd libsystemd-id128.so - linux-vdso.so.1 => (0x00007fffce377000) - libselinux.so.1 => /lib64/libselinux.so.1 (0x00007f4de1fc1000) - librt.so.1 => /lib64/librt.so.1 (0x00007f4de1db9000) - libdl.so.2 => /lib64/libdl.so.2 (0x00007f4de1bb4000) - libc.so.6 => /lib64/libc.so.6 (0x00007f4de17f5000) - /lib64/ld-linux-x86-64.so.2 (0x00007f4de2406000) - libpcre.so.1 => /lib64/libpcre.so.1 (0x00007f4de158f000) - libpthread.so.0 => /lib64/libpthread.so.0 (0x00007f4de1371000) - -$ ldd libsystemd-id128.so - linux-vdso.so.1 => (0x00007fff25187000) - libdl.so.2 => /lib64/libdl.so.2 (0x00007f41a3964000) - libc.so.6 => /lib64/libc.so.6 (0x00007f41a35a5000) - /lib64/ld-linux-x86-64.so.2 (0x00007f41a3d89000) ---- - Makefile.am | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 94d3358..5382547 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2701,9 +2701,7 @@ libsystemd_id128_la_LDFLAGS = \ - -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym - - libsystemd_id128_la_LIBADD = \ -- libsystemd-shared.la \ -- libsystemd-daemon-internal.la \ -- $(RT_LIBS) -+ libsystemd-shared.la - - libsystemd_id128_internal_la_SOURCES = \ - $(libsystemd_id128_la_SOURCES) --- -1.8.4.652.g0d6e0ce - diff --git a/0043-man-document-the-b-special-boot-option.patch b/0043-man-document-the-b-special-boot-option.patch new file mode 100644 index 0000000..32ac2db --- /dev/null +++ b/0043-man-document-the-b-special-boot-option.patch @@ -0,0 +1,37 @@ +From 3dca881397af86883639ab25f27dfb605acc2a2c Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 15 Oct 2013 08:58:50 +0200 +Subject: [PATCH] man: document the -b special boot option + +--- + man/kernel-command-line.xml | 1 + + man/systemd.xml | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml +index cc267a3..abe68e5 100644 +--- a/man/kernel-command-line.xml ++++ b/man/kernel-command-line.xml +@@ -123,6 +123,7 @@ + + + ++ -b + emergency + single + s +diff --git a/man/systemd.xml b/man/systemd.xml +index fe6e331..85c06d3 100644 +--- a/man/systemd.xml ++++ b/man/systemd.xml +@@ -1149,6 +1149,7 @@ + + + ++ -b + emergency + + Boot into emergency +-- +1.8.4.652.g0d6e0ce + diff --git a/0044-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch b/0044-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch deleted file mode 100644 index 1d9cf23..0000000 --- a/0044-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7bd470024862982a74c3850686c99ccb29989fae Mon Sep 17 00:00:00 2001 -From: Igor Zhbanov -Date: Tue, 15 Oct 2013 14:35:13 +0400 -Subject: [PATCH] Fix for SIGSEGV in systemd-bootchart on short-living - processes - -The function svg_ps_bars() dereferencess NULL pointer in the line - endtime = ps->last->sampledata->sampletime; -because of partially initialized ps_struct (ps->last == NULL). - -If some process terminates between scaning /proc directory in the log_sample() -function and reading additional information from /proc/PID/... files, -the files couldn't be read, the loop will be continued and partially -initialized structure returned. ---- - src/bootchart/store.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bootchart/store.c b/src/bootchart/store.c -index f8c97c2..7f86cfe 100644 ---- a/src/bootchart/store.c -+++ b/src/bootchart/store.c -@@ -275,7 +275,7 @@ schedstat_next: - pscount++; - - /* mark our first sample */ -- ps->first = ps->sample; -+ ps->first = ps->last = ps->sample; - ps->sample->runtime = atoll(rt); - ps->sample->waittime = atoll(wt); - --- -1.8.4.652.g0d6e0ce - diff --git a/0044-logind-allow-unprivileged-session-device-access.patch b/0044-logind-allow-unprivileged-session-device-access.patch new file mode 100644 index 0000000..ad52a04 --- /dev/null +++ b/0044-logind-allow-unprivileged-session-device-access.patch @@ -0,0 +1,49 @@ +From 6d3e661d97dd6157381ca1dd52b839e2049b86b5 Mon Sep 17 00:00:00 2001 +From: David Herrmann +Date: Tue, 15 Oct 2013 21:13:39 +0200 +Subject: [PATCH] logind: allow unprivileged session-device access + +The session-device/control API was introduced for unprivileged device +access from within a session. Add the required dbus policy to the default +logind policies. + +Note: logind validates that only root and the user of a session can +use the API. Furthermore, only a single API user gets access at a time. +--- + src/login/org.freedesktop.login1.conf | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf +index 0407609..04e735e 100644 +--- a/src/login/org.freedesktop.login1.conf ++++ b/src/login/org.freedesktop.login1.conf +@@ -148,6 +148,26 @@ + send_interface="org.freedesktop.login1.Session" + send_member="SetIdleHint"/> + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +-- +1.8.4.652.g0d6e0ce + diff --git a/0045-man-document-the-b-special-boot-option.patch b/0045-man-document-the-b-special-boot-option.patch deleted file mode 100644 index a57abda..0000000 --- a/0045-man-document-the-b-special-boot-option.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e31ed70d82d55fd8ed17fee4efe010575ed2ab2e Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 15 Oct 2013 08:58:50 +0200 -Subject: [PATCH] man: document the -b special boot option - ---- - man/kernel-command-line.xml | 1 + - man/systemd.xml | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml -index cc267a3..abe68e5 100644 ---- a/man/kernel-command-line.xml -+++ b/man/kernel-command-line.xml -@@ -123,6 +123,7 @@ - - - -+ -b - emergency - single - s -diff --git a/man/systemd.xml b/man/systemd.xml -index fe6e331..85c06d3 100644 ---- a/man/systemd.xml -+++ b/man/systemd.xml -@@ -1149,6 +1149,7 @@ - - - -+ -b - emergency - - Boot into emergency --- -1.8.4.652.g0d6e0ce - diff --git a/0045-rules-expose-loop-block-devices-to-systemd.patch b/0045-rules-expose-loop-block-devices-to-systemd.patch new file mode 100644 index 0000000..0b3a61b --- /dev/null +++ b/0045-rules-expose-loop-block-devices-to-systemd.patch @@ -0,0 +1,35 @@ +From 78846d19d3569cf637d2e37c10e75395ebcf9d06 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 16 Oct 2013 02:49:54 +0200 +Subject: [PATCH] rules: expose loop block devices to systemd + +Since the kernel no longer exposes a large number of "dead" loop devices +it is OK to expose them now in systemd, so let's do that. This has the +benefit that mount dependencies on loop devices start to work. +--- + rules/99-systemd.rules.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index bbb7d0c..3c99475 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -11,12 +11,12 @@ SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd" + + KERNEL=="vport*", TAG+="systemd" + +-SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd" +-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" ++SUBSYSTEM=="block", KERNEL!="ram*", TAG+="systemd" ++SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" + + # Ignore encrypted devices with no identified superblock on it, since + # we are probably still calling mke2fs or mkswap on it. +-SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" ++SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" + + # Ignore raid devices that are not yet assembled and started + SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" +-- +1.8.4.652.g0d6e0ce + diff --git a/0046-logind-allow-unprivileged-session-device-access.patch b/0046-logind-allow-unprivileged-session-device-access.patch deleted file mode 100644 index 5e55117..0000000 --- a/0046-logind-allow-unprivileged-session-device-access.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8345f2e25909cc24628d99eee6674e8ab7ebdb20 Mon Sep 17 00:00:00 2001 -From: David Herrmann -Date: Tue, 15 Oct 2013 21:13:39 +0200 -Subject: [PATCH] logind: allow unprivileged session-device access - -The session-device/control API was introduced for unprivileged device -access from within a session. Add the required dbus policy to the default -logind policies. - -Note: logind validates that only root and the user of a session can -use the API. Furthermore, only a single API user gets access at a time. ---- - src/login/org.freedesktop.login1.conf | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf -index 0407609..04e735e 100644 ---- a/src/login/org.freedesktop.login1.conf -+++ b/src/login/org.freedesktop.login1.conf -@@ -148,6 +148,26 @@ - send_interface="org.freedesktop.login1.Session" - send_member="SetIdleHint"/> - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - --- -1.8.4.652.g0d6e0ce - diff --git a/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch b/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch new file mode 100644 index 0000000..7fe4937 --- /dev/null +++ b/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch @@ -0,0 +1,38 @@ +From 9a3296571683a6a3eaee44d18db91ca113841da6 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 16 Oct 2013 02:51:24 +0200 +Subject: [PATCH] rules: don't limit some of the rules to the "add" action + +Devices should show up in systemd regardless whether the user invoked +"udevadm trigger" or not. Before this change some devices might have +suddenly disappeared due issuing that command. + +Conflicts: + rules/99-systemd.rules.in +--- + rules/99-systemd.rules.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index 3c99475..307f18f 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -53,12 +53,12 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy + + # Pull in backlight save/restore for all firmware backlight devices + +-ACTION=="add", SUBSYSTEM=="backlight", ATTR{type}=="firmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service" ++SUBSYSTEM=="backlight", ATTR{type}=="firmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service" + + # Asynchronously mount file systems implemented by these modules as + # soon as they are loaded. + +-SUBSYSTEM=="module", KERNEL=="fuse", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-fs-fuse-connections.mount" +-SUBSYSTEM=="module", KERNEL=="configfs", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-kernel-config.mount" ++SUBSYSTEM=="module", KERNEL=="fuse", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-fs-fuse-connections.mount" ++SUBSYSTEM=="module", KERNEL=="configfs", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-kernel-config.mount" + + LABEL="systemd_end" +-- +1.8.4.652.g0d6e0ce + diff --git a/0047-rules-expose-loop-block-devices-to-systemd.patch b/0047-rules-expose-loop-block-devices-to-systemd.patch deleted file mode 100644 index 98f1f5c..0000000 --- a/0047-rules-expose-loop-block-devices-to-systemd.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0316e2ae1224abc57cffe8ec54326b4b55b0372e Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Wed, 16 Oct 2013 02:49:54 +0200 -Subject: [PATCH] rules: expose loop block devices to systemd - -Since the kernel no longer exposes a large number of "dead" loop devices -it is OK to expose them now in systemd, so let's do that. This has the -benefit that mount dependencies on loop devices start to work. ---- - rules/99-systemd.rules.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in -index bbb7d0c..3c99475 100644 ---- a/rules/99-systemd.rules.in -+++ b/rules/99-systemd.rules.in -@@ -11,12 +11,12 @@ SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd" - - KERNEL=="vport*", TAG+="systemd" - --SUBSYSTEM=="block", KERNEL!="ram*|loop*", TAG+="systemd" --SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" -+SUBSYSTEM=="block", KERNEL!="ram*", TAG+="systemd" -+SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" - - # Ignore encrypted devices with no identified superblock on it, since - # we are probably still calling mke2fs or mkswap on it. --SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" -+SUBSYSTEM=="block", KERNEL!="ram*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" - - # Ignore raid devices that are not yet assembled and started - SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" --- -1.8.4.652.g0d6e0ce - diff --git a/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch b/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch new file mode 100644 index 0000000..f1e91c9 --- /dev/null +++ b/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch @@ -0,0 +1,37 @@ +From bc3ae365890fa52f9beca1a67744a0fcbdcb5f82 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 17 Oct 2013 03:20:46 +0200 +Subject: [PATCH] tmpfiles: log unaccessible FUSE mount points only as debug + message + +--- + src/tmpfiles/tmpfiles.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 8122d6a..239e56b 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -275,12 +275,15 @@ static int dir_cleanup( + continue; + + if (fstatat(dirfd(d), dent->d_name, &s, AT_SYMLINK_NOFOLLOW) < 0) { ++ if (errno == ENOENT) ++ continue; + +- if (errno != ENOENT) { ++ /* FUSE, NFS mounts, SELinux might return EACCES */ ++ if (errno == EACCES) ++ log_debug("stat(%s/%s) failed: %m", p, dent->d_name); ++ else + log_error("stat(%s/%s) failed: %m", p, dent->d_name); +- r = -errno; +- } +- ++ r = -errno; + continue; + } + +-- +1.8.4.652.g0d6e0ce + diff --git a/0048-hwdb-update.patch b/0048-hwdb-update.patch new file mode 100644 index 0000000..9e22ea1 --- /dev/null +++ b/0048-hwdb-update.patch @@ -0,0 +1,1632 @@ +From d7490751d3036a2b01ac74cdf4b632803f0b9ea9 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Sun, 20 Oct 2013 01:12:29 +0200 +Subject: [PATCH] hwdb: update + +--- + hwdb/20-OUI.hwdb | 391 +++++++++++++++++++++++++++++++++++++++++- + hwdb/20-pci-vendor-model.hwdb | 216 ++++++++++++++++++++--- + 2 files changed, 578 insertions(+), 29 deletions(-) + +diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb +index e913b28..5067167 100644 +--- a/hwdb/20-OUI.hwdb ++++ b/hwdb/20-OUI.hwdb +@@ -12278,7 +12278,7 @@ OUI:40D85501B* + ID_OUI_FROM_DATABASE=Audio Enhancement + + OUI:40D85501C* +- ID_OUI_FROM_DATABASE=BERG ++ ID_OUI_FROM_DATABASE=BERG Cloud Limited + + OUI:40D85501D* + ID_OUI_FROM_DATABASE=Scharco Elektronik GmbH +@@ -13324,6 +13324,93 @@ OUI:40D85517B* + OUI:40D85517C* + ID_OUI_FROM_DATABASE=Critical Link + ++OUI:40D85517D* ++ ID_OUI_FROM_DATABASE=Kiwigrid GmbH ++ ++OUI:40D85517E* ++ ID_OUI_FROM_DATABASE=TOKHATEC ++ ++OUI:40D85517F* ++ ID_OUI_FROM_DATABASE=Telvent ++ ++OUI:40D855180* ++ ID_OUI_FROM_DATABASE=BroadSoft Inc ++ ++OUI:40D855181* ++ ID_OUI_FROM_DATABASE=eROCCA ++ ++OUI:40D855182* ++ ID_OUI_FROM_DATABASE=Georg Neumann GmbH ++ ++OUI:40D855183* ++ ID_OUI_FROM_DATABASE=EMAC, Inc. ++ ++OUI:40D855184* ++ ID_OUI_FROM_DATABASE=Satkirit Ltd ++ ++OUI:40D855185* ++ ID_OUI_FROM_DATABASE=Standard Change Makers ++ ++OUI:40D855186* ++ ID_OUI_FROM_DATABASE=KST technology ++ ++OUI:40D855187* ++ ID_OUI_FROM_DATABASE=CDEX Corp. ++ ++OUI:40D855188* ++ ID_OUI_FROM_DATABASE=Array Corporation ++ ++OUI:40D855189* ++ ID_OUI_FROM_DATABASE=Yoozma Corporation ++ ++OUI:40D85518A* ++ ID_OUI_FROM_DATABASE=Aplex Technology Inc. ++ ++OUI:40D85518B* ++ ID_OUI_FROM_DATABASE=Diagnosys Test Systems Ltd ++ ++OUI:40D85518C* ++ ID_OUI_FROM_DATABASE=EOS S.r.l. ++ ++OUI:40D85518D* ++ ID_OUI_FROM_DATABASE=Zoe Medical ++ ++OUI:40D85518E* ++ ID_OUI_FROM_DATABASE=Kerun Visual Technology Co., Ltd.(Shenzhen) ++ ++OUI:40D85518F* ++ ID_OUI_FROM_DATABASE=Beat Sensing co. , ltd. ++ ++OUI:40D855190* ++ ID_OUI_FROM_DATABASE=Spider Tecnologia Ind. e Com Ltda ++ ++OUI:40D855191* ++ ID_OUI_FROM_DATABASE=Soukai Electric ++ ++OUI:40D855192* ++ ID_OUI_FROM_DATABASE=GENERAL DYNAMICS C4 SYSTEMS ++ ++OUI:40D855193* ++ ID_OUI_FROM_DATABASE=FORZA SILICON CORP. ++ ++OUI:40D855194* ++ ID_OUI_FROM_DATABASE=RF Code ++ ++OUI:40D855195* ++ ID_OUI_FROM_DATABASE=TONNA ELECTRONIQUE ++ ++OUI:40D855196* ++ ID_OUI_FROM_DATABASE=Advanced Micro Controls Inc. ++ ++OUI:40D855197* ++ ID_OUI_FROM_DATABASE=Berg Cloud Limited ++ ++OUI:40D855198* ++ ID_OUI_FROM_DATABASE=devboards GmbH ++ ++OUI:40D855199* ++ ID_OUI_FROM_DATABASE=PRESSOL Schmiergeraete GmbH ++ + OUI:000000* + ID_OUI_FROM_DATABASE=XEROX CORPORATION + +@@ -46883,7 +46970,7 @@ OUI:0080B7* + ID_OUI_FROM_DATABASE=STELLAR COMPUTER + + OUI:0080B8* +- ID_OUI_FROM_DATABASE=BUG, INCORPORATED ++ ID_OUI_FROM_DATABASE=B.U.G. MORISEIKI, INCORPORATED + + OUI:0080B9* + ID_OUI_FROM_DATABASE=ARCHE TECHNOLIGIES INC. +@@ -51589,6 +51676,9 @@ OUI:04F7E4* + OUI:04F8C2* + ID_OUI_FROM_DATABASE=Flaircomm Microelectronics, Inc. + ++OUI:04F938* ++ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD ++ + OUI:04FE31* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -52132,6 +52222,9 @@ OUI:08512E* + OUI:085240* + ID_OUI_FROM_DATABASE=EbV Elektronikbau- und Vertriebs GmbH + ++OUI:085AE0* ++ ID_OUI_FROM_DATABASE=Recovision Technology Co., Ltd. ++ + OUI:085B0E* + ID_OUI_FROM_DATABASE=Fortinet, Inc. + +@@ -52297,6 +52390,9 @@ OUI:08FC52* + OUI:08FC88* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + ++OUI:08FD0E* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd ++ + OUI:0C0400* + ID_OUI_FROM_DATABASE=Jantar d.o.o. + +@@ -52306,6 +52402,9 @@ OUI:0C0535* + OUI:0C1105* + ID_OUI_FROM_DATABASE=Ringslink (Xiamen) Network Communication Technologies Co., Ltd + ++OUI:0C1262* ++ ID_OUI_FROM_DATABASE=zte corporation ++ + OUI:0C130B* + ID_OUI_FROM_DATABASE=Uniqoteq Ltd. + +@@ -52366,6 +52465,9 @@ OUI:0C4DE9* + OUI:0C51F7* + ID_OUI_FROM_DATABASE=CHAUVIN ARNOUX + ++OUI:0C54A5* ++ ID_OUI_FROM_DATABASE=PEGATRON CORPORATION ++ + OUI:0C5521* + ID_OUI_FROM_DATABASE=Axiros GmbH + +@@ -52627,6 +52729,9 @@ OUI:100D7F* + OUI:100E2B* + ID_OUI_FROM_DATABASE=NEC CASIO Mobile Communications + ++OUI:100E7E* ++ ID_OUI_FROM_DATABASE=Juniper networks ++ + OUI:1010B6* + ID_OUI_FROM_DATABASE=McCain Inc + +@@ -53023,6 +53128,9 @@ OUI:149090* + OUI:149448* + ID_OUI_FROM_DATABASE=BLU CASTLE S.A. + ++OUI:1499E2* ++ ID_OUI_FROM_DATABASE=Apple, Inc ++ + OUI:149FE8* + ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd. + +@@ -53095,6 +53203,9 @@ OUI:14EE9D* + OUI:14F0C5* + ID_OUI_FROM_DATABASE=Xtremio Ltd. + ++OUI:14F28E* ++ ID_OUI_FROM_DATABASE=ShenYang ZhongKe-Allwin Technology Co.LTD ++ + OUI:14F42A* + ID_OUI_FROM_DATABASE=Samsung Electronics + +@@ -53257,6 +53368,9 @@ OUI:1867B0* + OUI:186D99* + ID_OUI_FROM_DATABASE=Adanis Inc. + ++OUI:1879A2* ++ ID_OUI_FROM_DATABASE=GMJ ELECTRIC LIMITED ++ + OUI:187A93* + ID_OUI_FROM_DATABASE=AMICCOM Electronics Corporation + +@@ -53440,6 +53554,9 @@ OUI:1C19DE* + OUI:1C1D67* + ID_OUI_FROM_DATABASE=Shenzhen Huawei Communication Technologies Co., Ltd + ++OUI:1C1D86* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:1C334D* + ID_OUI_FROM_DATABASE=ITS Telecom + +@@ -53803,6 +53920,9 @@ OUI:20858C* + OUI:208984* + ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD + ++OUI:208986* ++ ID_OUI_FROM_DATABASE=zte corporation ++ + OUI:20918A* + ID_OUI_FROM_DATABASE=PROFALUX + +@@ -53929,6 +54049,9 @@ OUI:20FEDB* + OUI:2401C7* + ID_OUI_FROM_DATABASE=Cisco + ++OUI:24050F* ++ ID_OUI_FROM_DATABASE=MTN Electronic Co. Ltd ++ + OUI:240917* + ID_OUI_FROM_DATABASE=Devlin Electronics Limited + +@@ -54034,6 +54157,9 @@ OUI:249442* + OUI:249504* + ID_OUI_FROM_DATABASE=SFR + ++OUI:24A2E1* ++ ID_OUI_FROM_DATABASE=Apple, Inc ++ + OUI:24A42C* + ID_OUI_FROM_DATABASE=KOUKAAM a.s. + +@@ -54043,6 +54169,9 @@ OUI:24A43C* + OUI:24A495* + ID_OUI_FROM_DATABASE=Thales Canada Inc. + ++OUI:24A87D* ++ ID_OUI_FROM_DATABASE=Panasonic Automotive Systems Asia Pacific(Thailand)Co.,Ltd. ++ + OUI:24A937* + ID_OUI_FROM_DATABASE=PURE Storage + +@@ -54121,6 +54250,9 @@ OUI:24DBAC* + OUI:24DBAD* + ID_OUI_FROM_DATABASE=ShopperTrak RCT Corporation + ++OUI:24DBED* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd ++ + OUI:24DEC6* + ID_OUI_FROM_DATABASE=Aruba Networks + +@@ -54130,6 +54262,9 @@ OUI:24E271* + OUI:24E6BA* + ID_OUI_FROM_DATABASE=JSC Zavod im. Kozitsky + ++OUI:24E9B3* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:24EA40* + ID_OUI_FROM_DATABASE=Systeme Helmholz GmbH + +@@ -54547,6 +54682,9 @@ OUI:2C553C* + OUI:2C59E5* + ID_OUI_FROM_DATABASE=Hewlett Packard + ++OUI:2C5A05* ++ ID_OUI_FROM_DATABASE=Nokia Corporation ++ + OUI:2C5AA3* + ID_OUI_FROM_DATABASE=PROMATE ELECTRONIC CO.LTD + +@@ -54940,6 +55078,9 @@ OUI:3407FB* + OUI:340804* + ID_OUI_FROM_DATABASE=D-Link Corporation + ++OUI:3413A8* ++ ID_OUI_FROM_DATABASE=Mediplan Limited ++ + OUI:3413E8* + ID_OUI_FROM_DATABASE=Intel Corporate + +@@ -55321,6 +55462,9 @@ OUI:386E21* + OUI:3872C0* + ID_OUI_FROM_DATABASE=COMTREND + ++OUI:387B47* ++ ID_OUI_FROM_DATABASE=AKELA, Inc. ++ + OUI:388345* + ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO., LTD. + +@@ -55390,6 +55534,9 @@ OUI:38C7BA* + OUI:38C85C* + ID_OUI_FROM_DATABASE=Cisco SPVTG + ++OUI:38C9A9* ++ ID_OUI_FROM_DATABASE=SMART High Reliability Solutions, Inc. ++ + OUI:38CA97* + ID_OUI_FROM_DATABASE=Contour Design LLC + +@@ -55459,6 +55606,9 @@ OUI:3C081E* + OUI:3C096D* + ID_OUI_FROM_DATABASE=Powerhouse Dynamics + ++OUI:3C0E23* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:3C0FC1* + ID_OUI_FROM_DATABASE=KBC Networks + +@@ -55507,6 +55657,9 @@ OUI:3C300C* + OUI:3C363D* + ID_OUI_FROM_DATABASE=Nokia Corporation + ++OUI:3C36E4* ++ ID_OUI_FROM_DATABASE=Arris Group, Inc. ++ + OUI:3C3888* + ID_OUI_FROM_DATABASE=ConnectQuest, llc + +@@ -55672,6 +55825,9 @@ OUI:3CD0F8* + OUI:3CD16E* + ID_OUI_FROM_DATABASE=Telepower Communication Co., Ltd + ++OUI:3CD4D6* ++ ID_OUI_FROM_DATABASE=WirelessWERX, Inc ++ + OUI:3CD7DA* + ID_OUI_FROM_DATABASE=SK Mtek microelectronics(shenzhen)limited + +@@ -55771,6 +55927,9 @@ OUI:402CF4* + OUI:403004* + ID_OUI_FROM_DATABASE=Apple + ++OUI:403067* ++ ID_OUI_FROM_DATABASE=Conlog (Pty) Ltd ++ + OUI:40336C* + ID_OUI_FROM_DATABASE=Godrej & Boyce Mfg. co. ltd + +@@ -55918,6 +56077,9 @@ OUI:40B3FC* + OUI:40B4F0* + ID_OUI_FROM_DATABASE=Juniper Networks + ++OUI:40B6B1* ++ ID_OUI_FROM_DATABASE=SUNGSAM CO,.Ltd ++ + OUI:40B7F3* + ID_OUI_FROM_DATABASE=ARRIS Group, Inc. + +@@ -55972,6 +56134,9 @@ OUI:40ECF8* + OUI:40EF4C* + ID_OUI_FROM_DATABASE=Fihonest communication co.,Ltd + ++OUI:40F02F* ++ ID_OUI_FROM_DATABASE=Liteon Technology Corporation ++ + OUI:40F14C* + ID_OUI_FROM_DATABASE=ISE Europe SPRL + +@@ -56203,6 +56368,12 @@ OUI:44C233* + OUI:44C39B* + ID_OUI_FROM_DATABASE=OOO RUBEZH NPO + ++OUI:44C4A9* ++ ID_OUI_FROM_DATABASE=Opticom Communication, LLC ++ ++OUI:44C56F* ++ ID_OUI_FROM_DATABASE=NGN Easy Satfinder (Tianjin) Electronic Co., Ltd ++ + OUI:44C9A2* + ID_OUI_FROM_DATABASE=Greenwald Industries + +@@ -56362,6 +56533,9 @@ OUI:48B253* + OUI:48B8DE* + ID_OUI_FROM_DATABASE=HOMEWINS TECHNOLOGY CO.,LTD. + ++OUI:48B977* ++ ID_OUI_FROM_DATABASE=PulseOn Oy ++ + OUI:48B9C2* + ID_OUI_FROM_DATABASE=Teletics Inc. + +@@ -56659,9 +56833,15 @@ OUI:4CCC34* + OUI:4CD637* + ID_OUI_FROM_DATABASE=Qsono Electronics Co., Ltd + ++OUI:4CD9C4* ++ ID_OUI_FROM_DATABASE=Magneti Marelli Automotive Electronics (Guangzhou) Co. Ltd ++ + OUI:4CDF3D* + ID_OUI_FROM_DATABASE=TEAM ENGINEERS ADVANCE TECHNOLOGIES INDIA PVT LTD + ++OUI:4CE1BB* ++ ID_OUI_FROM_DATABASE=Zhuhai HiFocus Technology Co., Ltd. ++ + OUI:4CE676* + ID_OUI_FROM_DATABASE=Buffalo Inc. + +@@ -56701,6 +56881,9 @@ OUI:5011EB* + OUI:5017FF* + ID_OUI_FROM_DATABASE=Cisco + ++OUI:501AC5* ++ ID_OUI_FROM_DATABASE=Microsoft ++ + OUI:50206B* + ID_OUI_FROM_DATABASE=Emerson Climate Technologies Transportation Solutions + +@@ -56812,6 +56995,9 @@ OUI:507D02* + OUI:507E5D* + ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation + ++OUI:508569* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD ++ + OUI:5087B8* + ID_OUI_FROM_DATABASE=Nuvyyo Inc + +@@ -56995,6 +57181,9 @@ OUI:5435DF* + OUI:543968* + ID_OUI_FROM_DATABASE=Edgewater Networks Inc + ++OUI:5439DF* ++ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD ++ + OUI:543D37* + ID_OUI_FROM_DATABASE=Ruckus Wireless + +@@ -57055,6 +57244,9 @@ OUI:5481AD* + OUI:54847B* + ID_OUI_FROM_DATABASE=Digital Devices GmbH + ++OUI:54880E* ++ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD. ++ + OUI:548922* + ID_OUI_FROM_DATABASE=Zelfy Inc + +@@ -57439,6 +57631,9 @@ OUI:5C2479* + OUI:5C260A* + ID_OUI_FROM_DATABASE=Dell Inc. + ++OUI:5C2AEF* ++ ID_OUI_FROM_DATABASE=Open Access Pty Ltd ++ + OUI:5C3327* + ID_OUI_FROM_DATABASE=Spazio Italia srl + +@@ -57547,6 +57742,9 @@ OUI:5CA39D* + OUI:5CA3EB* + ID_OUI_FROM_DATABASE=Lokel s.r.o. + ++OUI:5CA48A* ++ ID_OUI_FROM_DATABASE=Cisco ++ + OUI:5CAC4C* + ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. + +@@ -58228,6 +58426,9 @@ OUI:64E161* + OUI:64E599* + ID_OUI_FROM_DATABASE=EFM Networks + ++OUI:64E625* ++ ID_OUI_FROM_DATABASE=Woxu Wireless Co., Ltd ++ + OUI:64E682* + ID_OUI_FROM_DATABASE=Apple + +@@ -58318,6 +58519,9 @@ OUI:683EEC* + OUI:684352* + ID_OUI_FROM_DATABASE=Bhuu Limited + ++OUI:684898* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd ++ + OUI:684B88* + ID_OUI_FROM_DATABASE=Galtronics Telemetry Inc. + +@@ -58573,6 +58777,9 @@ OUI:6C3A84* + OUI:6C3BE5* + ID_OUI_FROM_DATABASE=Hewlett Packard + ++OUI:6C3C53* ++ ID_OUI_FROM_DATABASE=SoundHawk Corp ++ + OUI:6C3E6D* + ID_OUI_FROM_DATABASE=Apple + +@@ -58912,6 +59119,9 @@ OUI:706582* + OUI:70704C* + ID_OUI_FROM_DATABASE=Purple Communications, Inc + ++OUI:7071B3* ++ ID_OUI_FROM_DATABASE=Brain Corporation ++ + OUI:7071BC* + ID_OUI_FROM_DATABASE=PEGATRON CORPORATION + +@@ -58936,6 +59146,9 @@ OUI:7076F0* + OUI:707BE8* + ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD + ++OUI:707C18* ++ ID_OUI_FROM_DATABASE=ADATA Technology Co., Ltd ++ + OUI:707E43* + ID_OUI_FROM_DATABASE=ARRIS Group, Inc. + +@@ -59128,6 +59341,9 @@ OUI:74372F* + OUI:743889* + ID_OUI_FROM_DATABASE=ANNAX Anzeigesysteme GmbH + ++OUI:743ECB* ++ ID_OUI_FROM_DATABASE=Gentrice tech ++ + OUI:744401* + ID_OUI_FROM_DATABASE=NETGEAR + +@@ -59533,6 +59749,9 @@ OUI:78A6BD* + OUI:78A714* + ID_OUI_FROM_DATABASE=Amphenol + ++OUI:78A873* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd ++ + OUI:78AB60* + ID_OUI_FROM_DATABASE=ABB Australia + +@@ -59644,6 +59863,9 @@ OUI:78E8B6* + OUI:78EC22* + ID_OUI_FROM_DATABASE=Shanghai Qihui Telecom Technology Co., LTD + ++OUI:78EC74* ++ ID_OUI_FROM_DATABASE=Kyland-USA ++ + OUI:78EF4C* + ID_OUI_FROM_DATABASE=Unetconvergence Co., Ltd. + +@@ -59749,6 +59971,9 @@ OUI:7C3E9D* + OUI:7C438F* + ID_OUI_FROM_DATABASE=E-Band Communications Corp. + ++OUI:7C444C* ++ ID_OUI_FROM_DATABASE=Entertainment Solutions, S.L. ++ + OUI:7C49B9* + ID_OUI_FROM_DATABASE=Plexus Manufacturing Sdn Bhd + +@@ -59911,6 +60136,9 @@ OUI:7CC8D7* + OUI:7CCB0D* + ID_OUI_FROM_DATABASE=Antaira Technologies, LLC + ++OUI:7CCD11* ++ ID_OUI_FROM_DATABASE=MS-Magnet ++ + OUI:7CCD3C* + ID_OUI_FROM_DATABASE=Guangzhou Juzing Technology Co., Ltd + +@@ -60181,6 +60409,9 @@ OUI:80B95C* + OUI:80BAAC* + ID_OUI_FROM_DATABASE=TeleAdapt Ltd + ++OUI:80BAE6* ++ ID_OUI_FROM_DATABASE=Neets ++ + OUI:80BBEB* + ID_OUI_FROM_DATABASE=Satmap Systems Ltd + +@@ -60373,6 +60604,9 @@ OUI:847E40* + OUI:8482F4* + ID_OUI_FROM_DATABASE=Beijing Huasun Unicreate Technology Co., Ltd + ++OUI:848336* ++ ID_OUI_FROM_DATABASE=Newrun ++ + OUI:848371* + ID_OUI_FROM_DATABASE=Avaya, Inc + +@@ -60475,6 +60709,9 @@ OUI:84F64C* + OUI:84FCFE* + ID_OUI_FROM_DATABASE=Apple + ++OUI:84FE9E* ++ ID_OUI_FROM_DATABASE=RTC Industries, Inc. ++ + OUI:880355* + ID_OUI_FROM_DATABASE=Arcadyan Technology Corp. + +@@ -60634,6 +60871,9 @@ OUI:889821* + OUI:889B39* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + ++OUI:889CA6* ++ ID_OUI_FROM_DATABASE=BTB Korea INC ++ + OUI:889FFA* + ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. + +@@ -60664,6 +60904,9 @@ OUI:88BFD5* + OUI:88C36E* + ID_OUI_FROM_DATABASE=Beijing Ereneben lnformation Technology Limited + ++OUI:88C626* ++ ID_OUI_FROM_DATABASE=Logitech - Ultimate Ears ++ + OUI:88C663* + ID_OUI_FROM_DATABASE=Apple + +@@ -60760,6 +61003,9 @@ OUI:8C2F39* + OUI:8C3330* + ID_OUI_FROM_DATABASE=EmFirst Co., Ltd. + ++OUI:8C3AE3* ++ ID_OUI_FROM_DATABASE=LG Electronics ++ + OUI:8C3C07* + ID_OUI_FROM_DATABASE=Skiva Technologies, Inc. + +@@ -60778,6 +61024,9 @@ OUI:8C4B59* + OUI:8C4CDC* + ID_OUI_FROM_DATABASE=PLANEX COMMUNICATIONS INC. + ++OUI:8C4DB9* ++ ID_OUI_FROM_DATABASE=Unmonday Ltd ++ + OUI:8C4DEA* + ID_OUI_FROM_DATABASE=Cerio Corporation + +@@ -60790,6 +61039,9 @@ OUI:8C53F7* + OUI:8C541D* + ID_OUI_FROM_DATABASE=LGE + ++OUI:8C569D* ++ ID_OUI_FROM_DATABASE=Imaging Solutions Group ++ + OUI:8C56C5* + ID_OUI_FROM_DATABASE=Nintendo Co., Ltd. + +@@ -60943,6 +61195,9 @@ OUI:8CDD8D* + OUI:8CDE52* + ID_OUI_FROM_DATABASE=ISSC Technologies Corp. + ++OUI:8CDE99* ++ ID_OUI_FROM_DATABASE=Comlab Inc. ++ + OUI:8CE081* + ID_OUI_FROM_DATABASE=zte corporation + +@@ -61138,6 +61393,9 @@ OUI:907F61* + OUI:908260* + ID_OUI_FROM_DATABASE=IEEE 1904.1 Working Group + ++OUI:90837A* ++ ID_OUI_FROM_DATABASE=General Electric Water & Process Technologies ++ + OUI:90840D* + ID_OUI_FROM_DATABASE=Apple + +@@ -61204,6 +61462,9 @@ OUI:90B21F* + OUI:90B8D0* + ID_OUI_FROM_DATABASE=Joyent, Inc. + ++OUI:90B931* ++ ID_OUI_FROM_DATABASE=Apple, Inc ++ + OUI:90B97D* + ID_OUI_FROM_DATABASE=Johnson Outdoors Marine Electronics d/b/a Minnkota + +@@ -61543,6 +61804,9 @@ OUI:94F720* + OUI:94FAE8* + ID_OUI_FROM_DATABASE=Shenzhen Eycom Technology Co., Ltd + ++OUI:94FBB2* ++ ID_OUI_FROM_DATABASE=Shenzhen Gongjin Electronics Co.,Ltd ++ + OUI:94FD1D* + ID_OUI_FROM_DATABASE=WhereWhen Corp + +@@ -61747,6 +62011,9 @@ OUI:98D6F7* + OUI:98D88C* + ID_OUI_FROM_DATABASE=Nortel Networks + ++OUI:98DA92* ++ ID_OUI_FROM_DATABASE=Vuzix Corporation ++ + OUI:98DCD9* + ID_OUI_FROM_DATABASE=UNITEC Co., Ltd. + +@@ -61780,6 +62047,9 @@ OUI:98FE03* + OUI:98FE94* + ID_OUI_FROM_DATABASE=Apple + ++OUI:98FF6A* ++ ID_OUI_FROM_DATABASE=OTEC(Shanghai)Technology Co.,Ltd. ++ + OUI:98FFD0* + ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd. + +@@ -61849,6 +62119,9 @@ OUI:9C417C* + OUI:9C443D* + ID_OUI_FROM_DATABASE=CHENGDU XUGUANG TECHNOLOGY CO, LTD + ++OUI:9C44A6* ++ ID_OUI_FROM_DATABASE=SwiftTest, Inc. ++ + OUI:9C4563* + ID_OUI_FROM_DATABASE=DIMEP Sistemas + +@@ -61927,6 +62200,9 @@ OUI:9C7BD2* + OUI:9C807D* + ID_OUI_FROM_DATABASE=SYSCABLE Korea Inc. + ++OUI:9C80DF* ++ ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation ++ + OUI:9C8888* + ID_OUI_FROM_DATABASE=Simac Techniek NV + +@@ -62098,6 +62374,9 @@ OUI:A01917* + OUI:A01C05* + ID_OUI_FROM_DATABASE=NIMAX TELECOM CO.,LTD. + ++OUI:A01D48* ++ ID_OUI_FROM_DATABASE=Hewlett Packard ++ + OUI:A02195* + ID_OUI_FROM_DATABASE=Samsung Electronics Digital Imaging + +@@ -62416,6 +62695,9 @@ OUI:A433D1* + OUI:A438FC* + ID_OUI_FROM_DATABASE=Plastic Logic + ++OUI:A43A69* ++ ID_OUI_FROM_DATABASE=Vers Inc ++ + OUI:A4466B* + ID_OUI_FROM_DATABASE=EOC Technology + +@@ -62461,6 +62743,9 @@ OUI:A46706* + OUI:A46E79* + ID_OUI_FROM_DATABASE=DFT System Co.Ltd + ++OUI:A47733* ++ ID_OUI_FROM_DATABASE=Google ++ + OUI:A47760* + ID_OUI_FROM_DATABASE=Nokia Corporation + +@@ -62911,6 +63196,9 @@ OUI:AC20AA* + OUI:AC220B* + ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC. + ++OUI:AC2DA3* ++ ID_OUI_FROM_DATABASE=TXTR GmbH ++ + OUI:AC2FA8* + ID_OUI_FROM_DATABASE=Humannix Co.,Ltd. + +@@ -62986,6 +63274,9 @@ OUI:AC6123* + OUI:AC6706* + ID_OUI_FROM_DATABASE=Ruckus Wireless + ++OUI:AC6BAC* ++ ID_OUI_FROM_DATABASE=Jenny Science AG ++ + OUI:AC6E1A* + ID_OUI_FROM_DATABASE=Shenzhen Gongjin Electronics Co.,Ltd + +@@ -63085,6 +63376,9 @@ OUI:ACBEB6* + OUI:ACC2EC* + ID_OUI_FROM_DATABASE=CLT INT'L IND. CORP. + ++OUI:ACC595* ++ ID_OUI_FROM_DATABASE=Graphite Systems ++ + OUI:ACC698* + ID_OUI_FROM_DATABASE=Kohzu Precision Co., Ltd. + +@@ -63172,6 +63466,9 @@ OUI:ACF7F3* + OUI:ACF97E* + ID_OUI_FROM_DATABASE=ELESYS INC. + ++OUI:ACFDEC* ++ ID_OUI_FROM_DATABASE=Apple, Inc ++ + OUI:B00594* + ID_OUI_FROM_DATABASE=Liteon Technology Corporation + +@@ -63193,6 +63490,9 @@ OUI:B01B7C* + OUI:B01C91* + ID_OUI_FROM_DATABASE=Elim Co + ++OUI:B024F3* ++ ID_OUI_FROM_DATABASE=Progeny Systems ++ + OUI:B0358D* + ID_OUI_FROM_DATABASE=Nokia Corporation + +@@ -63286,6 +63586,9 @@ OUI:B09134* + OUI:B0973A* + ID_OUI_FROM_DATABASE=E-Fuel Corporation + ++OUI:B0989F* ++ ID_OUI_FROM_DATABASE=LG CNS ++ + OUI:B09928* + ID_OUI_FROM_DATABASE=Fujitsu Limited + +@@ -63313,6 +63616,9 @@ OUI:B0AA36* + OUI:B0ACFA* + ID_OUI_FROM_DATABASE=Fujitsu Limited + ++OUI:B0ADAA* ++ ID_OUI_FROM_DATABASE=Avaya, Inc ++ + OUI:B0B2DC* + ID_OUI_FROM_DATABASE=Zyxel Communications Corporation + +@@ -63364,6 +63670,9 @@ OUI:B0D09C* + OUI:B0D2F5* + ID_OUI_FROM_DATABASE=Vello Systems, Inc. + ++OUI:B0D7C5* ++ ID_OUI_FROM_DATABASE=STP KFT ++ + OUI:B0DF3A* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -63466,6 +63775,9 @@ OUI:B43741* + OUI:B439D6* + ID_OUI_FROM_DATABASE=ProCurve Networking by HP + ++OUI:B43A28* ++ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd ++ + OUI:B43DB2* + ID_OUI_FROM_DATABASE=Degreane Horizon + +@@ -63784,6 +64096,9 @@ OUI:B8782E* + OUI:B8797E* + ID_OUI_FROM_DATABASE=Secure Meters (UK) Limited + ++OUI:B87AC9* ++ ID_OUI_FROM_DATABASE=Siemens Ltd. ++ + OUI:B8871E* + ID_OUI_FROM_DATABASE=Good Mind Industries Co., Ltd. + +@@ -63823,6 +64138,9 @@ OUI:B8975A* + OUI:B898B0* + ID_OUI_FROM_DATABASE=Atlona Inc. + ++OUI:B898F7* ++ ID_OUI_FROM_DATABASE=Gionee Communication Equipment Co,Ltd.ShenZhen ++ + OUI:B89AED* + ID_OUI_FROM_DATABASE=OceanServer Technology, Inc + +@@ -63985,12 +64303,18 @@ OUI:BC125E* + OUI:BC1401* + ID_OUI_FROM_DATABASE=Hitron Technologies. Inc + ++OUI:BC14EF* ++ ID_OUI_FROM_DATABASE=ITON Technology Limited ++ + OUI:BC15A6* + ID_OUI_FROM_DATABASE=Taiwan Jantek Electronics,Ltd. + + OUI:BC1665* + ID_OUI_FROM_DATABASE=Cisco + ++OUI:BC1A67* ++ ID_OUI_FROM_DATABASE=YF Technology Co., Ltd ++ + OUI:BC20A4* + ID_OUI_FROM_DATABASE=Samsung Electronics + +@@ -64021,6 +64345,9 @@ OUI:BC2D98* + OUI:BC305B* + ID_OUI_FROM_DATABASE=Dell Inc. + ++OUI:BC307D* ++ ID_OUI_FROM_DATABASE=Wistron Neweb Corp. ++ + OUI:BC35E5* + ID_OUI_FROM_DATABASE=Hydro Systems Company + +@@ -64207,6 +64534,9 @@ OUI:BCE59F* + OUI:BCEA2B* + ID_OUI_FROM_DATABASE=CityCom GmbH + ++OUI:BCEE7B* ++ ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC. ++ + OUI:BCF2AF* + ID_OUI_FROM_DATABASE=devolo AG + +@@ -64324,6 +64654,9 @@ OUI:C0626B* + OUI:C06394* + ID_OUI_FROM_DATABASE=Apple + ++OUI:C064C6* ++ ID_OUI_FROM_DATABASE=Nokia Corporation ++ + OUI:C06599* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + +@@ -64462,6 +64795,9 @@ OUI:C0E54E* + OUI:C0EAE4* + ID_OUI_FROM_DATABASE=Sonicwall + ++OUI:C0F1C4* ++ ID_OUI_FROM_DATABASE=Pacidal Corporation Ltd. ++ + OUI:C0F8DA* + ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. + +@@ -64642,6 +64978,9 @@ OUI:C47F51* + OUI:C4823F* + ID_OUI_FROM_DATABASE=Fujian Newland Auto-ID Tech. Co,.Ltd. + ++OUI:C4824E* ++ ID_OUI_FROM_DATABASE=Changzhou Uchip Electronics Co., LTD. ++ + OUI:C48508* + ID_OUI_FROM_DATABASE=Intel Corporate + +@@ -65005,6 +65344,9 @@ OUI:C8F386* + OUI:C8F406* + ID_OUI_FROM_DATABASE=Avaya, Inc + ++OUI:C8F68D* ++ ID_OUI_FROM_DATABASE=S.E.TECHNOLOGIES LIMITED ++ + OUI:C8F704* + ID_OUI_FROM_DATABASE=Building Block Video + +@@ -65143,6 +65485,9 @@ OUI:CC5D57* + OUI:CC60BB* + ID_OUI_FROM_DATABASE=Empower RF Systems + ++OUI:CC65AD* ++ ID_OUI_FROM_DATABASE=ARRIS Group, Inc. ++ + OUI:CC69B0* + ID_OUI_FROM_DATABASE=Global Traffic Technologies, LLC + +@@ -65533,6 +65878,9 @@ OUI:D0DFB2* + OUI:D0DFC7* + ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd + ++OUI:D0E140* ++ ID_OUI_FROM_DATABASE=Apple, Inc ++ + OUI:D0E347* + ID_OUI_FROM_DATABASE=Yoga + +@@ -65716,6 +66064,9 @@ OUI:D479C3* + OUI:D47B75* + ID_OUI_FROM_DATABASE=HARTING Electronics GmbH + ++OUI:D481CA* ++ ID_OUI_FROM_DATABASE=iDevices, LLC ++ + OUI:D4823E* + ID_OUI_FROM_DATABASE=Argosy Technologies, Ltd. + +@@ -65965,6 +66316,9 @@ OUI:D8543A* + OUI:D857EF* + ID_OUI_FROM_DATABASE=Samsung Electronics + ++OUI:D858D7* ++ ID_OUI_FROM_DATABASE=CZ.NIC, z.s.p.o. ++ + OUI:D85D4C* + ID_OUI_FROM_DATABASE=TP-LINK Technologies Co.,Ltd. + +@@ -66004,6 +66358,9 @@ OUI:D878E5* + OUI:D87988* + ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co., Ltd. + ++OUI:D87CDD* ++ ID_OUI_FROM_DATABASE=SANIX INCORPORATED ++ + OUI:D88A3B* + ID_OUI_FROM_DATABASE=UNIT-EM + +@@ -66475,6 +66832,9 @@ OUI:E067B3* + OUI:E06995* + ID_OUI_FROM_DATABASE=PEGATRON CORPORATION + ++OUI:E0750A* ++ ID_OUI_FROM_DATABASE=ALPS ERECTORIC CO.,LTD. ++ + OUI:E0757D* + ID_OUI_FROM_DATABASE=Motorola Mobility LLC + +@@ -66577,6 +66937,9 @@ OUI:E0C6B3* + OUI:E0C79D* + ID_OUI_FROM_DATABASE=Texas Instruments + ++OUI:E0C86A* ++ ID_OUI_FROM_DATABASE=SHENZHEN TW-SCIE Co., Ltd ++ + OUI:E0C922* + ID_OUI_FROM_DATABASE=Jireh Energy Tech., Ltd. + +@@ -66661,6 +67024,9 @@ OUI:E0F9BE* + OUI:E0FAEC* + ID_OUI_FROM_DATABASE=Platan sp. z o.o. sp. k. + ++OUI:E40439* ++ ID_OUI_FROM_DATABASE=TomTom Software Ltd ++ + OUI:E4115B* + ID_OUI_FROM_DATABASE=Hewlett Packard + +@@ -66997,6 +67363,9 @@ OUI:E85E53* + OUI:E8611F* + ID_OUI_FROM_DATABASE=Dawning Information Industry Co.,Ltd + ++OUI:E86183* ++ ID_OUI_FROM_DATABASE=Black Diamond Advanced Technology, LLC ++ + OUI:E86CDA* + ID_OUI_FROM_DATABASE=Supercomputers and Neurocomputers Research Center + +@@ -67435,6 +67804,9 @@ OUI:F02408* + OUI:F02572* + ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. + ++OUI:F025B7* ++ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD. ++ + OUI:F0264C* + ID_OUI_FROM_DATABASE=Dr. Sigrist AG + +@@ -67486,6 +67858,9 @@ OUI:F05DC8* + OUI:F05F5A* + ID_OUI_FROM_DATABASE=Getriebebau NORD GmbH and Co. KG + ++OUI:F06130* ++ ID_OUI_FROM_DATABASE=Advantage Pharmacy Services, LLC ++ + OUI:F0620D* + ID_OUI_FROM_DATABASE=Shenzhen Egreat Tech Corp.,Ltd + +@@ -67681,6 +68056,9 @@ OUI:F40321* + OUI:F4044C* + ID_OUI_FROM_DATABASE=ValenceTech Limited + ++OUI:F4068D* ++ ID_OUI_FROM_DATABASE=devolo AG ++ + OUI:F40B93* + ID_OUI_FROM_DATABASE=Research In Motion + +@@ -68107,6 +68485,9 @@ OUI:F89FB8* + OUI:F8A03D* + ID_OUI_FROM_DATABASE=Dinstar Technologies Co., Ltd. + ++OUI:F8A2B4* ++ ID_OUI_FROM_DATABASE=RHEWA-WAAGENFABRIK August Freudewald GmbH &Co. KG ++ + OUI:F8A45F* + ID_OUI_FROM_DATABASE=Beijing Xiaomi communications co.,ltd + +@@ -68245,6 +68626,9 @@ OUI:FC0647* + OUI:FC0877* + ID_OUI_FROM_DATABASE=Prentke Romich Company + ++OUI:FC09D8* ++ ID_OUI_FROM_DATABASE=ACTEON Group ++ + OUI:FC0A81* + ID_OUI_FROM_DATABASE=Motorola Solutions Inc. + +@@ -68314,6 +68698,9 @@ OUI:FC455F* + OUI:FC48EF* + ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD + ++OUI:FC4B1C* ++ ID_OUI_FROM_DATABASE=INTERSENSOR S.R.L. ++ + OUI:FC4BBC* + ID_OUI_FROM_DATABASE=Sunplus Technology Co., Ltd. + +diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb +index fdb534d..289f81c 100644 +--- a/hwdb/20-pci-vendor-model.hwdb ++++ b/hwdb/20-pci-vendor-model.hwdb +@@ -4158,7 +4158,7 @@ pci:v00001002d00005F57* + ID_MODEL_FROM_DATABASE=R423 [Radeon X800 XT] + + pci:v00001002d00006600* +- ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8750M] ++ ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8670M/8750M] + + pci:v00001002d00006601* + ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8730M] +@@ -4169,6 +4169,12 @@ pci:v00001002d00006602* + pci:v00001002d00006603* + ID_MODEL_FROM_DATABASE=Mars + ++pci:v00001002d00006604* ++ ID_MODEL_FROM_DATABASE=Mars [Radeon R7 M265] ++ ++pci:v00001002d00006605* ++ ID_MODEL_FROM_DATABASE=Mars [Radeon R7 M260] ++ + pci:v00001002d00006606* + ID_MODEL_FROM_DATABASE=Mars XTX [Radeon HD 8790M] + +@@ -4176,13 +4182,13 @@ pci:v00001002d00006607* + ID_MODEL_FROM_DATABASE=Mars LE [Radeon HD 8530M] + + pci:v00001002d00006610* +- ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8600 Series] ++ ID_MODEL_FROM_DATABASE=Oland XT [Radeon HD 8670/R7 250] + + pci:v00001002d00006611* + ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8570] + + pci:v00001002d00006613* +- ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8500 Series] ++ ID_MODEL_FROM_DATABASE=Oland PRO [Radeon R7 240] + + pci:v00001002d00006620* + ID_MODEL_FROM_DATABASE=Mars +@@ -4197,10 +4203,10 @@ pci:v00001002d00006631* + ID_MODEL_FROM_DATABASE=Oland + + pci:v00001002d00006640* +- ID_MODEL_FROM_DATABASE=Saturn [Radeon HD 8950] ++ ID_MODEL_FROM_DATABASE=Saturn XT [Radeon HD 8950M] + + pci:v00001002d00006641* +- ID_MODEL_FROM_DATABASE=Saturn PRO ++ ID_MODEL_FROM_DATABASE=Saturn PRO [Radeon HD 8930M] + + pci:v00001002d00006649* + ID_MODEL_FROM_DATABASE=Bonaire +@@ -4236,13 +4242,13 @@ pci:v00001002d0000665Csv00001787sd00002329* + ID_MODEL_FROM_DATABASE=Radeon HD 7790 TurboDuo + + pci:v00001002d0000665D* +- ID_MODEL_FROM_DATABASE=Bonaire ++ ID_MODEL_FROM_DATABASE=Bonaire [Radeon R7 200 Series] + + pci:v00001002d00006660* +- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A] ++ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M] + + pci:v00001002d00006663* +- ID_MODEL_FROM_DATABASE=Sun PRO [Radeon HD 8500M Series] ++ ID_MODEL_FROM_DATABASE=Sun PRO [Radeon HD 8570M] + + pci:v00001002d00006664* + ID_MODEL_FROM_DATABASE=Jet XT [Radeon R5 M200 Series] +@@ -4254,7 +4260,7 @@ pci:v00001002d00006667* + ID_MODEL_FROM_DATABASE=Jet ULT [Radeon R5 M200 Series] + + pci:v00001002d0000666F* +- ID_MODEL_FROM_DATABASE=Sun [Radeon HD 8500M] ++ ID_MODEL_FROM_DATABASE=Sun LE [Radeon HD 8550M] + + pci:v00001002d00006670* + ID_MODEL_FROM_DATABASE=Hainan +@@ -5675,6 +5681,15 @@ pci:v00001002d0000678Asv00001002sd0000030C* + pci:v00001002d0000678Asv00001002sd00000310* + ID_MODEL_FROM_DATABASE=FirePro S9000 + ++pci:v00001002d0000678Asv00001002sd00000420* ++ ID_MODEL_FROM_DATABASE=Radeon Sky 700 ++ ++pci:v00001002d0000678Asv00001002sd00000422* ++ ID_MODEL_FROM_DATABASE=Radeon Sky 900 ++ ++pci:v00001002d0000678Asv00001002sd00000B0E* ++ ID_MODEL_FROM_DATABASE=FirePro S10000 Passive ++ + pci:v00001002d0000678Asv00001002sd00000B2A* + ID_MODEL_FROM_DATABASE=FirePro S10000 + +@@ -5691,11 +5706,14 @@ pci:v00001002d00006792* + ID_MODEL_FROM_DATABASE=Tahiti + + pci:v00001002d00006798* +- ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970] ++ ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970/R9 280X] + + pci:v00001002d00006798sv00001002sd00003000* + ID_MODEL_FROM_DATABASE=Tahiti XT2 [Radeon HD 7970 GHz Edition] + ++pci:v00001002d00006798sv00001002sd00003001* ++ ID_MODEL_FROM_DATABASE=Tahiti XTL [Radeon R9 280X] ++ + pci:v00001002d00006798sv00001002sd00004000* + ID_MODEL_FROM_DATABASE=Radeon HD 8970 OEM + +@@ -5717,6 +5735,12 @@ pci:v00001002d00006798sv00001043sd0000044A* + pci:v00001002d00006798sv00001043sd0000044C* + ID_MODEL_FROM_DATABASE=Tahiti XT2 [Matrix HD 7970 Platinum] + ++pci:v00001002d00006798sv00001043sd00003001* ++ ID_MODEL_FROM_DATABASE=Tahiti XTL [ROG Matrix R9 280X] ++ ++pci:v00001002d00006798sv00001043sd00003006* ++ ID_MODEL_FROM_DATABASE=Tahiti XTL [Radeon R9 280X DirectCU II TOP] ++ + pci:v00001002d00006798sv00001043sd00009999* + ID_MODEL_FROM_DATABASE=ARES II + +@@ -5771,6 +5795,9 @@ pci:v00001002d0000679Bsv00001002sd00000B2A* + pci:v00001002d0000679Bsv00001462sd00008036* + ID_MODEL_FROM_DATABASE=Radeon HD 8990 OEM + ++pci:v00001002d0000679Bsv0000148Csd00008990* ++ ID_MODEL_FROM_DATABASE=Radeon HD 8990 OEM ++ + pci:v00001002d0000679E* + ID_MODEL_FROM_DATABASE=Tahiti LE [Radeon HD 7870 XT] + +@@ -5834,6 +5861,9 @@ pci:v00001002d00006808* + pci:v00001002d00006808sv00001002sd00000310* + ID_MODEL_FROM_DATABASE=FirePro S7000 + ++pci:v00001002d00006808sv00001002sd00000420* ++ ID_MODEL_FROM_DATABASE=Radeon Sky 500 ++ + pci:v00001002d00006809* + ID_MODEL_FROM_DATABASE=Pitcairn LE GL [FirePro W5000] + +@@ -5865,19 +5895,22 @@ pci:v00001002d00006819sv0000174Bsd0000E221* + ID_MODEL_FROM_DATABASE=Radeon HD 7850 2GB GDDR5 DVI-I/DVI-D/HDMI/DP + + pci:v00001002d00006820* +- ID_MODEL_FROM_DATABASE=Venus XTX [Radeon HD 8800M Series] ++ ID_MODEL_FROM_DATABASE=Venus XTX [Radeon HD 8890M] + + pci:v00001002d00006820sv0000103Csd00001851* + ID_MODEL_FROM_DATABASE=Radeon HD 7750M + + pci:v00001002d00006821* +- ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8800M Series] ++ ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8870M] ++ ++pci:v00001002d00006821sv00001002sd0000031E* ++ ID_MODEL_FROM_DATABASE=FirePro SX4000 + + pci:v00001002d00006822* + ID_MODEL_FROM_DATABASE=Venus PRO + + pci:v00001002d00006823* +- ID_MODEL_FROM_DATABASE=Venus PRO [Radeon HD 8800M Series] ++ ID_MODEL_FROM_DATABASE=Venus PRO [Radeon HD 8850M] + + pci:v00001002d00006825* + ID_MODEL_FROM_DATABASE=Heathrow XT [Radeon HD 7870M] +@@ -5901,7 +5934,7 @@ pci:v00001002d0000682A* + ID_MODEL_FROM_DATABASE=Venus PRO + + pci:v00001002d0000682B* +- ID_MODEL_FROM_DATABASE=Venus LE [Radeon HD 8800M Series] ++ ID_MODEL_FROM_DATABASE=Venus LE [Radeon HD 8830M] + + pci:v00001002d0000682D* + ID_MODEL_FROM_DATABASE=Chelsea XT GL [FirePro M4000] +@@ -5919,7 +5952,7 @@ pci:v00001002d00006831* + ID_MODEL_FROM_DATABASE=Cape Verde [AMD Radeon HD 7700M Series] + + pci:v00001002d00006835* +- ID_MODEL_FROM_DATABASE=Cape Verde PRX [Radeon R7 200 Series] ++ ID_MODEL_FROM_DATABASE=Cape Verde PRX [Radeon R7 260] + + pci:v00001002d00006837* + ID_MODEL_FROM_DATABASE=Cape Verde LE [Radeon HD 7730/8730] +@@ -16466,6 +16499,12 @@ pci:v00001077d00008031* + pci:v00001077d00008032* + ID_MODEL_FROM_DATABASE=8300 Series 10GbE Converged Network Adapter (iSCSI) + ++pci:v00001077d00008430* ++ ID_MODEL_FROM_DATABASE=ISP8324 1/10GbE Converged Network Controller (NIC VF) ++ ++pci:v00001077d00008431* ++ ID_MODEL_FROM_DATABASE=8300 Series 10GbE Converged Network Adapter (FCoE VF) ++ + pci:v00001077d00008432* + ID_MODEL_FROM_DATABASE=ISP2432M-based 10GbE Converged Network Adapter (CNA) + +@@ -17090,6 +17129,12 @@ pci:v00001093d00002890* + pci:v00001093d000028C0* + ID_MODEL_FROM_DATABASE=PCI-6014 + ++pci:v00001093d000028D0* ++ ID_MODEL_FROM_DATABASE=PCI-5122 ++ ++pci:v00001093d000028E0* ++ ID_MODEL_FROM_DATABASE=PXI-5122 ++ + pci:v00001093d00002A60* + ID_MODEL_FROM_DATABASE=PCI-6023E + +@@ -17174,12 +17219,33 @@ pci:v00001093d000070BF* + pci:v00001093d000070C0* + ID_MODEL_FROM_DATABASE=PCI-6143 + ++pci:v00001093d000070F0* ++ ID_MODEL_FROM_DATABASE=PXI-5922 ++ ++pci:v00001093d000070F1* ++ ID_MODEL_FROM_DATABASE=PCI-5922 ++ + pci:v00001093d000070F2* + ID_MODEL_FROM_DATABASE=PCI-6224 + ++pci:v00001093d00007121* ++ ID_MODEL_FROM_DATABASE=PXI-5122EX ++ ++pci:v00001093d00007122* ++ ID_MODEL_FROM_DATABASE=PCI-5122EX ++ + pci:v00001093d00007144* + ID_MODEL_FROM_DATABASE=PXI-5124 (12-bit 200 MS/s Digitizer) + ++pci:v00001093d00007145* ++ ID_MODEL_FROM_DATABASE=PCI-5124 ++ ++pci:v00001093d0000714C* ++ ID_MODEL_FROM_DATABASE=PXI-5114 ++ ++pci:v00001093d0000714D* ++ ID_MODEL_FROM_DATABASE=PCI-5114 ++ + pci:v00001093d0000716C* + ID_MODEL_FROM_DATABASE=PCI-6225 + +@@ -17195,6 +17261,60 @@ pci:v00001093d000071BC* + pci:v00001093d000071D0* + ID_MODEL_FROM_DATABASE=PXI-6143 + ++pci:v00001093d00007260* ++ ID_MODEL_FROM_DATABASE=PXI-5142 ++ ++pci:v00001093d00007261* ++ ID_MODEL_FROM_DATABASE=PCI-5142 ++ ++pci:v00001093d000072A8* ++ ID_MODEL_FROM_DATABASE=PXI-5152 ++ ++pci:v00001093d000072A9* ++ ID_MODEL_FROM_DATABASE=PCI-5152 ++ ++pci:v00001093d000072AA* ++ ID_MODEL_FROM_DATABASE=PXI-5105 ++ ++pci:v00001093d000072AB* ++ ID_MODEL_FROM_DATABASE=PCI-5105 ++ ++pci:v00001093d0000730F* ++ ID_MODEL_FROM_DATABASE=PXI-5922EX ++ ++pci:v00001093d00007310* ++ ID_MODEL_FROM_DATABASE=PCI-5922EX ++ ++pci:v00001093d00007333* ++ ID_MODEL_FROM_DATABASE=PXI-5900 ++ ++pci:v00001093d00007349* ++ ID_MODEL_FROM_DATABASE=PXI-5154 ++ ++pci:v00001093d0000734A* ++ ID_MODEL_FROM_DATABASE=PCI-5154 ++ ++pci:v00001093d0000737D* ++ ID_MODEL_FROM_DATABASE=PXI-5124EX ++ ++pci:v00001093d000073F0* ++ ID_MODEL_FROM_DATABASE=PXI-5153 ++ ++pci:v00001093d000073F1* ++ ID_MODEL_FROM_DATABASE=PCI-5153 ++ ++pci:v00001093d0000745E* ++ ID_MODEL_FROM_DATABASE=PXI-5153EX ++ ++pci:v00001093d0000745F* ++ ID_MODEL_FROM_DATABASE=PCI-5153EX ++ ++pci:v00001093d00007460* ++ ID_MODEL_FROM_DATABASE=PXI-5154EX ++ ++pci:v00001093d00007461* ++ ID_MODEL_FROM_DATABASE=PCI-5154EX ++ + pci:v00001093d0000B001* + ID_MODEL_FROM_DATABASE=IMAQ-PCI-1408 + +@@ -17226,7 +17346,10 @@ pci:v00001093d0000B091* + ID_MODEL_FROM_DATABASE=IMAQ-PXI-1411 + + pci:v00001093d0000C4C4* +- ID_MODEL_FROM_DATABASE=PXIe-4353 ++ ID_MODEL_FROM_DATABASE=PXIe-4353/5160 ++ ++pci:v00001093d0000C4C4sv00001093sd000076D0* ++ ID_MODEL_FROM_DATABASE=PXIe-5160 + + pci:v00001093d0000C801* + ID_MODEL_FROM_DATABASE=PCI-GPIB +@@ -25557,10 +25680,10 @@ pci:v000010DEd00000FE5* + ID_MODEL_FROM_DATABASE=GK107 [GeForce K340 USM] + + pci:v000010DEd00000FE6* +- ID_MODEL_FROM_DATABASE=GK107 [NVS K1 USM] ++ ID_MODEL_FROM_DATABASE=GK107 [GRID K1 NVS USM] + + pci:v000010DEd00000FE7* +- ID_MODEL_FROM_DATABASE=GK107GL [GRID K1] ++ ID_MODEL_FROM_DATABASE=GK107GL [GRID K100 vGPU] + + pci:v000010DEd00000FE7sv000010DEsd0000101E* + ID_MODEL_FROM_DATABASE=GRID K100 +@@ -25575,13 +25698,13 @@ pci:v000010DEd00000FF2* + ID_MODEL_FROM_DATABASE=GK107GL [GRID K1] + + pci:v000010DEd00000FF5* +- ID_MODEL_FROM_DATABASE=GK107GL [Tesla K1 USM] ++ ID_MODEL_FROM_DATABASE=GK107GL [GRID K1 Tesla USM] + + pci:v000010DEd00000FF6* + ID_MODEL_FROM_DATABASE=GK107GLM [Quadro K1100M] + + pci:v000010DEd00000FF7* +- ID_MODEL_FROM_DATABASE=GK107GL [Quadro K1 USM] ++ ID_MODEL_FROM_DATABASE=GK107GL [GRID K140Q vGPU] + + pci:v000010DEd00000FF7sv000010DEsd00001037* + ID_MODEL_FROM_DATABASE=GRID K140Q +@@ -25652,6 +25775,9 @@ pci:v000010DEd00001021* + pci:v000010DEd00001022* + ID_MODEL_FROM_DATABASE=GK110GL [Tesla K20c] + ++pci:v000010DEd00001024* ++ ID_MODEL_FROM_DATABASE=GK110GL [Tesla K40c] ++ + pci:v000010DEd00001026* + ID_MODEL_FROM_DATABASE=GK110GL [Tesla K20s] + +@@ -26246,6 +26372,9 @@ pci:v000010DEd00001140sv000017AAsd00003983* + pci:v000010DEd00001140sv000017AAsd00005003* + ID_MODEL_FROM_DATABASE=GeForce GT 720M + ++pci:v000010DEd00001140sv000017AAsd00005005* ++ ID_MODEL_FROM_DATABASE=GeForce 705M ++ + pci:v000010DEd00001140sv000017AAsd0000500D* + ID_MODEL_FROM_DATABASE=GeForce GT 620M + +@@ -26334,13 +26463,13 @@ pci:v000010DEd0000118A* + ID_MODEL_FROM_DATABASE=GK104GL [GRID K520] + + pci:v000010DEd0000118B* +- ID_MODEL_FROM_DATABASE=GK104 [GeForce K2 USM] ++ ID_MODEL_FROM_DATABASE=GK104GL [GRID K2 GeForce USM] + + pci:v000010DEd0000118C* +- ID_MODEL_FROM_DATABASE=GK104 [NVS K2 USM] ++ ID_MODEL_FROM_DATABASE=GK104 [GRID K2 NVS USM] + + pci:v000010DEd0000118D* +- ID_MODEL_FROM_DATABASE=GK104GL [GRID K2] ++ ID_MODEL_FROM_DATABASE=GK104GL [GRID K200 vGPU] + + pci:v000010DEd0000118Dsv000010DEsd0000101D* + ID_MODEL_FROM_DATABASE=GRID K200 +@@ -26351,6 +26480,9 @@ pci:v000010DEd0000118E* + pci:v000010DEd0000118F* + ID_MODEL_FROM_DATABASE=GK104GL [Tesla K10] + ++pci:v000010DEd00001193* ++ ID_MODEL_FROM_DATABASE=GK104 [GeForce GTX 760 Ti OEM] ++ + pci:v000010DEd0000119D* + ID_MODEL_FROM_DATABASE=GK104M [GeForce GTX 775M] + +@@ -26379,7 +26511,7 @@ pci:v000010DEd000011A7* + ID_MODEL_FROM_DATABASE=GK104M [GeForce GTX 675MX] + + pci:v000010DEd000011B0* +- ID_MODEL_FROM_DATABASE=GK104GL [Quadro K2 USM] ++ ID_MODEL_FROM_DATABASE=GK104GL [GRID K240Q\K260Q vGPU] + + pci:v000010DEd000011B0sv000010DEsd0000101A* + ID_MODEL_FROM_DATABASE=GRID K240Q +@@ -26388,7 +26520,7 @@ pci:v000010DEd000011B0sv000010DEsd0000101B* + ID_MODEL_FROM_DATABASE=GRID K260Q + + pci:v000010DEd000011B1* +- ID_MODEL_FROM_DATABASE=GK104GL [Tesla K2 USM] ++ ID_MODEL_FROM_DATABASE=GK104GL [GRID K2 Tesla USM] + + pci:v000010DEd000011B6* + ID_MODEL_FROM_DATABASE=GK104GLM [Quadro K3100M] +@@ -32642,6 +32774,9 @@ pci:v00001179d00000618* + pci:v00001179d00000701* + ID_MODEL_FROM_DATABASE=FIR Port Type-O + ++pci:v00001179d00000803* ++ ID_MODEL_FROM_DATABASE=TC6371AF SD Host Controller ++ + pci:v00001179d00000804* + ID_MODEL_FROM_DATABASE=TC6371AF SmartMedia Controller + +@@ -40046,6 +40181,9 @@ pci:v000013F6d00008788sv000014C3sd00001710* + pci:v000013F6d00008788sv000014C3sd00001711* + ID_MODEL_FROM_DATABASE=HiFier Serenade + ++pci:v000013F6d00008788sv000014C3sd00001713* ++ ID_MODEL_FROM_DATABASE=HiFier Serenade III ++ + pci:v000013F6d00008788sv00001A58sd00000910* + ID_MODEL_FROM_DATABASE=Barracuda AC-1 + +@@ -50711,8 +50849,11 @@ pci:v00001A41d00000002* + pci:v00001A41d00000200* + ID_MODEL_FROM_DATABASE=TILE-Gx processor + ++pci:v00001A41d00000201* ++ ID_MODEL_FROM_DATABASE=TILE-Gx Processor Virtual Function ++ + pci:v00001A41d00002000* +- ID_MODEL_FROM_DATABASE=TILE-Gx PCI Express Bridge ++ ID_MODEL_FROM_DATABASE=TILE-Gx PCI Express Root Port + + pci:v00001A4A* + ID_VENDOR_FROM_DATABASE=SLAC National Accelerator Lab PPA-REG +@@ -51353,6 +51494,15 @@ pci:v00001CC5* + pci:v00001CC5d00000100* + ID_MODEL_FROM_DATABASE=CAN-PCIe-02 + ++pci:v00001CE4* ++ ID_VENDOR_FROM_DATABASE=Exablaze ++ ++pci:v00001CE4d00000001* ++ ID_MODEL_FROM_DATABASE=ExaNIC X4 ++ ++pci:v00001CE4d00000002* ++ ID_MODEL_FROM_DATABASE=ExaNIC X2 ++ + pci:v00001D44* + ID_VENDOR_FROM_DATABASE=DPT + +@@ -54131,6 +54281,9 @@ pci:v00008086d000008B4sv00008086sd00000270* + pci:v00008086d000008B4sv00008086sd00008270* + ID_MODEL_FROM_DATABASE=Dual Band Wireless AC 3160 + ++pci:v00008086d000008CF* ++ ID_MODEL_FROM_DATABASE=Atom Processor Z2760 Integrated Graphics Controller ++ + pci:v00008086d00000960* + ID_MODEL_FROM_DATABASE=80960RP (i960RP) Microprocessor/Bridge + +@@ -56369,6 +56522,9 @@ pci:v00008086d000010FBsv0000103Csd0000211B* + pci:v00008086d000010FBsv0000103Csd00002147* + ID_MODEL_FROM_DATABASE=Ethernet 10Gb 1-port 561i Adapter + ++pci:v00008086d000010FBsv0000103Csd00002159* ++ ID_MODEL_FROM_DATABASE=Ethernet 10Gb 2-port 562i Adapter ++ + pci:v00008086d000010FBsv0000108Esd00007B11* + ID_MODEL_FROM_DATABASE=Ethernet Server Adapter X520-2 + +@@ -57290,6 +57446,9 @@ pci:v00008086d00001528sv00001028sd00001F61* + pci:v00008086d00001528sv0000103Csd0000192D* + ID_MODEL_FROM_DATABASE=561FLR-T 2-port 10Gb Ethernet Adapter + ++pci:v00008086d00001528sv0000103Csd00002004* ++ ID_MODEL_FROM_DATABASE=Ethernet 10Gb 2-port 561i Adapter ++ + pci:v00008086d00001528sv0000103Csd0000211A* + ID_MODEL_FROM_DATABASE=Ethernet 10Gb 2-port 561T Adapter + +@@ -57416,6 +57575,9 @@ pci:v00008086d0000155D* + pci:v00008086d0000155Dsv00008086sd00000001* + ID_MODEL_FROM_DATABASE=Ethernet Server Bypass Adapter X520-SR2 + ++pci:v00008086d0000155Dsv00008086sd00000002* ++ ID_MODEL_FROM_DATABASE=Ethernet Server Bypass Adapter X520-LR2 ++ + pci:v00008086d00001560* + ID_MODEL_FROM_DATABASE=Ethernet Controller X540 + +@@ -69747,7 +69909,7 @@ pci:v00009005d00000285sv0000103Csd00003227* + ID_MODEL_FROM_DATABASE=AAR-2610SA + + pci:v00009005d00000285sv0000108Esd00000286* +- ID_MODEL_FROM_DATABASE=STK RAID INT ++ ID_MODEL_FROM_DATABASE=Sun StorageTek SAS RAID HBA, Internal + + pci:v00009005d00000285sv0000108Esd00000287* + ID_MODEL_FROM_DATABASE=STK RAID EXT +-- +1.8.4.652.g0d6e0ce + diff --git a/0048-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch b/0048-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch deleted file mode 100644 index 31f2ff4..0000000 --- a/0048-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6e921d55d1a568bc8d6bf59907e673f7f56b9751 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Wed, 16 Oct 2013 02:51:24 +0200 -Subject: [PATCH] rules: don't limit some of the rules to the "add" action - -Devices should show up in systemd regardless whether the user invoked -"udevadm trigger" or not. Before this change some devices might have -suddenly disappeared due issuing that command. - -Conflicts: - rules/99-systemd.rules.in ---- - rules/99-systemd.rules.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in -index 3c99475..307f18f 100644 ---- a/rules/99-systemd.rules.in -+++ b/rules/99-systemd.rules.in -@@ -53,12 +53,12 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy - - # Pull in backlight save/restore for all firmware backlight devices - --ACTION=="add", SUBSYSTEM=="backlight", ATTR{type}=="firmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service" -+SUBSYSTEM=="backlight", ATTR{type}=="firmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service" - - # Asynchronously mount file systems implemented by these modules as - # soon as they are loaded. - --SUBSYSTEM=="module", KERNEL=="fuse", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-fs-fuse-connections.mount" --SUBSYSTEM=="module", KERNEL=="configfs", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-kernel-config.mount" -+SUBSYSTEM=="module", KERNEL=="fuse", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-fs-fuse-connections.mount" -+SUBSYSTEM=="module", KERNEL=="configfs", TAG+="systemd", ENV{SYSTEMD_WANTS}+="sys-kernel-config.mount" - - LABEL="systemd_end" --- -1.8.4.652.g0d6e0ce - diff --git a/0049-rules-remove-pointless-MODE-settings.patch b/0049-rules-remove-pointless-MODE-settings.patch new file mode 100644 index 0000000..a1238e5 --- /dev/null +++ b/0049-rules-remove-pointless-MODE-settings.patch @@ -0,0 +1,43 @@ +From 431e477b8e66ddbaba28a9f59fb8ae2e16d59cb5 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Mon, 21 Oct 2013 03:49:03 +0200 +Subject: [PATCH] rules: remove pointless MODE= settings + +Changing the default MODE= for the group accessi, but not specifying +a GROUP= does not provide anything. + +It disables the default logic that the mode switches to 0660 as soon +as a GROUP= is specifed, which make custom rules uneccesarily complicated. + +https://bugs.freedesktop.org/show_bug.cgi?id=70665 +--- + rules/50-udev-default.rules | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules +index f764789..679dfdf 100644 +--- a/rules/50-udev-default.rules ++++ b/rules/50-udev-default.rules +@@ -20,9 +20,7 @@ KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP= + + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + +-SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" +-SUBSYSTEM=="input", KERNEL=="ts[0-9]*|uinput", MODE="0640" +-SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0644" ++SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0664" + + SUBSYSTEM=="video4linux", GROUP="video" + SUBSYSTEM=="misc", KERNEL=="agpgart", GROUP="video" +@@ -63,7 +61,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk" + SUBSYSTEM=="aoe", GROUP="disk", MODE="0220" + SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" + +-KERNEL=="rfkill", MODE="0644" ++KERNEL=="rfkill", MODE="0664" + KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" + + KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" +-- +1.8.4.652.g0d6e0ce + diff --git a/0049-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch b/0049-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch deleted file mode 100644 index 5268809..0000000 --- a/0049-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 41d174a74c7c7ebcc5b00fe92ef4647f47551e96 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Thu, 17 Oct 2013 03:20:46 +0200 -Subject: [PATCH] tmpfiles: log unaccessible FUSE mount points only as debug - message - ---- - src/tmpfiles/tmpfiles.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 8122d6a..239e56b 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -275,12 +275,15 @@ static int dir_cleanup( - continue; - - if (fstatat(dirfd(d), dent->d_name, &s, AT_SYMLINK_NOFOLLOW) < 0) { -+ if (errno == ENOENT) -+ continue; - -- if (errno != ENOENT) { -+ /* FUSE, NFS mounts, SELinux might return EACCES */ -+ if (errno == EACCES) -+ log_debug("stat(%s/%s) failed: %m", p, dent->d_name); -+ else - log_error("stat(%s/%s) failed: %m", p, dent->d_name); -- r = -errno; -- } -- -+ r = -errno; - continue; - } - --- -1.8.4.652.g0d6e0ce - diff --git a/0050-analyze-set-white-backgound.patch b/0050-analyze-set-white-backgound.patch new file mode 100644 index 0000000..47399ca --- /dev/null +++ b/0050-analyze-set-white-backgound.patch @@ -0,0 +1,36 @@ +From ff86c42c8614828be77810a50202e1f771b35ff3 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Mon, 21 Oct 2013 21:29:23 +0200 +Subject: [PATCH] analyze: set white backgound + +In programs like eog and gimp the transparant background did not +look very good. + +https://bugs.freedesktop.org/show_bug.cgi?id=70720 +--- + src/analyze/systemd-analyze.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c +index a4f15eb..9a69795 100644 +--- a/src/analyze/systemd-analyze.c ++++ b/src/analyze/systemd-analyze.c +@@ -507,6 +507,7 @@ static int analyze_plot(DBusConnection *bus) { + /* style sheet */ + svg("\n \n\n\n"); + ++ svg("\n"); + svg("%s", pretty_times); + svg("%s %s (%s %s) %s", + isempty(osname) ? "Linux" : osname, +-- +1.8.4.652.g0d6e0ce + diff --git a/0050-hwdb-update.patch b/0050-hwdb-update.patch deleted file mode 100644 index 6f17c34..0000000 --- a/0050-hwdb-update.patch +++ /dev/null @@ -1,1632 +0,0 @@ -From a697938328b686626abe0b8ac1878954a4705672 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Sun, 20 Oct 2013 01:12:29 +0200 -Subject: [PATCH] hwdb: update - ---- - hwdb/20-OUI.hwdb | 391 +++++++++++++++++++++++++++++++++++++++++- - hwdb/20-pci-vendor-model.hwdb | 216 ++++++++++++++++++++--- - 2 files changed, 578 insertions(+), 29 deletions(-) - -diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb -index e913b28..5067167 100644 ---- a/hwdb/20-OUI.hwdb -+++ b/hwdb/20-OUI.hwdb -@@ -12278,7 +12278,7 @@ OUI:40D85501B* - ID_OUI_FROM_DATABASE=Audio Enhancement - - OUI:40D85501C* -- ID_OUI_FROM_DATABASE=BERG -+ ID_OUI_FROM_DATABASE=BERG Cloud Limited - - OUI:40D85501D* - ID_OUI_FROM_DATABASE=Scharco Elektronik GmbH -@@ -13324,6 +13324,93 @@ OUI:40D85517B* - OUI:40D85517C* - ID_OUI_FROM_DATABASE=Critical Link - -+OUI:40D85517D* -+ ID_OUI_FROM_DATABASE=Kiwigrid GmbH -+ -+OUI:40D85517E* -+ ID_OUI_FROM_DATABASE=TOKHATEC -+ -+OUI:40D85517F* -+ ID_OUI_FROM_DATABASE=Telvent -+ -+OUI:40D855180* -+ ID_OUI_FROM_DATABASE=BroadSoft Inc -+ -+OUI:40D855181* -+ ID_OUI_FROM_DATABASE=eROCCA -+ -+OUI:40D855182* -+ ID_OUI_FROM_DATABASE=Georg Neumann GmbH -+ -+OUI:40D855183* -+ ID_OUI_FROM_DATABASE=EMAC, Inc. -+ -+OUI:40D855184* -+ ID_OUI_FROM_DATABASE=Satkirit Ltd -+ -+OUI:40D855185* -+ ID_OUI_FROM_DATABASE=Standard Change Makers -+ -+OUI:40D855186* -+ ID_OUI_FROM_DATABASE=KST technology -+ -+OUI:40D855187* -+ ID_OUI_FROM_DATABASE=CDEX Corp. -+ -+OUI:40D855188* -+ ID_OUI_FROM_DATABASE=Array Corporation -+ -+OUI:40D855189* -+ ID_OUI_FROM_DATABASE=Yoozma Corporation -+ -+OUI:40D85518A* -+ ID_OUI_FROM_DATABASE=Aplex Technology Inc. -+ -+OUI:40D85518B* -+ ID_OUI_FROM_DATABASE=Diagnosys Test Systems Ltd -+ -+OUI:40D85518C* -+ ID_OUI_FROM_DATABASE=EOS S.r.l. -+ -+OUI:40D85518D* -+ ID_OUI_FROM_DATABASE=Zoe Medical -+ -+OUI:40D85518E* -+ ID_OUI_FROM_DATABASE=Kerun Visual Technology Co., Ltd.(Shenzhen) -+ -+OUI:40D85518F* -+ ID_OUI_FROM_DATABASE=Beat Sensing co. , ltd. -+ -+OUI:40D855190* -+ ID_OUI_FROM_DATABASE=Spider Tecnologia Ind. e Com Ltda -+ -+OUI:40D855191* -+ ID_OUI_FROM_DATABASE=Soukai Electric -+ -+OUI:40D855192* -+ ID_OUI_FROM_DATABASE=GENERAL DYNAMICS C4 SYSTEMS -+ -+OUI:40D855193* -+ ID_OUI_FROM_DATABASE=FORZA SILICON CORP. -+ -+OUI:40D855194* -+ ID_OUI_FROM_DATABASE=RF Code -+ -+OUI:40D855195* -+ ID_OUI_FROM_DATABASE=TONNA ELECTRONIQUE -+ -+OUI:40D855196* -+ ID_OUI_FROM_DATABASE=Advanced Micro Controls Inc. -+ -+OUI:40D855197* -+ ID_OUI_FROM_DATABASE=Berg Cloud Limited -+ -+OUI:40D855198* -+ ID_OUI_FROM_DATABASE=devboards GmbH -+ -+OUI:40D855199* -+ ID_OUI_FROM_DATABASE=PRESSOL Schmiergeraete GmbH -+ - OUI:000000* - ID_OUI_FROM_DATABASE=XEROX CORPORATION - -@@ -46883,7 +46970,7 @@ OUI:0080B7* - ID_OUI_FROM_DATABASE=STELLAR COMPUTER - - OUI:0080B8* -- ID_OUI_FROM_DATABASE=BUG, INCORPORATED -+ ID_OUI_FROM_DATABASE=B.U.G. MORISEIKI, INCORPORATED - - OUI:0080B9* - ID_OUI_FROM_DATABASE=ARCHE TECHNOLIGIES INC. -@@ -51589,6 +51676,9 @@ OUI:04F7E4* - OUI:04F8C2* - ID_OUI_FROM_DATABASE=Flaircomm Microelectronics, Inc. - -+OUI:04F938* -+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD -+ - OUI:04FE31* - ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd - -@@ -52132,6 +52222,9 @@ OUI:08512E* - OUI:085240* - ID_OUI_FROM_DATABASE=EbV Elektronikbau- und Vertriebs GmbH - -+OUI:085AE0* -+ ID_OUI_FROM_DATABASE=Recovision Technology Co., Ltd. -+ - OUI:085B0E* - ID_OUI_FROM_DATABASE=Fortinet, Inc. - -@@ -52297,6 +52390,9 @@ OUI:08FC52* - OUI:08FC88* - ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd - -+OUI:08FD0E* -+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd -+ - OUI:0C0400* - ID_OUI_FROM_DATABASE=Jantar d.o.o. - -@@ -52306,6 +52402,9 @@ OUI:0C0535* - OUI:0C1105* - ID_OUI_FROM_DATABASE=Ringslink (Xiamen) Network Communication Technologies Co., Ltd - -+OUI:0C1262* -+ ID_OUI_FROM_DATABASE=zte corporation -+ - OUI:0C130B* - ID_OUI_FROM_DATABASE=Uniqoteq Ltd. - -@@ -52366,6 +52465,9 @@ OUI:0C4DE9* - OUI:0C51F7* - ID_OUI_FROM_DATABASE=CHAUVIN ARNOUX - -+OUI:0C54A5* -+ ID_OUI_FROM_DATABASE=PEGATRON CORPORATION -+ - OUI:0C5521* - ID_OUI_FROM_DATABASE=Axiros GmbH - -@@ -52627,6 +52729,9 @@ OUI:100D7F* - OUI:100E2B* - ID_OUI_FROM_DATABASE=NEC CASIO Mobile Communications - -+OUI:100E7E* -+ ID_OUI_FROM_DATABASE=Juniper networks -+ - OUI:1010B6* - ID_OUI_FROM_DATABASE=McCain Inc - -@@ -53023,6 +53128,9 @@ OUI:149090* - OUI:149448* - ID_OUI_FROM_DATABASE=BLU CASTLE S.A. - -+OUI:1499E2* -+ ID_OUI_FROM_DATABASE=Apple, Inc -+ - OUI:149FE8* - ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd. - -@@ -53095,6 +53203,9 @@ OUI:14EE9D* - OUI:14F0C5* - ID_OUI_FROM_DATABASE=Xtremio Ltd. - -+OUI:14F28E* -+ ID_OUI_FROM_DATABASE=ShenYang ZhongKe-Allwin Technology Co.LTD -+ - OUI:14F42A* - ID_OUI_FROM_DATABASE=Samsung Electronics - -@@ -53257,6 +53368,9 @@ OUI:1867B0* - OUI:186D99* - ID_OUI_FROM_DATABASE=Adanis Inc. - -+OUI:1879A2* -+ ID_OUI_FROM_DATABASE=GMJ ELECTRIC LIMITED -+ - OUI:187A93* - ID_OUI_FROM_DATABASE=AMICCOM Electronics Corporation - -@@ -53440,6 +53554,9 @@ OUI:1C19DE* - OUI:1C1D67* - ID_OUI_FROM_DATABASE=Shenzhen Huawei Communication Technologies Co., Ltd - -+OUI:1C1D86* -+ ID_OUI_FROM_DATABASE=Cisco -+ - OUI:1C334D* - ID_OUI_FROM_DATABASE=ITS Telecom - -@@ -53803,6 +53920,9 @@ OUI:20858C* - OUI:208984* - ID_OUI_FROM_DATABASE=COMPAL INFORMATION (KUNSHAN) CO., LTD - -+OUI:208986* -+ ID_OUI_FROM_DATABASE=zte corporation -+ - OUI:20918A* - ID_OUI_FROM_DATABASE=PROFALUX - -@@ -53929,6 +54049,9 @@ OUI:20FEDB* - OUI:2401C7* - ID_OUI_FROM_DATABASE=Cisco - -+OUI:24050F* -+ ID_OUI_FROM_DATABASE=MTN Electronic Co. Ltd -+ - OUI:240917* - ID_OUI_FROM_DATABASE=Devlin Electronics Limited - -@@ -54034,6 +54157,9 @@ OUI:249442* - OUI:249504* - ID_OUI_FROM_DATABASE=SFR - -+OUI:24A2E1* -+ ID_OUI_FROM_DATABASE=Apple, Inc -+ - OUI:24A42C* - ID_OUI_FROM_DATABASE=KOUKAAM a.s. - -@@ -54043,6 +54169,9 @@ OUI:24A43C* - OUI:24A495* - ID_OUI_FROM_DATABASE=Thales Canada Inc. - -+OUI:24A87D* -+ ID_OUI_FROM_DATABASE=Panasonic Automotive Systems Asia Pacific(Thailand)Co.,Ltd. -+ - OUI:24A937* - ID_OUI_FROM_DATABASE=PURE Storage - -@@ -54121,6 +54250,9 @@ OUI:24DBAC* - OUI:24DBAD* - ID_OUI_FROM_DATABASE=ShopperTrak RCT Corporation - -+OUI:24DBED* -+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd -+ - OUI:24DEC6* - ID_OUI_FROM_DATABASE=Aruba Networks - -@@ -54130,6 +54262,9 @@ OUI:24E271* - OUI:24E6BA* - ID_OUI_FROM_DATABASE=JSC Zavod im. Kozitsky - -+OUI:24E9B3* -+ ID_OUI_FROM_DATABASE=Cisco -+ - OUI:24EA40* - ID_OUI_FROM_DATABASE=Systeme Helmholz GmbH - -@@ -54547,6 +54682,9 @@ OUI:2C553C* - OUI:2C59E5* - ID_OUI_FROM_DATABASE=Hewlett Packard - -+OUI:2C5A05* -+ ID_OUI_FROM_DATABASE=Nokia Corporation -+ - OUI:2C5AA3* - ID_OUI_FROM_DATABASE=PROMATE ELECTRONIC CO.LTD - -@@ -54940,6 +55078,9 @@ OUI:3407FB* - OUI:340804* - ID_OUI_FROM_DATABASE=D-Link Corporation - -+OUI:3413A8* -+ ID_OUI_FROM_DATABASE=Mediplan Limited -+ - OUI:3413E8* - ID_OUI_FROM_DATABASE=Intel Corporate - -@@ -55321,6 +55462,9 @@ OUI:386E21* - OUI:3872C0* - ID_OUI_FROM_DATABASE=COMTREND - -+OUI:387B47* -+ ID_OUI_FROM_DATABASE=AKELA, Inc. -+ - OUI:388345* - ID_OUI_FROM_DATABASE=TP-LINK TECHNOLOGIES CO., LTD. - -@@ -55390,6 +55534,9 @@ OUI:38C7BA* - OUI:38C85C* - ID_OUI_FROM_DATABASE=Cisco SPVTG - -+OUI:38C9A9* -+ ID_OUI_FROM_DATABASE=SMART High Reliability Solutions, Inc. -+ - OUI:38CA97* - ID_OUI_FROM_DATABASE=Contour Design LLC - -@@ -55459,6 +55606,9 @@ OUI:3C081E* - OUI:3C096D* - ID_OUI_FROM_DATABASE=Powerhouse Dynamics - -+OUI:3C0E23* -+ ID_OUI_FROM_DATABASE=Cisco -+ - OUI:3C0FC1* - ID_OUI_FROM_DATABASE=KBC Networks - -@@ -55507,6 +55657,9 @@ OUI:3C300C* - OUI:3C363D* - ID_OUI_FROM_DATABASE=Nokia Corporation - -+OUI:3C36E4* -+ ID_OUI_FROM_DATABASE=Arris Group, Inc. -+ - OUI:3C3888* - ID_OUI_FROM_DATABASE=ConnectQuest, llc - -@@ -55672,6 +55825,9 @@ OUI:3CD0F8* - OUI:3CD16E* - ID_OUI_FROM_DATABASE=Telepower Communication Co., Ltd - -+OUI:3CD4D6* -+ ID_OUI_FROM_DATABASE=WirelessWERX, Inc -+ - OUI:3CD7DA* - ID_OUI_FROM_DATABASE=SK Mtek microelectronics(shenzhen)limited - -@@ -55771,6 +55927,9 @@ OUI:402CF4* - OUI:403004* - ID_OUI_FROM_DATABASE=Apple - -+OUI:403067* -+ ID_OUI_FROM_DATABASE=Conlog (Pty) Ltd -+ - OUI:40336C* - ID_OUI_FROM_DATABASE=Godrej & Boyce Mfg. co. ltd - -@@ -55918,6 +56077,9 @@ OUI:40B3FC* - OUI:40B4F0* - ID_OUI_FROM_DATABASE=Juniper Networks - -+OUI:40B6B1* -+ ID_OUI_FROM_DATABASE=SUNGSAM CO,.Ltd -+ - OUI:40B7F3* - ID_OUI_FROM_DATABASE=ARRIS Group, Inc. - -@@ -55972,6 +56134,9 @@ OUI:40ECF8* - OUI:40EF4C* - ID_OUI_FROM_DATABASE=Fihonest communication co.,Ltd - -+OUI:40F02F* -+ ID_OUI_FROM_DATABASE=Liteon Technology Corporation -+ - OUI:40F14C* - ID_OUI_FROM_DATABASE=ISE Europe SPRL - -@@ -56203,6 +56368,12 @@ OUI:44C233* - OUI:44C39B* - ID_OUI_FROM_DATABASE=OOO RUBEZH NPO - -+OUI:44C4A9* -+ ID_OUI_FROM_DATABASE=Opticom Communication, LLC -+ -+OUI:44C56F* -+ ID_OUI_FROM_DATABASE=NGN Easy Satfinder (Tianjin) Electronic Co., Ltd -+ - OUI:44C9A2* - ID_OUI_FROM_DATABASE=Greenwald Industries - -@@ -56362,6 +56533,9 @@ OUI:48B253* - OUI:48B8DE* - ID_OUI_FROM_DATABASE=HOMEWINS TECHNOLOGY CO.,LTD. - -+OUI:48B977* -+ ID_OUI_FROM_DATABASE=PulseOn Oy -+ - OUI:48B9C2* - ID_OUI_FROM_DATABASE=Teletics Inc. - -@@ -56659,9 +56833,15 @@ OUI:4CCC34* - OUI:4CD637* - ID_OUI_FROM_DATABASE=Qsono Electronics Co., Ltd - -+OUI:4CD9C4* -+ ID_OUI_FROM_DATABASE=Magneti Marelli Automotive Electronics (Guangzhou) Co. Ltd -+ - OUI:4CDF3D* - ID_OUI_FROM_DATABASE=TEAM ENGINEERS ADVANCE TECHNOLOGIES INDIA PVT LTD - -+OUI:4CE1BB* -+ ID_OUI_FROM_DATABASE=Zhuhai HiFocus Technology Co., Ltd. -+ - OUI:4CE676* - ID_OUI_FROM_DATABASE=Buffalo Inc. - -@@ -56701,6 +56881,9 @@ OUI:5011EB* - OUI:5017FF* - ID_OUI_FROM_DATABASE=Cisco - -+OUI:501AC5* -+ ID_OUI_FROM_DATABASE=Microsoft -+ - OUI:50206B* - ID_OUI_FROM_DATABASE=Emerson Climate Technologies Transportation Solutions - -@@ -56812,6 +56995,9 @@ OUI:507D02* - OUI:507E5D* - ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation - -+OUI:508569* -+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,LTD -+ - OUI:5087B8* - ID_OUI_FROM_DATABASE=Nuvyyo Inc - -@@ -56995,6 +57181,9 @@ OUI:5435DF* - OUI:543968* - ID_OUI_FROM_DATABASE=Edgewater Networks Inc - -+OUI:5439DF* -+ ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD -+ - OUI:543D37* - ID_OUI_FROM_DATABASE=Ruckus Wireless - -@@ -57055,6 +57244,9 @@ OUI:5481AD* - OUI:54847B* - ID_OUI_FROM_DATABASE=Digital Devices GmbH - -+OUI:54880E* -+ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD. -+ - OUI:548922* - ID_OUI_FROM_DATABASE=Zelfy Inc - -@@ -57439,6 +57631,9 @@ OUI:5C2479* - OUI:5C260A* - ID_OUI_FROM_DATABASE=Dell Inc. - -+OUI:5C2AEF* -+ ID_OUI_FROM_DATABASE=Open Access Pty Ltd -+ - OUI:5C3327* - ID_OUI_FROM_DATABASE=Spazio Italia srl - -@@ -57547,6 +57742,9 @@ OUI:5CA39D* - OUI:5CA3EB* - ID_OUI_FROM_DATABASE=Lokel s.r.o. - -+OUI:5CA48A* -+ ID_OUI_FROM_DATABASE=Cisco -+ - OUI:5CAC4C* - ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. - -@@ -58228,6 +58426,9 @@ OUI:64E161* - OUI:64E599* - ID_OUI_FROM_DATABASE=EFM Networks - -+OUI:64E625* -+ ID_OUI_FROM_DATABASE=Woxu Wireless Co., Ltd -+ - OUI:64E682* - ID_OUI_FROM_DATABASE=Apple - -@@ -58318,6 +58519,9 @@ OUI:683EEC* - OUI:684352* - ID_OUI_FROM_DATABASE=Bhuu Limited - -+OUI:684898* -+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd -+ - OUI:684B88* - ID_OUI_FROM_DATABASE=Galtronics Telemetry Inc. - -@@ -58573,6 +58777,9 @@ OUI:6C3A84* - OUI:6C3BE5* - ID_OUI_FROM_DATABASE=Hewlett Packard - -+OUI:6C3C53* -+ ID_OUI_FROM_DATABASE=SoundHawk Corp -+ - OUI:6C3E6D* - ID_OUI_FROM_DATABASE=Apple - -@@ -58912,6 +59119,9 @@ OUI:706582* - OUI:70704C* - ID_OUI_FROM_DATABASE=Purple Communications, Inc - -+OUI:7071B3* -+ ID_OUI_FROM_DATABASE=Brain Corporation -+ - OUI:7071BC* - ID_OUI_FROM_DATABASE=PEGATRON CORPORATION - -@@ -58936,6 +59146,9 @@ OUI:7076F0* - OUI:707BE8* - ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD - -+OUI:707C18* -+ ID_OUI_FROM_DATABASE=ADATA Technology Co., Ltd -+ - OUI:707E43* - ID_OUI_FROM_DATABASE=ARRIS Group, Inc. - -@@ -59128,6 +59341,9 @@ OUI:74372F* - OUI:743889* - ID_OUI_FROM_DATABASE=ANNAX Anzeigesysteme GmbH - -+OUI:743ECB* -+ ID_OUI_FROM_DATABASE=Gentrice tech -+ - OUI:744401* - ID_OUI_FROM_DATABASE=NETGEAR - -@@ -59533,6 +59749,9 @@ OUI:78A6BD* - OUI:78A714* - ID_OUI_FROM_DATABASE=Amphenol - -+OUI:78A873* -+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd -+ - OUI:78AB60* - ID_OUI_FROM_DATABASE=ABB Australia - -@@ -59644,6 +59863,9 @@ OUI:78E8B6* - OUI:78EC22* - ID_OUI_FROM_DATABASE=Shanghai Qihui Telecom Technology Co., LTD - -+OUI:78EC74* -+ ID_OUI_FROM_DATABASE=Kyland-USA -+ - OUI:78EF4C* - ID_OUI_FROM_DATABASE=Unetconvergence Co., Ltd. - -@@ -59749,6 +59971,9 @@ OUI:7C3E9D* - OUI:7C438F* - ID_OUI_FROM_DATABASE=E-Band Communications Corp. - -+OUI:7C444C* -+ ID_OUI_FROM_DATABASE=Entertainment Solutions, S.L. -+ - OUI:7C49B9* - ID_OUI_FROM_DATABASE=Plexus Manufacturing Sdn Bhd - -@@ -59911,6 +60136,9 @@ OUI:7CC8D7* - OUI:7CCB0D* - ID_OUI_FROM_DATABASE=Antaira Technologies, LLC - -+OUI:7CCD11* -+ ID_OUI_FROM_DATABASE=MS-Magnet -+ - OUI:7CCD3C* - ID_OUI_FROM_DATABASE=Guangzhou Juzing Technology Co., Ltd - -@@ -60181,6 +60409,9 @@ OUI:80B95C* - OUI:80BAAC* - ID_OUI_FROM_DATABASE=TeleAdapt Ltd - -+OUI:80BAE6* -+ ID_OUI_FROM_DATABASE=Neets -+ - OUI:80BBEB* - ID_OUI_FROM_DATABASE=Satmap Systems Ltd - -@@ -60373,6 +60604,9 @@ OUI:847E40* - OUI:8482F4* - ID_OUI_FROM_DATABASE=Beijing Huasun Unicreate Technology Co., Ltd - -+OUI:848336* -+ ID_OUI_FROM_DATABASE=Newrun -+ - OUI:848371* - ID_OUI_FROM_DATABASE=Avaya, Inc - -@@ -60475,6 +60709,9 @@ OUI:84F64C* - OUI:84FCFE* - ID_OUI_FROM_DATABASE=Apple - -+OUI:84FE9E* -+ ID_OUI_FROM_DATABASE=RTC Industries, Inc. -+ - OUI:880355* - ID_OUI_FROM_DATABASE=Arcadyan Technology Corp. - -@@ -60634,6 +60871,9 @@ OUI:889821* - OUI:889B39* - ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd - -+OUI:889CA6* -+ ID_OUI_FROM_DATABASE=BTB Korea INC -+ - OUI:889FFA* - ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. - -@@ -60664,6 +60904,9 @@ OUI:88BFD5* - OUI:88C36E* - ID_OUI_FROM_DATABASE=Beijing Ereneben lnformation Technology Limited - -+OUI:88C626* -+ ID_OUI_FROM_DATABASE=Logitech - Ultimate Ears -+ - OUI:88C663* - ID_OUI_FROM_DATABASE=Apple - -@@ -60760,6 +61003,9 @@ OUI:8C2F39* - OUI:8C3330* - ID_OUI_FROM_DATABASE=EmFirst Co., Ltd. - -+OUI:8C3AE3* -+ ID_OUI_FROM_DATABASE=LG Electronics -+ - OUI:8C3C07* - ID_OUI_FROM_DATABASE=Skiva Technologies, Inc. - -@@ -60778,6 +61024,9 @@ OUI:8C4B59* - OUI:8C4CDC* - ID_OUI_FROM_DATABASE=PLANEX COMMUNICATIONS INC. - -+OUI:8C4DB9* -+ ID_OUI_FROM_DATABASE=Unmonday Ltd -+ - OUI:8C4DEA* - ID_OUI_FROM_DATABASE=Cerio Corporation - -@@ -60790,6 +61039,9 @@ OUI:8C53F7* - OUI:8C541D* - ID_OUI_FROM_DATABASE=LGE - -+OUI:8C569D* -+ ID_OUI_FROM_DATABASE=Imaging Solutions Group -+ - OUI:8C56C5* - ID_OUI_FROM_DATABASE=Nintendo Co., Ltd. - -@@ -60943,6 +61195,9 @@ OUI:8CDD8D* - OUI:8CDE52* - ID_OUI_FROM_DATABASE=ISSC Technologies Corp. - -+OUI:8CDE99* -+ ID_OUI_FROM_DATABASE=Comlab Inc. -+ - OUI:8CE081* - ID_OUI_FROM_DATABASE=zte corporation - -@@ -61138,6 +61393,9 @@ OUI:907F61* - OUI:908260* - ID_OUI_FROM_DATABASE=IEEE 1904.1 Working Group - -+OUI:90837A* -+ ID_OUI_FROM_DATABASE=General Electric Water & Process Technologies -+ - OUI:90840D* - ID_OUI_FROM_DATABASE=Apple - -@@ -61204,6 +61462,9 @@ OUI:90B21F* - OUI:90B8D0* - ID_OUI_FROM_DATABASE=Joyent, Inc. - -+OUI:90B931* -+ ID_OUI_FROM_DATABASE=Apple, Inc -+ - OUI:90B97D* - ID_OUI_FROM_DATABASE=Johnson Outdoors Marine Electronics d/b/a Minnkota - -@@ -61543,6 +61804,9 @@ OUI:94F720* - OUI:94FAE8* - ID_OUI_FROM_DATABASE=Shenzhen Eycom Technology Co., Ltd - -+OUI:94FBB2* -+ ID_OUI_FROM_DATABASE=Shenzhen Gongjin Electronics Co.,Ltd -+ - OUI:94FD1D* - ID_OUI_FROM_DATABASE=WhereWhen Corp - -@@ -61747,6 +62011,9 @@ OUI:98D6F7* - OUI:98D88C* - ID_OUI_FROM_DATABASE=Nortel Networks - -+OUI:98DA92* -+ ID_OUI_FROM_DATABASE=Vuzix Corporation -+ - OUI:98DCD9* - ID_OUI_FROM_DATABASE=UNITEC Co., Ltd. - -@@ -61780,6 +62047,9 @@ OUI:98FE03* - OUI:98FE94* - ID_OUI_FROM_DATABASE=Apple - -+OUI:98FF6A* -+ ID_OUI_FROM_DATABASE=OTEC(Shanghai)Technology Co.,Ltd. -+ - OUI:98FFD0* - ID_OUI_FROM_DATABASE=Lenovo Mobile Communication Technology Ltd. - -@@ -61849,6 +62119,9 @@ OUI:9C417C* - OUI:9C443D* - ID_OUI_FROM_DATABASE=CHENGDU XUGUANG TECHNOLOGY CO, LTD - -+OUI:9C44A6* -+ ID_OUI_FROM_DATABASE=SwiftTest, Inc. -+ - OUI:9C4563* - ID_OUI_FROM_DATABASE=DIMEP Sistemas - -@@ -61927,6 +62200,9 @@ OUI:9C7BD2* - OUI:9C807D* - ID_OUI_FROM_DATABASE=SYSCABLE Korea Inc. - -+OUI:9C80DF* -+ ID_OUI_FROM_DATABASE=Arcadyan Technology Corporation -+ - OUI:9C8888* - ID_OUI_FROM_DATABASE=Simac Techniek NV - -@@ -62098,6 +62374,9 @@ OUI:A01917* - OUI:A01C05* - ID_OUI_FROM_DATABASE=NIMAX TELECOM CO.,LTD. - -+OUI:A01D48* -+ ID_OUI_FROM_DATABASE=Hewlett Packard -+ - OUI:A02195* - ID_OUI_FROM_DATABASE=Samsung Electronics Digital Imaging - -@@ -62416,6 +62695,9 @@ OUI:A433D1* - OUI:A438FC* - ID_OUI_FROM_DATABASE=Plastic Logic - -+OUI:A43A69* -+ ID_OUI_FROM_DATABASE=Vers Inc -+ - OUI:A4466B* - ID_OUI_FROM_DATABASE=EOC Technology - -@@ -62461,6 +62743,9 @@ OUI:A46706* - OUI:A46E79* - ID_OUI_FROM_DATABASE=DFT System Co.Ltd - -+OUI:A47733* -+ ID_OUI_FROM_DATABASE=Google -+ - OUI:A47760* - ID_OUI_FROM_DATABASE=Nokia Corporation - -@@ -62911,6 +63196,9 @@ OUI:AC20AA* - OUI:AC220B* - ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC. - -+OUI:AC2DA3* -+ ID_OUI_FROM_DATABASE=TXTR GmbH -+ - OUI:AC2FA8* - ID_OUI_FROM_DATABASE=Humannix Co.,Ltd. - -@@ -62986,6 +63274,9 @@ OUI:AC6123* - OUI:AC6706* - ID_OUI_FROM_DATABASE=Ruckus Wireless - -+OUI:AC6BAC* -+ ID_OUI_FROM_DATABASE=Jenny Science AG -+ - OUI:AC6E1A* - ID_OUI_FROM_DATABASE=Shenzhen Gongjin Electronics Co.,Ltd - -@@ -63085,6 +63376,9 @@ OUI:ACBEB6* - OUI:ACC2EC* - ID_OUI_FROM_DATABASE=CLT INT'L IND. CORP. - -+OUI:ACC595* -+ ID_OUI_FROM_DATABASE=Graphite Systems -+ - OUI:ACC698* - ID_OUI_FROM_DATABASE=Kohzu Precision Co., Ltd. - -@@ -63172,6 +63466,9 @@ OUI:ACF7F3* - OUI:ACF97E* - ID_OUI_FROM_DATABASE=ELESYS INC. - -+OUI:ACFDEC* -+ ID_OUI_FROM_DATABASE=Apple, Inc -+ - OUI:B00594* - ID_OUI_FROM_DATABASE=Liteon Technology Corporation - -@@ -63193,6 +63490,9 @@ OUI:B01B7C* - OUI:B01C91* - ID_OUI_FROM_DATABASE=Elim Co - -+OUI:B024F3* -+ ID_OUI_FROM_DATABASE=Progeny Systems -+ - OUI:B0358D* - ID_OUI_FROM_DATABASE=Nokia Corporation - -@@ -63286,6 +63586,9 @@ OUI:B09134* - OUI:B0973A* - ID_OUI_FROM_DATABASE=E-Fuel Corporation - -+OUI:B0989F* -+ ID_OUI_FROM_DATABASE=LG CNS -+ - OUI:B09928* - ID_OUI_FROM_DATABASE=Fujitsu Limited - -@@ -63313,6 +63616,9 @@ OUI:B0AA36* - OUI:B0ACFA* - ID_OUI_FROM_DATABASE=Fujitsu Limited - -+OUI:B0ADAA* -+ ID_OUI_FROM_DATABASE=Avaya, Inc -+ - OUI:B0B2DC* - ID_OUI_FROM_DATABASE=Zyxel Communications Corporation - -@@ -63364,6 +63670,9 @@ OUI:B0D09C* - OUI:B0D2F5* - ID_OUI_FROM_DATABASE=Vello Systems, Inc. - -+OUI:B0D7C5* -+ ID_OUI_FROM_DATABASE=STP KFT -+ - OUI:B0DF3A* - ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd - -@@ -63466,6 +63775,9 @@ OUI:B43741* - OUI:B439D6* - ID_OUI_FROM_DATABASE=ProCurve Networking by HP - -+OUI:B43A28* -+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd -+ - OUI:B43DB2* - ID_OUI_FROM_DATABASE=Degreane Horizon - -@@ -63784,6 +64096,9 @@ OUI:B8782E* - OUI:B8797E* - ID_OUI_FROM_DATABASE=Secure Meters (UK) Limited - -+OUI:B87AC9* -+ ID_OUI_FROM_DATABASE=Siemens Ltd. -+ - OUI:B8871E* - ID_OUI_FROM_DATABASE=Good Mind Industries Co., Ltd. - -@@ -63823,6 +64138,9 @@ OUI:B8975A* - OUI:B898B0* - ID_OUI_FROM_DATABASE=Atlona Inc. - -+OUI:B898F7* -+ ID_OUI_FROM_DATABASE=Gionee Communication Equipment Co,Ltd.ShenZhen -+ - OUI:B89AED* - ID_OUI_FROM_DATABASE=OceanServer Technology, Inc - -@@ -63985,12 +64303,18 @@ OUI:BC125E* - OUI:BC1401* - ID_OUI_FROM_DATABASE=Hitron Technologies. Inc - -+OUI:BC14EF* -+ ID_OUI_FROM_DATABASE=ITON Technology Limited -+ - OUI:BC15A6* - ID_OUI_FROM_DATABASE=Taiwan Jantek Electronics,Ltd. - - OUI:BC1665* - ID_OUI_FROM_DATABASE=Cisco - -+OUI:BC1A67* -+ ID_OUI_FROM_DATABASE=YF Technology Co., Ltd -+ - OUI:BC20A4* - ID_OUI_FROM_DATABASE=Samsung Electronics - -@@ -64021,6 +64345,9 @@ OUI:BC2D98* - OUI:BC305B* - ID_OUI_FROM_DATABASE=Dell Inc. - -+OUI:BC307D* -+ ID_OUI_FROM_DATABASE=Wistron Neweb Corp. -+ - OUI:BC35E5* - ID_OUI_FROM_DATABASE=Hydro Systems Company - -@@ -64207,6 +64534,9 @@ OUI:BCE59F* - OUI:BCEA2B* - ID_OUI_FROM_DATABASE=CityCom GmbH - -+OUI:BCEE7B* -+ ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC. -+ - OUI:BCF2AF* - ID_OUI_FROM_DATABASE=devolo AG - -@@ -64324,6 +64654,9 @@ OUI:C0626B* - OUI:C06394* - ID_OUI_FROM_DATABASE=Apple - -+OUI:C064C6* -+ ID_OUI_FROM_DATABASE=Nokia Corporation -+ - OUI:C06599* - ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd - -@@ -64462,6 +64795,9 @@ OUI:C0E54E* - OUI:C0EAE4* - ID_OUI_FROM_DATABASE=Sonicwall - -+OUI:C0F1C4* -+ ID_OUI_FROM_DATABASE=Pacidal Corporation Ltd. -+ - OUI:C0F8DA* - ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd. - -@@ -64642,6 +64978,9 @@ OUI:C47F51* - OUI:C4823F* - ID_OUI_FROM_DATABASE=Fujian Newland Auto-ID Tech. Co,.Ltd. - -+OUI:C4824E* -+ ID_OUI_FROM_DATABASE=Changzhou Uchip Electronics Co., LTD. -+ - OUI:C48508* - ID_OUI_FROM_DATABASE=Intel Corporate - -@@ -65005,6 +65344,9 @@ OUI:C8F386* - OUI:C8F406* - ID_OUI_FROM_DATABASE=Avaya, Inc - -+OUI:C8F68D* -+ ID_OUI_FROM_DATABASE=S.E.TECHNOLOGIES LIMITED -+ - OUI:C8F704* - ID_OUI_FROM_DATABASE=Building Block Video - -@@ -65143,6 +65485,9 @@ OUI:CC5D57* - OUI:CC60BB* - ID_OUI_FROM_DATABASE=Empower RF Systems - -+OUI:CC65AD* -+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc. -+ - OUI:CC69B0* - ID_OUI_FROM_DATABASE=Global Traffic Technologies, LLC - -@@ -65533,6 +65878,9 @@ OUI:D0DFB2* - OUI:D0DFC7* - ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd - -+OUI:D0E140* -+ ID_OUI_FROM_DATABASE=Apple, Inc -+ - OUI:D0E347* - ID_OUI_FROM_DATABASE=Yoga - -@@ -65716,6 +66064,9 @@ OUI:D479C3* - OUI:D47B75* - ID_OUI_FROM_DATABASE=HARTING Electronics GmbH - -+OUI:D481CA* -+ ID_OUI_FROM_DATABASE=iDevices, LLC -+ - OUI:D4823E* - ID_OUI_FROM_DATABASE=Argosy Technologies, Ltd. - -@@ -65965,6 +66316,9 @@ OUI:D8543A* - OUI:D857EF* - ID_OUI_FROM_DATABASE=Samsung Electronics - -+OUI:D858D7* -+ ID_OUI_FROM_DATABASE=CZ.NIC, z.s.p.o. -+ - OUI:D85D4C* - ID_OUI_FROM_DATABASE=TP-LINK Technologies Co.,Ltd. - -@@ -66004,6 +66358,9 @@ OUI:D878E5* - OUI:D87988* - ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co., Ltd. - -+OUI:D87CDD* -+ ID_OUI_FROM_DATABASE=SANIX INCORPORATED -+ - OUI:D88A3B* - ID_OUI_FROM_DATABASE=UNIT-EM - -@@ -66475,6 +66832,9 @@ OUI:E067B3* - OUI:E06995* - ID_OUI_FROM_DATABASE=PEGATRON CORPORATION - -+OUI:E0750A* -+ ID_OUI_FROM_DATABASE=ALPS ERECTORIC CO.,LTD. -+ - OUI:E0757D* - ID_OUI_FROM_DATABASE=Motorola Mobility LLC - -@@ -66577,6 +66937,9 @@ OUI:E0C6B3* - OUI:E0C79D* - ID_OUI_FROM_DATABASE=Texas Instruments - -+OUI:E0C86A* -+ ID_OUI_FROM_DATABASE=SHENZHEN TW-SCIE Co., Ltd -+ - OUI:E0C922* - ID_OUI_FROM_DATABASE=Jireh Energy Tech., Ltd. - -@@ -66661,6 +67024,9 @@ OUI:E0F9BE* - OUI:E0FAEC* - ID_OUI_FROM_DATABASE=Platan sp. z o.o. sp. k. - -+OUI:E40439* -+ ID_OUI_FROM_DATABASE=TomTom Software Ltd -+ - OUI:E4115B* - ID_OUI_FROM_DATABASE=Hewlett Packard - -@@ -66997,6 +67363,9 @@ OUI:E85E53* - OUI:E8611F* - ID_OUI_FROM_DATABASE=Dawning Information Industry Co.,Ltd - -+OUI:E86183* -+ ID_OUI_FROM_DATABASE=Black Diamond Advanced Technology, LLC -+ - OUI:E86CDA* - ID_OUI_FROM_DATABASE=Supercomputers and Neurocomputers Research Center - -@@ -67435,6 +67804,9 @@ OUI:F02408* - OUI:F02572* - ID_OUI_FROM_DATABASE=CISCO SYSTEMS, INC. - -+OUI:F025B7* -+ ID_OUI_FROM_DATABASE=Samsung Electro Mechanics co., LTD. -+ - OUI:F0264C* - ID_OUI_FROM_DATABASE=Dr. Sigrist AG - -@@ -67486,6 +67858,9 @@ OUI:F05DC8* - OUI:F05F5A* - ID_OUI_FROM_DATABASE=Getriebebau NORD GmbH and Co. KG - -+OUI:F06130* -+ ID_OUI_FROM_DATABASE=Advantage Pharmacy Services, LLC -+ - OUI:F0620D* - ID_OUI_FROM_DATABASE=Shenzhen Egreat Tech Corp.,Ltd - -@@ -67681,6 +68056,9 @@ OUI:F40321* - OUI:F4044C* - ID_OUI_FROM_DATABASE=ValenceTech Limited - -+OUI:F4068D* -+ ID_OUI_FROM_DATABASE=devolo AG -+ - OUI:F40B93* - ID_OUI_FROM_DATABASE=Research In Motion - -@@ -68107,6 +68485,9 @@ OUI:F89FB8* - OUI:F8A03D* - ID_OUI_FROM_DATABASE=Dinstar Technologies Co., Ltd. - -+OUI:F8A2B4* -+ ID_OUI_FROM_DATABASE=RHEWA-WAAGENFABRIK August Freudewald GmbH &Co. KG -+ - OUI:F8A45F* - ID_OUI_FROM_DATABASE=Beijing Xiaomi communications co.,ltd - -@@ -68245,6 +68626,9 @@ OUI:FC0647* - OUI:FC0877* - ID_OUI_FROM_DATABASE=Prentke Romich Company - -+OUI:FC09D8* -+ ID_OUI_FROM_DATABASE=ACTEON Group -+ - OUI:FC0A81* - ID_OUI_FROM_DATABASE=Motorola Solutions Inc. - -@@ -68314,6 +68698,9 @@ OUI:FC455F* - OUI:FC48EF* - ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD - -+OUI:FC4B1C* -+ ID_OUI_FROM_DATABASE=INTERSENSOR S.R.L. -+ - OUI:FC4BBC* - ID_OUI_FROM_DATABASE=Sunplus Technology Co., Ltd. - -diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb -index fdb534d..289f81c 100644 ---- a/hwdb/20-pci-vendor-model.hwdb -+++ b/hwdb/20-pci-vendor-model.hwdb -@@ -4158,7 +4158,7 @@ pci:v00001002d00005F57* - ID_MODEL_FROM_DATABASE=R423 [Radeon X800 XT] - - pci:v00001002d00006600* -- ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8750M] -+ ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8670A/8670M/8750M] - - pci:v00001002d00006601* - ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8730M] -@@ -4169,6 +4169,12 @@ pci:v00001002d00006602* - pci:v00001002d00006603* - ID_MODEL_FROM_DATABASE=Mars - -+pci:v00001002d00006604* -+ ID_MODEL_FROM_DATABASE=Mars [Radeon R7 M265] -+ -+pci:v00001002d00006605* -+ ID_MODEL_FROM_DATABASE=Mars [Radeon R7 M260] -+ - pci:v00001002d00006606* - ID_MODEL_FROM_DATABASE=Mars XTX [Radeon HD 8790M] - -@@ -4176,13 +4182,13 @@ pci:v00001002d00006607* - ID_MODEL_FROM_DATABASE=Mars LE [Radeon HD 8530M] - - pci:v00001002d00006610* -- ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8600 Series] -+ ID_MODEL_FROM_DATABASE=Oland XT [Radeon HD 8670/R7 250] - - pci:v00001002d00006611* - ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8570] - - pci:v00001002d00006613* -- ID_MODEL_FROM_DATABASE=Oland [Radeon HD 8500 Series] -+ ID_MODEL_FROM_DATABASE=Oland PRO [Radeon R7 240] - - pci:v00001002d00006620* - ID_MODEL_FROM_DATABASE=Mars -@@ -4197,10 +4203,10 @@ pci:v00001002d00006631* - ID_MODEL_FROM_DATABASE=Oland - - pci:v00001002d00006640* -- ID_MODEL_FROM_DATABASE=Saturn [Radeon HD 8950] -+ ID_MODEL_FROM_DATABASE=Saturn XT [Radeon HD 8950M] - - pci:v00001002d00006641* -- ID_MODEL_FROM_DATABASE=Saturn PRO -+ ID_MODEL_FROM_DATABASE=Saturn PRO [Radeon HD 8930M] - - pci:v00001002d00006649* - ID_MODEL_FROM_DATABASE=Bonaire -@@ -4236,13 +4242,13 @@ pci:v00001002d0000665Csv00001787sd00002329* - ID_MODEL_FROM_DATABASE=Radeon HD 7790 TurboDuo - - pci:v00001002d0000665D* -- ID_MODEL_FROM_DATABASE=Bonaire -+ ID_MODEL_FROM_DATABASE=Bonaire [Radeon R7 200 Series] - - pci:v00001002d00006660* -- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A] -+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M] - - pci:v00001002d00006663* -- ID_MODEL_FROM_DATABASE=Sun PRO [Radeon HD 8500M Series] -+ ID_MODEL_FROM_DATABASE=Sun PRO [Radeon HD 8570M] - - pci:v00001002d00006664* - ID_MODEL_FROM_DATABASE=Jet XT [Radeon R5 M200 Series] -@@ -4254,7 +4260,7 @@ pci:v00001002d00006667* - ID_MODEL_FROM_DATABASE=Jet ULT [Radeon R5 M200 Series] - - pci:v00001002d0000666F* -- ID_MODEL_FROM_DATABASE=Sun [Radeon HD 8500M] -+ ID_MODEL_FROM_DATABASE=Sun LE [Radeon HD 8550M] - - pci:v00001002d00006670* - ID_MODEL_FROM_DATABASE=Hainan -@@ -5675,6 +5681,15 @@ pci:v00001002d0000678Asv00001002sd0000030C* - pci:v00001002d0000678Asv00001002sd00000310* - ID_MODEL_FROM_DATABASE=FirePro S9000 - -+pci:v00001002d0000678Asv00001002sd00000420* -+ ID_MODEL_FROM_DATABASE=Radeon Sky 700 -+ -+pci:v00001002d0000678Asv00001002sd00000422* -+ ID_MODEL_FROM_DATABASE=Radeon Sky 900 -+ -+pci:v00001002d0000678Asv00001002sd00000B0E* -+ ID_MODEL_FROM_DATABASE=FirePro S10000 Passive -+ - pci:v00001002d0000678Asv00001002sd00000B2A* - ID_MODEL_FROM_DATABASE=FirePro S10000 - -@@ -5691,11 +5706,14 @@ pci:v00001002d00006792* - ID_MODEL_FROM_DATABASE=Tahiti - - pci:v00001002d00006798* -- ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970] -+ ID_MODEL_FROM_DATABASE=Tahiti XT [Radeon HD 7970/R9 280X] - - pci:v00001002d00006798sv00001002sd00003000* - ID_MODEL_FROM_DATABASE=Tahiti XT2 [Radeon HD 7970 GHz Edition] - -+pci:v00001002d00006798sv00001002sd00003001* -+ ID_MODEL_FROM_DATABASE=Tahiti XTL [Radeon R9 280X] -+ - pci:v00001002d00006798sv00001002sd00004000* - ID_MODEL_FROM_DATABASE=Radeon HD 8970 OEM - -@@ -5717,6 +5735,12 @@ pci:v00001002d00006798sv00001043sd0000044A* - pci:v00001002d00006798sv00001043sd0000044C* - ID_MODEL_FROM_DATABASE=Tahiti XT2 [Matrix HD 7970 Platinum] - -+pci:v00001002d00006798sv00001043sd00003001* -+ ID_MODEL_FROM_DATABASE=Tahiti XTL [ROG Matrix R9 280X] -+ -+pci:v00001002d00006798sv00001043sd00003006* -+ ID_MODEL_FROM_DATABASE=Tahiti XTL [Radeon R9 280X DirectCU II TOP] -+ - pci:v00001002d00006798sv00001043sd00009999* - ID_MODEL_FROM_DATABASE=ARES II - -@@ -5771,6 +5795,9 @@ pci:v00001002d0000679Bsv00001002sd00000B2A* - pci:v00001002d0000679Bsv00001462sd00008036* - ID_MODEL_FROM_DATABASE=Radeon HD 8990 OEM - -+pci:v00001002d0000679Bsv0000148Csd00008990* -+ ID_MODEL_FROM_DATABASE=Radeon HD 8990 OEM -+ - pci:v00001002d0000679E* - ID_MODEL_FROM_DATABASE=Tahiti LE [Radeon HD 7870 XT] - -@@ -5834,6 +5861,9 @@ pci:v00001002d00006808* - pci:v00001002d00006808sv00001002sd00000310* - ID_MODEL_FROM_DATABASE=FirePro S7000 - -+pci:v00001002d00006808sv00001002sd00000420* -+ ID_MODEL_FROM_DATABASE=Radeon Sky 500 -+ - pci:v00001002d00006809* - ID_MODEL_FROM_DATABASE=Pitcairn LE GL [FirePro W5000] - -@@ -5865,19 +5895,22 @@ pci:v00001002d00006819sv0000174Bsd0000E221* - ID_MODEL_FROM_DATABASE=Radeon HD 7850 2GB GDDR5 DVI-I/DVI-D/HDMI/DP - - pci:v00001002d00006820* -- ID_MODEL_FROM_DATABASE=Venus XTX [Radeon HD 8800M Series] -+ ID_MODEL_FROM_DATABASE=Venus XTX [Radeon HD 8890M] - - pci:v00001002d00006820sv0000103Csd00001851* - ID_MODEL_FROM_DATABASE=Radeon HD 7750M - - pci:v00001002d00006821* -- ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8800M Series] -+ ID_MODEL_FROM_DATABASE=Venus XT [Radeon HD 8870M] -+ -+pci:v00001002d00006821sv00001002sd0000031E* -+ ID_MODEL_FROM_DATABASE=FirePro SX4000 - - pci:v00001002d00006822* - ID_MODEL_FROM_DATABASE=Venus PRO - - pci:v00001002d00006823* -- ID_MODEL_FROM_DATABASE=Venus PRO [Radeon HD 8800M Series] -+ ID_MODEL_FROM_DATABASE=Venus PRO [Radeon HD 8850M] - - pci:v00001002d00006825* - ID_MODEL_FROM_DATABASE=Heathrow XT [Radeon HD 7870M] -@@ -5901,7 +5934,7 @@ pci:v00001002d0000682A* - ID_MODEL_FROM_DATABASE=Venus PRO - - pci:v00001002d0000682B* -- ID_MODEL_FROM_DATABASE=Venus LE [Radeon HD 8800M Series] -+ ID_MODEL_FROM_DATABASE=Venus LE [Radeon HD 8830M] - - pci:v00001002d0000682D* - ID_MODEL_FROM_DATABASE=Chelsea XT GL [FirePro M4000] -@@ -5919,7 +5952,7 @@ pci:v00001002d00006831* - ID_MODEL_FROM_DATABASE=Cape Verde [AMD Radeon HD 7700M Series] - - pci:v00001002d00006835* -- ID_MODEL_FROM_DATABASE=Cape Verde PRX [Radeon R7 200 Series] -+ ID_MODEL_FROM_DATABASE=Cape Verde PRX [Radeon R7 260] - - pci:v00001002d00006837* - ID_MODEL_FROM_DATABASE=Cape Verde LE [Radeon HD 7730/8730] -@@ -16466,6 +16499,12 @@ pci:v00001077d00008031* - pci:v00001077d00008032* - ID_MODEL_FROM_DATABASE=8300 Series 10GbE Converged Network Adapter (iSCSI) - -+pci:v00001077d00008430* -+ ID_MODEL_FROM_DATABASE=ISP8324 1/10GbE Converged Network Controller (NIC VF) -+ -+pci:v00001077d00008431* -+ ID_MODEL_FROM_DATABASE=8300 Series 10GbE Converged Network Adapter (FCoE VF) -+ - pci:v00001077d00008432* - ID_MODEL_FROM_DATABASE=ISP2432M-based 10GbE Converged Network Adapter (CNA) - -@@ -17090,6 +17129,12 @@ pci:v00001093d00002890* - pci:v00001093d000028C0* - ID_MODEL_FROM_DATABASE=PCI-6014 - -+pci:v00001093d000028D0* -+ ID_MODEL_FROM_DATABASE=PCI-5122 -+ -+pci:v00001093d000028E0* -+ ID_MODEL_FROM_DATABASE=PXI-5122 -+ - pci:v00001093d00002A60* - ID_MODEL_FROM_DATABASE=PCI-6023E - -@@ -17174,12 +17219,33 @@ pci:v00001093d000070BF* - pci:v00001093d000070C0* - ID_MODEL_FROM_DATABASE=PCI-6143 - -+pci:v00001093d000070F0* -+ ID_MODEL_FROM_DATABASE=PXI-5922 -+ -+pci:v00001093d000070F1* -+ ID_MODEL_FROM_DATABASE=PCI-5922 -+ - pci:v00001093d000070F2* - ID_MODEL_FROM_DATABASE=PCI-6224 - -+pci:v00001093d00007121* -+ ID_MODEL_FROM_DATABASE=PXI-5122EX -+ -+pci:v00001093d00007122* -+ ID_MODEL_FROM_DATABASE=PCI-5122EX -+ - pci:v00001093d00007144* - ID_MODEL_FROM_DATABASE=PXI-5124 (12-bit 200 MS/s Digitizer) - -+pci:v00001093d00007145* -+ ID_MODEL_FROM_DATABASE=PCI-5124 -+ -+pci:v00001093d0000714C* -+ ID_MODEL_FROM_DATABASE=PXI-5114 -+ -+pci:v00001093d0000714D* -+ ID_MODEL_FROM_DATABASE=PCI-5114 -+ - pci:v00001093d0000716C* - ID_MODEL_FROM_DATABASE=PCI-6225 - -@@ -17195,6 +17261,60 @@ pci:v00001093d000071BC* - pci:v00001093d000071D0* - ID_MODEL_FROM_DATABASE=PXI-6143 - -+pci:v00001093d00007260* -+ ID_MODEL_FROM_DATABASE=PXI-5142 -+ -+pci:v00001093d00007261* -+ ID_MODEL_FROM_DATABASE=PCI-5142 -+ -+pci:v00001093d000072A8* -+ ID_MODEL_FROM_DATABASE=PXI-5152 -+ -+pci:v00001093d000072A9* -+ ID_MODEL_FROM_DATABASE=PCI-5152 -+ -+pci:v00001093d000072AA* -+ ID_MODEL_FROM_DATABASE=PXI-5105 -+ -+pci:v00001093d000072AB* -+ ID_MODEL_FROM_DATABASE=PCI-5105 -+ -+pci:v00001093d0000730F* -+ ID_MODEL_FROM_DATABASE=PXI-5922EX -+ -+pci:v00001093d00007310* -+ ID_MODEL_FROM_DATABASE=PCI-5922EX -+ -+pci:v00001093d00007333* -+ ID_MODEL_FROM_DATABASE=PXI-5900 -+ -+pci:v00001093d00007349* -+ ID_MODEL_FROM_DATABASE=PXI-5154 -+ -+pci:v00001093d0000734A* -+ ID_MODEL_FROM_DATABASE=PCI-5154 -+ -+pci:v00001093d0000737D* -+ ID_MODEL_FROM_DATABASE=PXI-5124EX -+ -+pci:v00001093d000073F0* -+ ID_MODEL_FROM_DATABASE=PXI-5153 -+ -+pci:v00001093d000073F1* -+ ID_MODEL_FROM_DATABASE=PCI-5153 -+ -+pci:v00001093d0000745E* -+ ID_MODEL_FROM_DATABASE=PXI-5153EX -+ -+pci:v00001093d0000745F* -+ ID_MODEL_FROM_DATABASE=PCI-5153EX -+ -+pci:v00001093d00007460* -+ ID_MODEL_FROM_DATABASE=PXI-5154EX -+ -+pci:v00001093d00007461* -+ ID_MODEL_FROM_DATABASE=PCI-5154EX -+ - pci:v00001093d0000B001* - ID_MODEL_FROM_DATABASE=IMAQ-PCI-1408 - -@@ -17226,7 +17346,10 @@ pci:v00001093d0000B091* - ID_MODEL_FROM_DATABASE=IMAQ-PXI-1411 - - pci:v00001093d0000C4C4* -- ID_MODEL_FROM_DATABASE=PXIe-4353 -+ ID_MODEL_FROM_DATABASE=PXIe-4353/5160 -+ -+pci:v00001093d0000C4C4sv00001093sd000076D0* -+ ID_MODEL_FROM_DATABASE=PXIe-5160 - - pci:v00001093d0000C801* - ID_MODEL_FROM_DATABASE=PCI-GPIB -@@ -25557,10 +25680,10 @@ pci:v000010DEd00000FE5* - ID_MODEL_FROM_DATABASE=GK107 [GeForce K340 USM] - - pci:v000010DEd00000FE6* -- ID_MODEL_FROM_DATABASE=GK107 [NVS K1 USM] -+ ID_MODEL_FROM_DATABASE=GK107 [GRID K1 NVS USM] - - pci:v000010DEd00000FE7* -- ID_MODEL_FROM_DATABASE=GK107GL [GRID K1] -+ ID_MODEL_FROM_DATABASE=GK107GL [GRID K100 vGPU] - - pci:v000010DEd00000FE7sv000010DEsd0000101E* - ID_MODEL_FROM_DATABASE=GRID K100 -@@ -25575,13 +25698,13 @@ pci:v000010DEd00000FF2* - ID_MODEL_FROM_DATABASE=GK107GL [GRID K1] - - pci:v000010DEd00000FF5* -- ID_MODEL_FROM_DATABASE=GK107GL [Tesla K1 USM] -+ ID_MODEL_FROM_DATABASE=GK107GL [GRID K1 Tesla USM] - - pci:v000010DEd00000FF6* - ID_MODEL_FROM_DATABASE=GK107GLM [Quadro K1100M] - - pci:v000010DEd00000FF7* -- ID_MODEL_FROM_DATABASE=GK107GL [Quadro K1 USM] -+ ID_MODEL_FROM_DATABASE=GK107GL [GRID K140Q vGPU] - - pci:v000010DEd00000FF7sv000010DEsd00001037* - ID_MODEL_FROM_DATABASE=GRID K140Q -@@ -25652,6 +25775,9 @@ pci:v000010DEd00001021* - pci:v000010DEd00001022* - ID_MODEL_FROM_DATABASE=GK110GL [Tesla K20c] - -+pci:v000010DEd00001024* -+ ID_MODEL_FROM_DATABASE=GK110GL [Tesla K40c] -+ - pci:v000010DEd00001026* - ID_MODEL_FROM_DATABASE=GK110GL [Tesla K20s] - -@@ -26246,6 +26372,9 @@ pci:v000010DEd00001140sv000017AAsd00003983* - pci:v000010DEd00001140sv000017AAsd00005003* - ID_MODEL_FROM_DATABASE=GeForce GT 720M - -+pci:v000010DEd00001140sv000017AAsd00005005* -+ ID_MODEL_FROM_DATABASE=GeForce 705M -+ - pci:v000010DEd00001140sv000017AAsd0000500D* - ID_MODEL_FROM_DATABASE=GeForce GT 620M - -@@ -26334,13 +26463,13 @@ pci:v000010DEd0000118A* - ID_MODEL_FROM_DATABASE=GK104GL [GRID K520] - - pci:v000010DEd0000118B* -- ID_MODEL_FROM_DATABASE=GK104 [GeForce K2 USM] -+ ID_MODEL_FROM_DATABASE=GK104GL [GRID K2 GeForce USM] - - pci:v000010DEd0000118C* -- ID_MODEL_FROM_DATABASE=GK104 [NVS K2 USM] -+ ID_MODEL_FROM_DATABASE=GK104 [GRID K2 NVS USM] - - pci:v000010DEd0000118D* -- ID_MODEL_FROM_DATABASE=GK104GL [GRID K2] -+ ID_MODEL_FROM_DATABASE=GK104GL [GRID K200 vGPU] - - pci:v000010DEd0000118Dsv000010DEsd0000101D* - ID_MODEL_FROM_DATABASE=GRID K200 -@@ -26351,6 +26480,9 @@ pci:v000010DEd0000118E* - pci:v000010DEd0000118F* - ID_MODEL_FROM_DATABASE=GK104GL [Tesla K10] - -+pci:v000010DEd00001193* -+ ID_MODEL_FROM_DATABASE=GK104 [GeForce GTX 760 Ti OEM] -+ - pci:v000010DEd0000119D* - ID_MODEL_FROM_DATABASE=GK104M [GeForce GTX 775M] - -@@ -26379,7 +26511,7 @@ pci:v000010DEd000011A7* - ID_MODEL_FROM_DATABASE=GK104M [GeForce GTX 675MX] - - pci:v000010DEd000011B0* -- ID_MODEL_FROM_DATABASE=GK104GL [Quadro K2 USM] -+ ID_MODEL_FROM_DATABASE=GK104GL [GRID K240Q\K260Q vGPU] - - pci:v000010DEd000011B0sv000010DEsd0000101A* - ID_MODEL_FROM_DATABASE=GRID K240Q -@@ -26388,7 +26520,7 @@ pci:v000010DEd000011B0sv000010DEsd0000101B* - ID_MODEL_FROM_DATABASE=GRID K260Q - - pci:v000010DEd000011B1* -- ID_MODEL_FROM_DATABASE=GK104GL [Tesla K2 USM] -+ ID_MODEL_FROM_DATABASE=GK104GL [GRID K2 Tesla USM] - - pci:v000010DEd000011B6* - ID_MODEL_FROM_DATABASE=GK104GLM [Quadro K3100M] -@@ -32642,6 +32774,9 @@ pci:v00001179d00000618* - pci:v00001179d00000701* - ID_MODEL_FROM_DATABASE=FIR Port Type-O - -+pci:v00001179d00000803* -+ ID_MODEL_FROM_DATABASE=TC6371AF SD Host Controller -+ - pci:v00001179d00000804* - ID_MODEL_FROM_DATABASE=TC6371AF SmartMedia Controller - -@@ -40046,6 +40181,9 @@ pci:v000013F6d00008788sv000014C3sd00001710* - pci:v000013F6d00008788sv000014C3sd00001711* - ID_MODEL_FROM_DATABASE=HiFier Serenade - -+pci:v000013F6d00008788sv000014C3sd00001713* -+ ID_MODEL_FROM_DATABASE=HiFier Serenade III -+ - pci:v000013F6d00008788sv00001A58sd00000910* - ID_MODEL_FROM_DATABASE=Barracuda AC-1 - -@@ -50711,8 +50849,11 @@ pci:v00001A41d00000002* - pci:v00001A41d00000200* - ID_MODEL_FROM_DATABASE=TILE-Gx processor - -+pci:v00001A41d00000201* -+ ID_MODEL_FROM_DATABASE=TILE-Gx Processor Virtual Function -+ - pci:v00001A41d00002000* -- ID_MODEL_FROM_DATABASE=TILE-Gx PCI Express Bridge -+ ID_MODEL_FROM_DATABASE=TILE-Gx PCI Express Root Port - - pci:v00001A4A* - ID_VENDOR_FROM_DATABASE=SLAC National Accelerator Lab PPA-REG -@@ -51353,6 +51494,15 @@ pci:v00001CC5* - pci:v00001CC5d00000100* - ID_MODEL_FROM_DATABASE=CAN-PCIe-02 - -+pci:v00001CE4* -+ ID_VENDOR_FROM_DATABASE=Exablaze -+ -+pci:v00001CE4d00000001* -+ ID_MODEL_FROM_DATABASE=ExaNIC X4 -+ -+pci:v00001CE4d00000002* -+ ID_MODEL_FROM_DATABASE=ExaNIC X2 -+ - pci:v00001D44* - ID_VENDOR_FROM_DATABASE=DPT - -@@ -54131,6 +54281,9 @@ pci:v00008086d000008B4sv00008086sd00000270* - pci:v00008086d000008B4sv00008086sd00008270* - ID_MODEL_FROM_DATABASE=Dual Band Wireless AC 3160 - -+pci:v00008086d000008CF* -+ ID_MODEL_FROM_DATABASE=Atom Processor Z2760 Integrated Graphics Controller -+ - pci:v00008086d00000960* - ID_MODEL_FROM_DATABASE=80960RP (i960RP) Microprocessor/Bridge - -@@ -56369,6 +56522,9 @@ pci:v00008086d000010FBsv0000103Csd0000211B* - pci:v00008086d000010FBsv0000103Csd00002147* - ID_MODEL_FROM_DATABASE=Ethernet 10Gb 1-port 561i Adapter - -+pci:v00008086d000010FBsv0000103Csd00002159* -+ ID_MODEL_FROM_DATABASE=Ethernet 10Gb 2-port 562i Adapter -+ - pci:v00008086d000010FBsv0000108Esd00007B11* - ID_MODEL_FROM_DATABASE=Ethernet Server Adapter X520-2 - -@@ -57290,6 +57446,9 @@ pci:v00008086d00001528sv00001028sd00001F61* - pci:v00008086d00001528sv0000103Csd0000192D* - ID_MODEL_FROM_DATABASE=561FLR-T 2-port 10Gb Ethernet Adapter - -+pci:v00008086d00001528sv0000103Csd00002004* -+ ID_MODEL_FROM_DATABASE=Ethernet 10Gb 2-port 561i Adapter -+ - pci:v00008086d00001528sv0000103Csd0000211A* - ID_MODEL_FROM_DATABASE=Ethernet 10Gb 2-port 561T Adapter - -@@ -57416,6 +57575,9 @@ pci:v00008086d0000155D* - pci:v00008086d0000155Dsv00008086sd00000001* - ID_MODEL_FROM_DATABASE=Ethernet Server Bypass Adapter X520-SR2 - -+pci:v00008086d0000155Dsv00008086sd00000002* -+ ID_MODEL_FROM_DATABASE=Ethernet Server Bypass Adapter X520-LR2 -+ - pci:v00008086d00001560* - ID_MODEL_FROM_DATABASE=Ethernet Controller X540 - -@@ -69747,7 +69909,7 @@ pci:v00009005d00000285sv0000103Csd00003227* - ID_MODEL_FROM_DATABASE=AAR-2610SA - - pci:v00009005d00000285sv0000108Esd00000286* -- ID_MODEL_FROM_DATABASE=STK RAID INT -+ ID_MODEL_FROM_DATABASE=Sun StorageTek SAS RAID HBA, Internal - - pci:v00009005d00000285sv0000108Esd00000287* - ID_MODEL_FROM_DATABASE=STK RAID EXT --- -1.8.4.652.g0d6e0ce - diff --git a/0051-rules-remove-pointless-MODE-settings.patch b/0051-rules-remove-pointless-MODE-settings.patch deleted file mode 100644 index d82b4ae..0000000 --- a/0051-rules-remove-pointless-MODE-settings.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 831f4f7266961f481f48da3461b332974c15e9f1 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Mon, 21 Oct 2013 03:49:03 +0200 -Subject: [PATCH] rules: remove pointless MODE= settings - -Changing the default MODE= for the group accessi, but not specifying -a GROUP= does not provide anything. - -It disables the default logic that the mode switches to 0660 as soon -as a GROUP= is specifed, which make custom rules uneccesarily complicated. - -https://bugs.freedesktop.org/show_bug.cgi?id=70665 ---- - rules/50-udev-default.rules | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules -index f764789..679dfdf 100644 ---- a/rules/50-udev-default.rules -+++ b/rules/50-udev-default.rules -@@ -20,9 +20,7 @@ KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP= - - SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - --SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640" --SUBSYSTEM=="input", KERNEL=="ts[0-9]*|uinput", MODE="0640" --SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0644" -+SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0664" - - SUBSYSTEM=="video4linux", GROUP="video" - SUBSYSTEM=="misc", KERNEL=="agpgart", GROUP="video" -@@ -63,7 +61,7 @@ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk" - SUBSYSTEM=="aoe", GROUP="disk", MODE="0220" - SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" - --KERNEL=="rfkill", MODE="0644" -+KERNEL=="rfkill", MODE="0664" - KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun" - - KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse" --- -1.8.4.652.g0d6e0ce - diff --git a/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch b/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch new file mode 100644 index 0000000..a93c504 --- /dev/null +++ b/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch @@ -0,0 +1,84 @@ +From 8ee1b98e2f4d4d36d9fccc776aa3fb124d05ac9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 21 Oct 2013 18:53:57 -0400 +Subject: [PATCH] shell-completion: dump has moved to systemd-analyze + +Rename NO_OPTION to STANDALONE for consistency with other files. +--- + shell-completion/bash/systemctl | 2 +- + shell-completion/bash/systemd-analyze | 4 ++-- + shell-completion/zsh/_systemctl | 3 +-- + shell-completion/zsh/_systemd-analyze | 1 + + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl +index e335ee8..eea4b6d 100644 +--- a/shell-completion/bash/systemctl ++++ b/shell-completion/bash/systemctl +@@ -137,7 +137,7 @@ _systemctl () { + [JOBS]='cancel' + [SNAPSHOTS]='delete' + [ENVS]='set-environment unset-environment' +- [STANDALONE]='daemon-reexec daemon-reload default dump ++ [STANDALONE]='daemon-reexec daemon-reload default + emergency exit halt hibernate hybrid-sleep kexec list-jobs + list-sockets list-units list-unit-files poweroff reboot rescue + show-environment suspend get-default' +diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze +index 5bd6768..b65466b 100644 +--- a/shell-completion/bash/systemd-analyze ++++ b/shell-completion/bash/systemd-analyze +@@ -31,7 +31,7 @@ _systemd_analyze() { + local OPTS='--help --version --system --user --from-pattern --to-pattern --order --require' + + local -A VERBS=( +- [NO_OPTION]='time blame plot' ++ [STANDALONE]='time blame plot dump' + [CRITICAL_CHAIN]='critical-chain' + [DOT]='dot' + [LOG_LEVEL]='set-log-level' +@@ -55,7 +55,7 @@ _systemd_analyze() { + if [[ -z $verb ]]; then + comps=${VERBS[*]} + +- elif __contains_word "$verb" ${VERBS[NO_OPTION]}; then ++ elif __contains_word "$verb" ${VERBS[STANDALONE]}; then + if [[ $cur = -* ]]; then + comps='--help --version --system --user' + fi +diff --git a/shell-completion/zsh/_systemctl b/shell-completion/zsh/_systemctl +index 298e97e..3959cd5 100644 +--- a/shell-completion/zsh/_systemctl ++++ b/shell-completion/zsh/_systemctl +@@ -38,7 +38,6 @@ + "is-enabled:Check whether unit files are enabled" + "list-jobs:List jobs" + "cancel:Cancel all, one, or more jobs" +- "dump:Dump server status" + "snapshot:Create a snapshot" + "delete:Remove one or more snapshots" + "show-environment:Dump environment" +@@ -264,7 +263,7 @@ done + (( $+functions[_systemctl_link] )) || _systemctl_link() { _files } + + # no systemctl completion for: +-# [STANDALONE]='daemon-reexec daemon-reload default dump ++# [STANDALONE]='daemon-reexec daemon-reload default + # emergency exit halt kexec list-jobs list-units + # list-unit-files poweroff reboot rescue show-environment' + # [NAME]='snapshot load' +diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze +index 37c60f5..2eda5fe 100644 +--- a/shell-completion/zsh/_systemd-analyze ++++ b/shell-completion/zsh/_systemd-analyze +@@ -15,6 +15,7 @@ _systemd_analyze_command(){ + 'critical-chain:Print a tree of the time critical chain of units' + 'plot:Output SVG graphic showing service initialization' + 'dot:Dump dependency graph (in dot(1) format)' ++ 'dump:Dump server status' + 'set-log-level:Set systemd log threshold' + ) + +-- +1.8.4.652.g0d6e0ce + diff --git a/0052-analyze-set-white-backgound.patch b/0052-analyze-set-white-backgound.patch deleted file mode 100644 index 96652c0..0000000 --- a/0052-analyze-set-white-backgound.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5c56656c5f135dbb6549bd9d662bbb7d238638e2 Mon Sep 17 00:00:00 2001 -From: Thomas Hindoe Paaboel Andersen -Date: Mon, 21 Oct 2013 21:29:23 +0200 -Subject: [PATCH] analyze: set white backgound - -In programs like eog and gimp the transparant background did not -look very good. - -https://bugs.freedesktop.org/show_bug.cgi?id=70720 ---- - src/analyze/systemd-analyze.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/analyze/systemd-analyze.c b/src/analyze/systemd-analyze.c -index a4f15eb..9a69795 100644 ---- a/src/analyze/systemd-analyze.c -+++ b/src/analyze/systemd-analyze.c -@@ -507,6 +507,7 @@ static int analyze_plot(DBusConnection *bus) { - /* style sheet */ - svg("\n \n\n\n"); - -+ svg("\n"); - svg("%s", pretty_times); - svg("%s %s (%s %s) %s", - isempty(osname) ? "Linux" : osname, --- -1.8.4.652.g0d6e0ce - diff --git a/0053-shell-completion-dump-has-moved-to-systemd-analyze.patch b/0053-shell-completion-dump-has-moved-to-systemd-analyze.patch deleted file mode 100644 index 883ce48..0000000 --- a/0053-shell-completion-dump-has-moved-to-systemd-analyze.patch +++ /dev/null @@ -1,84 +0,0 @@ -From b8cc2a94ad07cf529258ef0dde4002d8e1166f25 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 21 Oct 2013 18:53:57 -0400 -Subject: [PATCH] shell-completion: dump has moved to systemd-analyze - -Rename NO_OPTION to STANDALONE for consistency with other files. ---- - shell-completion/bash/systemctl | 2 +- - shell-completion/bash/systemd-analyze | 4 ++-- - shell-completion/zsh/_systemctl | 3 +-- - shell-completion/zsh/_systemd-analyze | 1 + - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl -index e335ee8..eea4b6d 100644 ---- a/shell-completion/bash/systemctl -+++ b/shell-completion/bash/systemctl -@@ -137,7 +137,7 @@ _systemctl () { - [JOBS]='cancel' - [SNAPSHOTS]='delete' - [ENVS]='set-environment unset-environment' -- [STANDALONE]='daemon-reexec daemon-reload default dump -+ [STANDALONE]='daemon-reexec daemon-reload default - emergency exit halt hibernate hybrid-sleep kexec list-jobs - list-sockets list-units list-unit-files poweroff reboot rescue - show-environment suspend get-default' -diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze -index 5bd6768..b65466b 100644 ---- a/shell-completion/bash/systemd-analyze -+++ b/shell-completion/bash/systemd-analyze -@@ -31,7 +31,7 @@ _systemd_analyze() { - local OPTS='--help --version --system --user --from-pattern --to-pattern --order --require' - - local -A VERBS=( -- [NO_OPTION]='time blame plot' -+ [STANDALONE]='time blame plot dump' - [CRITICAL_CHAIN]='critical-chain' - [DOT]='dot' - [LOG_LEVEL]='set-log-level' -@@ -55,7 +55,7 @@ _systemd_analyze() { - if [[ -z $verb ]]; then - comps=${VERBS[*]} - -- elif __contains_word "$verb" ${VERBS[NO_OPTION]}; then -+ elif __contains_word "$verb" ${VERBS[STANDALONE]}; then - if [[ $cur = -* ]]; then - comps='--help --version --system --user' - fi -diff --git a/shell-completion/zsh/_systemctl b/shell-completion/zsh/_systemctl -index 298e97e..3959cd5 100644 ---- a/shell-completion/zsh/_systemctl -+++ b/shell-completion/zsh/_systemctl -@@ -38,7 +38,6 @@ - "is-enabled:Check whether unit files are enabled" - "list-jobs:List jobs" - "cancel:Cancel all, one, or more jobs" -- "dump:Dump server status" - "snapshot:Create a snapshot" - "delete:Remove one or more snapshots" - "show-environment:Dump environment" -@@ -264,7 +263,7 @@ done - (( $+functions[_systemctl_link] )) || _systemctl_link() { _files } - - # no systemctl completion for: --# [STANDALONE]='daemon-reexec daemon-reload default dump -+# [STANDALONE]='daemon-reexec daemon-reload default - # emergency exit halt kexec list-jobs list-units - # list-unit-files poweroff reboot rescue show-environment' - # [NAME]='snapshot load' -diff --git a/shell-completion/zsh/_systemd-analyze b/shell-completion/zsh/_systemd-analyze -index 37c60f5..2eda5fe 100644 ---- a/shell-completion/zsh/_systemd-analyze -+++ b/shell-completion/zsh/_systemd-analyze -@@ -15,6 +15,7 @@ _systemd_analyze_command(){ - 'critical-chain:Print a tree of the time critical chain of units' - 'plot:Output SVG graphic showing service initialization' - 'dot:Dump dependency graph (in dot(1) format)' -+ 'dump:Dump server status' - 'set-log-level:Set systemd log threshold' - ) - --- -1.8.4.652.g0d6e0ce -