From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the input tree with Linus' tree
Date: Tue, 14 Dec 2010 10:40:00 -0800 [thread overview]
Message-ID: <20101214184000.GA11384@core.coreip.homeip.net> (raw)
In-Reply-To: <20101214132658.ce0f5bc6.sfr@canb.auug.org.au>
On Tue, Dec 14, 2010 at 01:26:58PM +1100, Stephen Rothwell wrote:
> 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.
Hi Stephen,
The fix looks good and if you could carry it for a while that would be
great - I try to avoid cross-merging branches if possible...
Thanks.
--
Dmitry
next prev parent reply other threads:[~2010-12-14 18:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 2:26 linux-next: manual merge of the input tree with Linus' tree Stephen Rothwell
2010-12-14 18:40 ` Dmitry Torokhov [this message]
-- strict thread matches above, loose matches on Subject: below --
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
2024-08-20 1:23 Stephen Rothwell
2025-08-20 1:37 Stephen Rothwell
2025-08-21 14:57 ` Miguel Ojeda
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=20101214184000.GA11384@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).