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,
Jason Gerecke <killertofu@gmail•com>,
Chris Bagwell <chris@cnpbagwell•com>
Subject: Re: linux-next: manual merge of the input tree with Linus' tree
Date: Tue, 27 Mar 2012 00:33:58 -0700 [thread overview]
Message-ID: <20120327073358.GD1521@core.coreip.homeip.net> (raw)
In-Reply-To: <20120327121610.e39e648811d5b00ae328077b@canb.auug.org.au>
Hi Stephen,
On Tue, Mar 27, 2012 at 12:16:10PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
>
> Today's linux-next merge of the input tree got a conflict in
> drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input:
> wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus'
> tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless
> connect") from the input tree.
>
> The latter seems to incorporate the former, so I used that.
Thank you. I merged the branches and resolved conflict so you should not
see it anymore.
Thanks.
--
Dmitry
next prev parent reply other threads:[~2012-03-27 7:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 1:16 linux-next: manual merge of the input tree with Linus' tree Stephen Rothwell
2012-03-27 7:33 ` Dmitry Torokhov [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-20 1:37 Stephen Rothwell
2025-08-21 14:57 ` Miguel Ojeda
2024-08-20 1:23 Stephen Rothwell
2022-01-09 23:53 Stephen Rothwell
2021-11-03 23:21 Stephen Rothwell
2020-07-22 4:49 Stephen Rothwell
2013-11-12 1:58 Stephen Rothwell
2010-12-14 2:26 Stephen Rothwell
2010-12-14 18:40 ` Dmitry Torokhov
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=20120327073358.GD1521@core.coreip.homeip.net \
--to=dmitry.torokhov@gmail$(echo .)com \
--cc=chris@cnpbagwell$(echo .)com \
--cc=killertofu@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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