lkml.org 
[lkml]   [2011]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 01/26] staging: et131x: Put all .c files into one big file
On Wed, Oct 19, 2011 at 10:28:24PM +0100, Mark Einon wrote:
> On 19 October 2011 21:41, Greg KH <greg@kroah.com> wrote:
> > On Tue, Oct 18, 2011 at 05:07:34PM +0100, Mark Einon wrote:
> >> Created one big .c file for the driver, moving the contents of all
> >> driver .c files into it.
> >>
> >> Signed-off-by: Mark Einon <mark.einon@gmail.com>
> >
> > Something is wrong here, when I try to apply this patch with git, I get
> > the following errors:
> [...]
> >
> > Care to resend it with the file actually deleted?  How are you
> > generating this patch?
> >
> > And, when you resend the series, don't put the [RESEND] in the subject,
> > I had to edit that out in order to apply them properly (which turned out
> > to be a waste of time due to this patch not applying...)
>
> Apologies Greg, I didn't mean to waste your time.
>
> I've used this command to generate the patch, in order not to include
> the entire file contents that have been deleted:
>
> git format-patch -D <to-list> <patches>

I use:
git format-patch -k -M

If you read the man page for git format-patch, you will see why "-D"
does not work at all for this, and this is why I can't apply these
patches, you are giving me something that is _known_ to not apply:

-D, --irreversible-delete
Omit the preimage for deletes, i.e. print only the header but
not the diff between the preimage and /dev/null. The
resulting patch is not meant to be applied with patch nor git
apply; this is solely for people who want to just concentrate
on reviewing the text after the change. In addition, the
output obviously lack enough information to apply such a
patch in reverse, even manually, hence the name of the
option.

> I also assumed RESEND was commonly used for the purpose of resending
> patches. Is this not the case?

Yes, but you did it this way:
[RESEND][PATCH 02/XX]
and git will just strip off the first [] chunk when applying it. So
unless I wanted the [PATCH...] portion in the changelog, I had to delete
it by hand.

You can do:
[RESEND PATCH 03/XX]
and all would be almost ok, but when I sort the emails, it would break
order.

So best is:
[PATCH 03/XX RESEND]
if you really need the RESEND comment. Personally, I would only do that
in the [00/XX] patch as that's what counts here. You aren't resending
because I ignored them, but because there was a problem with them, so
you know I didn't apply those original ones.

hope this helps,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2011-10-20 00:33    [W:0.062 / U:0.384 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site