linux-next: manual merge of the hid tree

linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the hid tree got several conflicts against the
usb tree and Linus' tree.

I have dropped it for today, please do a resync with Linus' tree for
tomorrow.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the hid tree

[Jiri Kosina]

On Thu, 16 Oct 2008, Stephen Rothwell wrote:

> Today's linux-next merge of the hid tree got several conflicts against 
> the usb tree and Linus' tree.
> I have dropped it for today, please do a resync with Linus' tree for
> tomorrow.

Hi Stephen,

yes, I have been handling the merge with Linus past two days, fixing some 
issues, and rebasing several times, etc. so the branch you pull has been 
rotting a little bit, sorry for that.

I have just pushed version that should apply cleanly again.

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Jiri,

On Thu, 16 Oct 2008 11:34:16 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> yes, I have been handling the merge with Linus past two days, fixing some 
> issues, and rebasing several times, etc. so the branch you pull has been 
> rotting a little bit, sorry for that.
> 
> I have just pushed version that should apply cleanly again.

Thanks.

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

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

linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-tmff.c between commits
454db62d208add27f30fcbcc00435768245407c9 ("USB: remove warn() macro from
usb hid drivers") and 3e85ea87fdfbb9440dacda77b4de30472e0d38c9 ("USB:
remove info() macro from usb HID drivers") from the usb tree and commit
a9c923a59c4f106ee7385a5b210215db3eeb1d8d ("HID: convert to dev_* prints")
from the hid tree.

I fixed it up (just used the hid tree versions) and can carry the fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the hid tree

[Jiri Kosina]

On Tue, 14 Oct 2008, Stephen Rothwell wrote:

> Today's linux-next merge of the hid tree got a conflict in 
> drivers/hid/hid-tmff.c between commits 
> 454db62d208add27f30fcbcc00435768245407c9 ("USB: remove warn() macro from 
> usb hid drivers") and 3e85ea87fdfbb9440dacda77b4de30472e0d38c9 ("USB: 
> remove info() macro from usb HID drivers") from the usb tree 

Thanks Stephen for letting us know. These two patches should actually be 
dropped from USB tree completely, I believe, as I have taken them through 
my tree. Greg?

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: manual merge of the hid tree

[Greg KH]

On Tue, Oct 14, 2008 at 09:12:07AM +0200, Jiri Kosina wrote:
> On Tue, 14 Oct 2008, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the hid tree got a conflict in 
> > drivers/hid/hid-tmff.c between commits 
> > 454db62d208add27f30fcbcc00435768245407c9 ("USB: remove warn() macro from 
> > usb hid drivers") and 3e85ea87fdfbb9440dacda77b4de30472e0d38c9 ("USB: 
> > remove info() macro from usb HID drivers") from the usb tree 
> 
> Thanks Stephen for letting us know. These two patches should actually be 
> dropped from USB tree completely, I believe, as I have taken them through 
> my tree. Greg?

Yes, you are correct, I did not get the time to update my public tree
in the past few days due to other work :(

Should get to it today.

thanks,

greg k-h

linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

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

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 2d0b387..ed43749 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -420,17 +420,17 @@ static const struct hid_device_id apple_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
-		.driver_data = APPLE_HAS_FN },
+		.driver_data = APPLE_HAS_FN |APPLE_IGNORE_MOUSE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
-		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |APPLE_IGNORE_MOUSE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
-		.driver_data = APPLE_HAS_FN },
+		.driver_data = APPLE_HAS_FN |APPLE_IGNORE_MOUSE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
-		.driver_data = APPLE_HAS_FN },
+		.driver_data = APPLE_HAS_FN |APPLE_IGNORE_MOUSE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
-		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |APPLE_IGNORE_MOUSE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
-		.driver_data = APPLE_HAS_FN },
+		.driver_data = APPLE_HAS_FN |APPLE_IGNORE_MOUSE },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
 			APPLE_IGNORE_MOUSE },

Re: linux-next: manual merge of the hid tree

[Dmitry Torokhov]

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

Re: linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Dmitry,

On Mon, 25 Aug 2008 11:50:56 -0400 Dmitry Torokhov <dmitry.torokhov@gmail.com> 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 :-)).

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

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

Re: linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Dmitry, Jiri,

