Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech'...

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-lg.c
Simple merge

diff --cc drivers/hid/hid-logitech-dj.c
Simple merge

diff --cc drivers/hid/hid-logitech-hidpp.c
Simple merge

diff --cc drivers/hid/hid-quirks.c
Simple merge

diff --cc drivers/hid/wacom_sys.c
Simple merge

diff --cc drivers/hid/wacom_wac.c
index 09b8e4aac82f498c3574f62e34430cd3c0526485,43f6da35716599be1b823fcdd1670f755433f331,43f6da35716599be1b823fcdd1670f755433f331,747730d32ab628712f00f9a0ec1e93afb34c14a1,35942bba5390f3c127248e52bc8682f857534c58..8fc36a28081bbe4b42e2d8beb3d4cff714a87faa
--- 1/drivers/hid/wacom_wac.c
--- 2/drivers/hid/wacom_wac.c
--- 3/drivers/hid/wacom_wac.c
--- 4/drivers/hid/wacom_wac.c
--- 5/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@@@@@ -1290,26 -1286,26 -1286,26 -1275,23 -1277,24 +1288,25 @@@@@@ static void wacom_intuos_pro2_bt_pen(st
                                                 get_unaligned_le16(&frame[11]));
                        }
                }
---  
   --           input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
   -            if (wacom->features.type == INTUOSP2_BT) {
    -           if (wacom->features.type == INTUOSP2_BT ||
    -               wacom->features.type == INTUOSP2S_BT) {
   --                   input_report_abs(pen_input, ABS_DISTANCE,
   --                                    range ? frame[13] : wacom->features.distance_max);
   --           } else {
   --                   input_report_abs(pen_input, ABS_DISTANCE,
   --                                    range ? frame[7] : wacom->features.distance_max);
   --           }
   ++           if (wacom->tool[0]) {
   ++                   input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
   ++                   if (wacom->features.type == INTUOSP2_BT) {
   ++                           input_report_abs(pen_input, ABS_DISTANCE,
   ++                                            range ? frame[13] : wacom->features.distance_max);
   ++                   } else {
   ++                           input_report_abs(pen_input, ABS_DISTANCE,
   ++                                            range ? frame[7] : wacom->features.distance_max);
   ++                   }
     
   --           input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x01);
   --           input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
   --           input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
   ++                   input_report_key(pen_input, BTN_TOUCH, frame[0] & 0x09);
   ++                   input_report_key(pen_input, BTN_STYLUS, frame[0] & 0x02);
   ++                   input_report_key(pen_input, BTN_STYLUS2, frame[0] & 0x04);
     
   --           input_report_key(pen_input, wacom->tool[0], prox);
   --           input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
   --           input_report_abs(pen_input, ABS_MISC,
   --                            wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
   ++                   input_report_key(pen_input, wacom->tool[0], prox);
   ++                   input_event(pen_input, EV_MSC, MSC_SERIAL, wacom->serial[0]);
   ++                   input_report_abs(pen_input, ABS_MISC,
   ++                                    wacom_intuos_id_mangle(wacom->id[0])); /* report tool id */
   ++           }
     
                wacom->shared->stylus_in_proximity = prox;
     

diff --cc drivers/hid/wacom_wac.h
Simple merge