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,
Axel Lin <axel.lin@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: Re: linux-next: manual merge of the usb tree with the input tree
Date: Fri, 30 Apr 2010 07:44:33 -0700 [thread overview]
Message-ID: <20100430144433.GG1824@kroah.com> (raw)
In-Reply-To: <20100430155108.6847891f.sfr@canb.auug.org.au>
On Fri, Apr 30, 2010 at 03:51:08PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/input/tablet/acecad.c between commits
> 2ef2ed597669f5e120d0c51c295f00e34b2f0801 ("Input: acecad - fix incorrect
> size parameter in usb_buffer_free") and
> 5492f6f801c81c9663417cd8e48e759775977c83 ("Input: acecad - simplify
> usb_acecad_disconnect()") from the input tree and commit
> 3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
> and usb_buffer_free() users") from the usb tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Thanks for the fixup.
greg k-h
next prev parent reply other threads:[~2010-04-30 14:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-30 5:51 linux-next: manual merge of the usb tree with the input tree Stephen Rothwell
2010-04-30 14:44 ` 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
2012-05-03 4:44 Stephen Rothwell
2012-05-03 21:49 ` 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=20100430144433.GG1824@kroah.com \
--to=greg@kroah.com \
--cc=axel.lin@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.