From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the input tree with Linus' tree
Date: Tue, 14 Dec 2010 13:26:58 +1100 [thread overview]
Message-ID: <20101214132658.ce0f5bc6.sfr@canb.auug.org.au> (raw)
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
include/linux/input.h between commit
86b17f76f462db460d6d916e105a4c44cb353e36 ("Input: document struct
input_absinfo") from Linus' tree and commit
a528f721b7c0ba70433dbddf5947eea458c3e36a ("Input: document new trkid
field in struct input_dev") from the input tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/input.h
index 979d4bd,787aa7e..0000000
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@@ -1155,7 -1125,8 +1150,8 @@@ struct ff_effect
* of tracked contacts
* @mtsize: number of MT slots the device uses
* @slot: MT slot currently being transmitted
+ * @trkid: stores MT tracking ID for the current contact
- * @absinfo: array of &struct absinfo elements holding information
+ * @absinfo: array of &struct input_absinfo elements holding information
* about absolute axes (current value, min, max, flat, fuzz,
* resolution)
* @key: reflects current state of device's keys/buttons
next reply other threads:[~2010-12-14 2:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 2:26 Stephen Rothwell [this message]
2010-12-14 18:40 ` linux-next: manual merge of the input tree with Linus' tree Dmitry Torokhov
2012-03-27 1:16 Stephen Rothwell
2012-03-27 7:33 ` Dmitry Torokhov
2013-11-12 1:58 Stephen Rothwell
2020-07-22 4:49 Stephen Rothwell
2021-11-03 23:21 Stephen Rothwell
2022-01-09 23:53 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=20101214132658.ce0f5bc6.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).