linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Chris Bagwell <chris@cnpbagwell.com>
Subject: Re: linux-next: manual merge of the usb tree with the input tree
Date: Thu, 3 May 2012 14:49:43 -0700	[thread overview]
Message-ID: <20120503214943.GB16912@kroah.com> (raw)
In-Reply-To: <20120503144421.bce525fdec4a9b2d3b7557d5@canb.auug.org.au>

On Thu, May 03, 2012 at 02:44:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
> wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
> input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
> from the usb tree.
> 
> I just used the input tree's version (which used "input->dev.parent"
> instead of "&input->dev").

That's fine, Dmitry and I are still "discussing" which pointer is best
to use on lkml, but either is good for the merge :)

thanks,

greg k-h

  reply	other threads:[~2012-05-03 21:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-03  4:44 linux-next: manual merge of the usb tree with the input tree Stephen Rothwell
2012-05-03 21:49 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-04-30  5:51 Stephen Rothwell
2010-04-30 14:44 ` Greg KH
2010-04-30  5:51 Stephen Rothwell
2010-04-30 14:44 ` Greg KH
2010-04-30  5:51 Stephen Rothwell
2010-04-30 14:44 ` Greg KH

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=20120503214943.GB16912@kroah.com \
    --to=greg@kroah.com \
    --cc=chris@cnpbagwell.com \
    --cc=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).