On Tue, 26 Aug 2008 09:40:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 25 Aug 2008 11:50:56 -0400 Dmitry Torokhov <dmitry.torokhov@gmail.com> 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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the hid tree

[Jiri Kosina]

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

Re: linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Jiri,

On Wed, 27 Aug 2008 12:45:37 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> 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 for that.

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

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

linux-next: manual merge of the hid tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/usbhid/hid-core.c between commit
42c057049eb3ca9bad38fb0acc6290771a11d9ff ("USB: remove warn() macro from
usb.h") from the usb tree and commit
128fc1f24bbb042b8d586dfba4db9ee7caac52bd ("HID: indent switches/cases")
from the hid tree.

I did the obvious fixups (see below).

Jiri, you should be able to apply the appropriate part of Greg's patch to
your tree as it only depends on stuff that is already in Linus' tree.  I
have added that partial patch below. (Greg, do you want to Sign-off on
that, please?)  (I don't mind if the patch is in both trees - Greg you
might consider breaking up those warn() and info() (and err()?) removal
patches and sending them to the appropriate maintainers.)

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

Merge fixup result:

diff --cc drivers/hid/usbhid/hid-core.c
index c018347,4ec10aa..0000000
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@@ -197,32 -189,31 +189,32 @@@ static void hid_irq_in(struct urb *urb
  	int			status;
  
  	switch (urb->status) {
- 		case 0:			/* success */
- 			usbhid->retry_delay = 0;
- 			hid_input_report(urb->context, HID_INPUT_REPORT,
- 					 urb->transfer_buffer,
- 					 urb->actual_length, 1);
- 			break;
- 		case -EPIPE:		/* stall */
- 			clear_bit(HID_IN_RUNNING, &usbhid->iofl);
- 			set_bit(HID_CLEAR_HALT, &usbhid->iofl);
- 			schedule_work(&usbhid->reset_work);
- 			return;
- 		case -ECONNRESET:	/* unlink */
- 		case -ENOENT:
- 		case -ESHUTDOWN:	/* unplug */
- 			clear_bit(HID_IN_RUNNING, &usbhid->iofl);
- 			return;
- 		case -EILSEQ:		/* protocol error or unplug */
- 		case -EPROTO:		/* protocol error or unplug */
- 		case -ETIME:		/* protocol error or unplug */
- 		case -ETIMEDOUT:	/* Should never happen, but... */
- 			clear_bit(HID_IN_RUNNING, &usbhid->iofl);
- 			hid_io_error(hid);
- 			return;
- 		default:		/* error */
- 			dev_warn(&urb->dev->dev, "input irq status %d "
- 				 "received\n", urb->status);
+ 	case 0:			/* success */
+ 		usbhid->retry_delay = 0;
+ 		hid_input_report(urb->context, HID_INPUT_REPORT,
+ 				 urb->transfer_buffer,
+ 				 urb->actual_length, 1);
+ 		break;
+ 	case -EPIPE:		/* stall */
+ 		clear_bit(HID_IN_RUNNING, &usbhid->iofl);
+ 		set_bit(HID_CLEAR_HALT, &usbhid->iofl);
+ 		schedule_work(&usbhid->reset_work);
+ 		return;
+ 	case -ECONNRESET:	/* unlink */
+ 	case -ENOENT:
+ 	case -ESHUTDOWN:	/* unplug */
+ 		clear_bit(HID_IN_RUNNING, &usbhid->iofl);
+ 		return;
+ 	case -EILSEQ:		/* protocol error or unplug */
+ 	case -EPROTO:		/* protocol error or unplug */
+ 	case -ETIME:		/* protocol error or unplug */
+ 	case -ETIMEDOUT:	/* Should never happen, but... */
+ 		clear_bit(HID_IN_RUNNING, &usbhid->iofl);
+ 		hid_io_error(hid);
+ 		return;
+ 	default:		/* error */
 -		warn("input irq status %d received", urb->status);
++		dev_warn(&urb->dev->dev, "input irq status %d "
++			 "received\n", urb->status);
  	}
  
  	status = usb_submit_urb(urb, GFP_ATOMIC);
@@@ -320,18 -311,17 +312,18 @@@ static void hid_irq_out(struct urb *urb
  	int unplug = 0;
  
  	switch (urb->status) {
- 		case 0:			/* success */
- 			break;
- 		case -ESHUTDOWN:	/* unplug */
- 			unplug = 1;
- 		case -EILSEQ:		/* protocol error or unplug */
- 		case -EPROTO:		/* protocol error or unplug */
- 		case -ECONNRESET:	/* unlink */
- 		case -ENOENT:
- 			break;
- 		default:		/* error */
- 			dev_warn(&urb->dev->dev, "output irq status %d "
- 				 "received\n", urb->status);
+ 	case 0:			/* success */
+ 		break;
+ 	case -ESHUTDOWN:	/* unplug */
+ 		unplug = 1;
+ 	case -EILSEQ:		/* protocol error or unplug */
+ 	case -EPROTO:		/* protocol error or unplug */
+ 	case -ECONNRESET:	/* unlink */
+ 	case -ENOENT:
+ 		break;
+ 	default:		/* error */
 -		warn("output irq status %d received", urb->status);
++		dev_warn(&urb->dev->dev, "output irq status %d "
++			 "received\n", urb->status);
  	}
  
  	spin_lock_irqsave(&usbhid->outlock, flags);
@@@ -369,22 -359,22 +361,23 @@@ static void hid_ctrl(struct urb *urb
  	spin_lock_irqsave(&usbhid->ctrllock, flags);
  
  	switch (urb->status) {
- 		case 0:			/* success */
- 			if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN)
- 				hid_input_report(urb->context, usbhid->ctrl[usbhid->ctrltail].report->type,
- 						urb->transfer_buffer, urb->actual_length, 0);
- 			break;
- 		case -ESHUTDOWN:	/* unplug */
- 			unplug = 1;
- 		case -EILSEQ:		/* protocol error or unplug */
- 		case -EPROTO:		/* protocol error or unplug */
- 		case -ECONNRESET:	/* unlink */
- 		case -ENOENT:
- 		case -EPIPE:		/* report not available */
- 			break;
- 		default:		/* error */
- 			dev_warn(&urb->dev->dev, "ctrl urb status %d "
- 				 "received\n", urb->status);
+ 	case 0:			/* success */
+ 		if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN)
+ 			hid_input_report(urb->context,
+ 				usbhid->ctrl[usbhid->ctrltail].report->type,
+ 				urb->transfer_buffer, urb->actual_length, 0);
+ 		break;
+ 	case -ESHUTDOWN:	/* unplug */
+ 		unplug = 1;
+ 	case -EILSEQ:		/* protocol error or unplug */
+ 	case -EPROTO:		/* protocol error or unplug */
+ 	case -ECONNRESET:	/* unlink */
+ 	case -ENOENT:
+ 	case -EPIPE:		/* report not available */
+ 		break;
+ 	default:		/* error */
 -		warn("ctrl urb status %d received", urb->status);
++		dev_warn(&urb->dev->dev, "ctrl urb status %d "
++			 "received\n", urb->status);
  	}
  
  	if (unplug)

Greg's partial patch:

From: Greg Kroah-Hartman <gregkh@suse.de>

USB/hid-core: remove warn() macro from usb.h
    
USB should not be having it's own printk macros, so remove warn() and
use the system-wide standard of dev_warn() wherever possible.  In the
few places that will not work out, use a basic printk().

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 27fe4d8..1096502 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -221,7 +221,8 @@ static void hid_irq_in(struct urb *urb)
 			hid_io_error(hid);
 			return;
 		default:		/* error */
-			warn("input irq status %d received", urb->status);
+			dev_warn(&urb->dev->dev, "input irq status %d "
+				 "received\n", urb->status);
 	}
 
 	status = usb_submit_urb(urb, GFP_ATOMIC);
@@ -329,7 +330,8 @@ static void hid_irq_out(struct urb *urb)
 		case -ENOENT:
 			break;
 		default:		/* error */
-			warn("output irq status %d received", urb->status);
+			dev_warn(&urb->dev->dev, "output irq status %d "
+				 "received\n", urb->status);
 	}
 
 	spin_lock_irqsave(&usbhid->outlock, flags);
