linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: hid/upstream merge conflicts
@ 2008-06-04  2:08 Stephen Rothwell
  2008-06-04  8:09 ` Jiri Kosina
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-04  2:08 UTC (permalink / raw)
  To: Jiri Kosina; +Cc: linux-next, Alexandre Karpenko, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/usbhid/hid-quirks.c between commit
6e7045990f35ef9250804b3fd85e855b8c2aaeb6 ("HID: split Numlock emulation
quirk from HID_QUIRK_APPLE_HAS_FN.") from Linus' tree and commit
6560721d37b404f3c16ce3dfe7517386198fa13a ("HID: add fn key support on
Macbook Pro 4,1 and Macbook Air") from the hid tree.

It wasn't obvious how to best fixup the conflict, so I just took the
version from Linus' tree for today.  You might want to either rebase the
hid tree on top of Linus' latest or just merge in Linus' latest and fix
the conflict yourself.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: hid/upstream merge conflicts
  2008-06-04  2:08 linux-next: hid/upstream merge conflicts Stephen Rothwell
@ 2008-06-04  8:09 ` Jiri Kosina
  2008-06-04  8:19   ` Stephen Rothwell
  0 siblings, 1 reply; 3+ messages in thread
From: Jiri Kosina @ 2008-06-04  8:09 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, Alexandre Karpenko, Andrew Morton

On Wed, 4 Jun 2008, Stephen Rothwell wrote:

> Today's linux-next merge of the hid tree got a conflict in 
> drivers/hid/usbhid/hid-quirks.c between commit 
> 6e7045990f35ef9250804b3fd85e855b8c2aaeb6 ("HID: split Numlock emulation 
> quirk from HID_QUIRK_APPLE_HAS_FN.") from Linus' tree and commit 
> 6560721d37b404f3c16ce3dfe7517386198fa13a ("HID: add fn key support on 
> Macbook Pro 4,1 and Macbook Air") from the hid tree.

Hi Stephen,

thanks for notification, I have rebased and this should be fixed now.

Thanks,

-- 
Jiri Kosina
SUSE Labs

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: hid/upstream merge conflicts
  2008-06-04  8:09 ` Jiri Kosina
@ 2008-06-04  8:19   ` Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-04  8:19 UTC (permalink / raw)
  To: Jiri Kosina; +Cc: linux-next, Alexandre Karpenko, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

Hi Jiri,

On Wed, 4 Jun 2008 10:09:46 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> On Wed, 4 Jun 2008, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the hid tree got a conflict in 
> > drivers/hid/usbhid/hid-quirks.c between commit 
> > 6e7045990f35ef9250804b3fd85e855b8c2aaeb6 ("HID: split Numlock emulation 
> > quirk from HID_QUIRK_APPLE_HAS_FN.") from Linus' tree and commit 
> > 6560721d37b404f3c16ce3dfe7517386198fa13a ("HID: add fn key support on 
> > Macbook Pro 4,1 and Macbook Air") from the hid tree.
> 
> thanks for notification, I have rebased and this should be fixed now.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-06-04  8:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-04  2:08 linux-next: hid/upstream merge conflicts Stephen Rothwell
2008-06-04  8:09 ` Jiri Kosina
2008-06-04  8:19   ` Stephen Rothwell

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).