From 2277e84560965a85ec629829ff81f2389e3b1995 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 22 Jan 2019 15:00:33 +0900
Subject: [PATCH 1/2] udevadm info: make --export-prefix imply --export

Setting --export without --export-prefix is meaningless.
---
 src/udev/udevadm-info.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index ae38e77a83..135a5e0120 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -411,6 +411,7 @@ int info_main(int argc, char *argv[], void *userdata) {
                         arg_export = true;
                         break;
                 case 'P':
+                        arg_export = true;
                         arg_export_prefix = optarg;
                         break;
                 case 'V':

From f0c29bbf83f22216b64e6216c54e6b4328f2ceff Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 22 Jan 2019 15:05:55 +0900
Subject: [PATCH 2/2] man: add more explanation about options for "udevadm
 test"

Closes #2476.
---
 man/udevadm.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/man/udevadm.xml b/man/udevadm.xml
index 1a9b784776..1a60aef6cf 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -143,22 +143,25 @@
           <term><option>-x</option></term>
           <term><option>--export</option></term>
           <listitem>
-            <para>Print output as key/value pairs. Values are enclosed in single quotes.</para>
+            <para>Print output as key/value pairs. Values are enclosed in single quotes.
+            This takes effects only when <option>--query=property</option> or
+            <option>--device-id-of-file=<replaceable>FILE</replaceable></option> is specified.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><option>-P</option></term>
           <term><option>--export-prefix=<replaceable>NAME</replaceable></option></term>
           <listitem>
-            <para>Add a prefix to the key name of exported values.</para>
+            <para>Add a prefix to the key name of exported values.
+            This implies <option>--export</option>.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><option>-d</option></term>
           <term><option>--device-id-of-file=<replaceable>FILE</replaceable></option></term>
           <listitem>
-            <para>Print major/minor numbers of the underlying device, where the file
-            lives on.</para>
+            <para>Print major/minor numbers of the underlying device, where the file lives on.
+            If this is specified, all positional arguments are ignored.</para>
           </listitem>
         </varlistentry>
         <varlistentry>