@@ -381,7 +383,8 @@ static void hid_ctrl(struct urb *urb)
 		case -EPIPE:		/* report not available */
 			break;
 		default:		/* error */
-			warn("ctrl urb status %d received", urb->status);
+			dev_warn(&urb->dev->dev, "ctrl urb status %d "
+				 "received\n", urb->status);
 	}
 
 	if (unplug)
@@ -418,7 +421,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
 		if ((head = (usbhid->outhead + 1) & (HID_OUTPUT_FIFO_SIZE - 1)) == usbhid->outtail) {
 			spin_unlock_irqrestore(&usbhid->outlock, flags);
-			warn("output queue full");
+			dev_warn(hid->dev, "output queue full\n");
 			return;
 		}
 
@@ -437,7 +440,7 @@ void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, uns
 
 	if ((head = (usbhid->ctrlhead + 1) & (HID_CONTROL_FIFO_SIZE - 1)) == usbhid->ctrltail) {
 		spin_unlock_irqrestore(&usbhid->ctrllock, flags);
-		warn("control queue full");
+		dev_warn(hid->dev, "control queue full\n");
 		return;
 	}
 
@@ -465,7 +468,7 @@ static int usb_hidinput_input_event(struct input_dev *dev, unsigned int type, un
 		return -1;
 
 	if ((offset = hidinput_find_field(hid, type, code, &field)) == -1) {
-		warn("event field not found");
+		dev_warn(&dev->dev, "event field not found\n");
 		return -1;
 	}
 
@@ -568,7 +571,7 @@ void usbhid_init_reports(struct hid_device *hid)
 	}
 
 	if (err)
