linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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,
	Jason Gerecke <killertofu@gmail.com>,
	Chris Bagwell <chris@cnpbagwell.com>
Subject: linux-next: manual merge of the input tree with Linus' tree
Date: Tue, 27 Mar 2012 12:16:10 +1100	[thread overview]
Message-ID: <20120327121610.e39e648811d5b00ae328077b@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-03-27  1:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-27  1:16 Stephen Rothwell [this message]
2012-03-27  7:33 ` linux-next: manual merge of the input tree with Linus' tree Dmitry Torokhov
  -- strict thread matches above, loose matches on Subject: below --
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=20120327121610.e39e648811d5b00ae328077b@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=chris@cnpbagwell.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=killertofu@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).