Hi Dmitry, Jiri,
On Tue, 26 Aug 2008 09:40:54 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> On Mon, 25 Aug 2008 11:50:56 -0400 Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx> wrote:
> >
> > I wonder what we should do in such case... are you going to use rerere
> > till we resync with Linus?
>
> Yes, that is what happens (unless something dramatic changes :-)).
OK, so this has come up again today (the conflict has changed and rerere
doesn't cope with that). Could you please either merge with 2.6.27-rc4
or cherrypick commit f89bd95c5c946776f116ffeb997653d4193d6a35 ("Input:
bcm5974 - add driver for Macbook Air and Pro Penryn touchpads") (or merge
Linus' tree at the commit) into the hid tree (and fix the conflict),
please? This is likely to be a real ongoing pain if this file
(drivers/hid/usbhid/hid-quirks.c) keeps being modified in more and more
patches.
I fixed it up again for today (used the version of
drivers/hid/usbhid/hid-quirks.c from the id tree and applied the same
patch as before).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp95RoWAmvMZ.pgp
Description: PGP signature
