From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jiri Kosina <jikos@jikos.cz>,
linux-next@vger.kernel.org, Henrik Rydberg <rydberg@euromail.se>,
Jiri Slaby <jirislaby@gmail.com>
Subject: Re: linux-next: manual merge of the hid tree
Date: Mon, 25 Aug 2008 11:50:56 -0400 [thread overview]
Message-ID: <20080825155056.GA17926@anvil.corenet.prv> (raw)
In-Reply-To: <20080825144633.393096b5.sfr@canb.auug.org.au>
On Mon, Aug 25, 2008 at 02:46:33PM +1000, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/usbhid/hid-quirks.c between commit
> f89bd95c5c946776f116ffeb997653d4193d6a35 ("Input: bcm5974 - add driver
> for Macbook Air and Pro Penryn touchpads") from Linus' tree and
> commit8216ac91aeff627cc6169df46e0fbb2097716f56 ("HID: move apple quirks")
> from the hid tree.
>
> I used the version of that file from the hid tree and then added the
> following patch (which may be completely wrong).
>
I wonder what we should do in such case... are you going to use rerere
till we resync with Linus?
--
Dmitry
next prev parent reply other threads:[~2008-08-25 15:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-25 4:46 linux-next: manual merge of the hid tree Stephen Rothwell
2008-08-25 15:50 ` Dmitry Torokhov [this message]
2008-08-25 23:40 ` Stephen Rothwell
2008-08-27 3:10 ` Stephen Rothwell
2008-08-27 10:45 ` Jiri Kosina
2008-08-27 11:35 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-16 3:49 Stephen Rothwell
2008-10-16 9:34 ` Jiri Kosina
2008-10-16 23:27 ` Stephen Rothwell
2008-10-14 6:51 Stephen Rothwell
2008-10-14 7:12 ` Jiri Kosina
2008-10-14 13:54 ` Greg KH
2008-08-25 4:26 Stephen Rothwell
2008-08-25 4:49 ` Greg KH
2008-08-25 6:26 ` Stephen Rothwell
2008-08-26 8:50 ` Jiri Kosina
2008-08-26 12:42 ` Stephen Rothwell
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=20080825155056.GA17926@anvil.corenet.prv \
--to=dmitry.torokhov@gmail.com \
--cc=jikos@jikos.cz \
--cc=jirislaby@gmail.com \
--cc=linux-next@vger.kernel.org \
--cc=rydberg@euromail.se \
--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).