Re: [patch]reset_resume for cdc-ether

[David Miller <davem@davemloft.net>]

From: Oliver Neukum <oliver@neukum.org>
Date: Thu, 3 Dec 2009 14:02:48 +0100

> Am Donnerstag, 3. Dezember 2009 11:14:56 schrieb David Miller:
> 
>> It doesn't apply to my tree still:
> 
> And this is autosuspend.

Oliver, when you send two patches to the same files you
have to make it so that when the first one is applied
the second one applies cleanly on top.  That's not what
happens here:

davem@sunset:~/src/GIT/net-next-2.6$ git am --signoff bundle-732.mbox
Applying: cdc-ether: Implement reset_resume()
Applying: usbnet & cdc-ether: autosuspend for online devices
error: patch failed: drivers/net/usb/cdc_ether.c:411
error: drivers/net/usb/cdc_ether.c: patch does not apply
Patch failed at 0002 usbnet & cdc-ether: autosuspend for online devices
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Also, please compose your patch emails correctly, I always have
to edit them.

The commit message header line should be your subject (with
something like "[PATCH 01/02] " or similar prefixed).

The body of your email should be the commit message contents
and then the patch.

If you want to make some extra comments that are not meant to
go into the commit message, put a line with just "---" after
the commit message (and before the patch), and then add what
you want to say.

Finally, please capitalize and properly spell words when appropriate.
F.e. "imlement" should be "Implement" in the commit header line of the
reset_resume() commit.