-		warn("timeout initializing reports");
+		dev_warn(hid->dev, "timeout initializing reports\n");
 }
 
 /*

Re: linux-next: manual merge of the hid tree

[Greg KH]

On Mon, Aug 25, 2008 at 02:26:31PM +1000, Stephen Rothwell wrote:
> Hi Jiri,
> 
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/usbhid/hid-core.c between commit
> 42c057049eb3ca9bad38fb0acc6290771a11d9ff ("USB: remove warn() macro from
> usb.h") from the usb tree and commit
> 128fc1f24bbb042b8d586dfba4db9ee7caac52bd ("HID: indent switches/cases")
> from the hid tree.
> 
> I did the obvious fixups (see below).
> 
> Jiri, you should be able to apply the appropriate part of Greg's patch to
> your tree as it only depends on stuff that is already in Linus' tree.  I
> have added that partial patch below. (Greg, do you want to Sign-off on
> that, please?)  (I don't mind if the patch is in both trees - Greg you
> might consider breaking up those warn() and info() (and err()?) removal
> patches and sending them to the appropriate maintainers.)

They are going to get split up and sent to them later this week.

thanks,

greg k-h

Re: linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Greg,

On Sun, 24 Aug 2008 21:49:56 -0700 Greg KH <greg@kroah.com> wrote:
>
> They are going to get split up and sent to them later this week.

Wonderful, thanks.

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

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

Re: linux-next: manual merge of the hid tree

[Jiri Kosina]

On Sun, 24 Aug 2008, Greg KH wrote:

> > Today's linux-next merge of the hid tree got a conflict in
> > drivers/hid/usbhid/hid-core.c between commit
> > 42c057049eb3ca9bad38fb0acc6290771a11d9ff ("USB: remove warn() macro from
> > usb.h") from the usb tree and commit
> > 128fc1f24bbb042b8d586dfba4db9ee7caac52bd ("HID: indent switches/cases")
> > from the hid tree.
> > I did the obvious fixups (see below).
> > Jiri, you should be able to apply the appropriate part of Greg's patch to
> > your tree as it only depends on stuff that is already in Linus' tree.  I
> > have added that partial patch below. (Greg, do you want to Sign-off on
> > that, please?)  (I don't mind if the patch is in both trees - Greg you
> > might consider breaking up those warn() and info() (and err()?) removal
> > patches and sending them to the appropriate maintainers.)
> They are going to get split up and sent to them later this week.

So if Stephen is able to carry the fixup patch in -next tree until you 
send out the split-up patches to maintainers, I'll wait for that to 
happen, if OK with Stephen. Thanks.

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: manual merge of the hid tree

[Stephen Rothwell]

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

Hi Jiri,

On Tue, 26 Aug 2008 10:50:10 +0200 (CEST) Jiri Kosina <jkosina@suse.cz> wrote:
>
> So if Stephen is able to carry the fixup patch in -next tree until you 
> send out the split-up patches to maintainers, I'll wait for that to 
> happen, if OK with Stephen. Thanks.

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

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