On Wed, 27 Aug 2008, Stephen Rothwell wrote:
>
> 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.
The branch od hid tree you are pull into -next is now based on 2.6.27-rc4,
so this should be now sorted out for you. Please let me know if there are
still some issues for me to deal with.
Thanks,
--
Jiri Kosina
SUSE Labs
--
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
