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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
