From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@jikos•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat•com>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Date: Thu, 28 Mar 2013 11:40:43 +1100 [thread overview]
Message-ID: <20130328114043.b83caaadbd48417f5814e6cc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-multitouch.c between commit 4c43755506ec ("HID:
multitouch: fix touchpad buttons") from Linus' tree and commit
5b62efd8250d ("HID: multitouch: remove useless last_field_index field")
from the hid tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/hid/hid-multitouch.c
index 82e9211,aceaf6c..0000000
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -680,11 -723,7 +727,7 @@@ static void mt_process_mt_event(struct
if (usage->usage_index + 1 == field->report_count) {
/* we only take into account the last report. */
if (usage->hid == td->last_slot_field)
- mt_complete_slot(td, field->hidinput->input);
+ mt_complete_slot(td, input);
-
- if (field->index == td->last_field_index
- && td->num_received >= td->num_expected)
- mt_sync_frame(td, field->hidinput->input);
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-03-28 0:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 0:40 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 1:53 linux-next: manual merge of the hid tree with Linus' tree Stephen Rothwell
2022-04-21 23:33 Stephen Rothwell
2015-02-24 0:00 Stephen Rothwell
2014-10-31 0:58 Stephen Rothwell
2014-03-17 2:32 Stephen Rothwell
2014-02-20 2:04 Stephen Rothwell
2014-02-20 2:03 Stephen Rothwell
2012-09-10 1:33 Stephen Rothwell
2012-09-10 5:49 ` Marek Vasut
2012-06-27 1:05 Stephen Rothwell
2011-10-11 3:37 Stephen Rothwell
2011-10-11 10:52 ` Jiri Kosina
2010-11-09 1:33 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130328114043.b83caaadbd48417f5814e6cc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=benjamin.tissoires@redhat$(echo .)com \
--cc=jikos@jikos$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox