Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info
Blergh... You want it machine readable and I want it human readable. I don't care so much about the cover letter but for the first patch then I really want something minimal (one line) and human readable. base tree/branch: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master base commit: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc base patch-id: a849260a843115dbac4b1a330d44256ee6b16d7b base patch-subject: Linux 4.4 base tag: v4.4 To me that looks like an unparseable wall of text. My version of that is: Applies-to: afd2ff9b7e1b+ origin As a human all I really want to know is the tree to apply this to. If it doesn't apply then I don't debug it, I just send an automatic note "This doesn't apply to staging-next. Please redo." I think that Applies-to is a better name and also that grepping for "^base " is less reliable than grepping for ^Applies-to. I used "origin" because that's the name in Next/Trees. The + means private patches are applied. That's what we already do in naming the kernel. If the + matters, then I would include a cover letter. I have no idea what a "base patch-id" is so that doesn't work at all. Including the tag is just duplicative since we already have the hash. In my email, I proposed that we list all the other private patches in a cover letter, but I think you are saying that we only need to know the most recent private patch? Another idea would be to list them newest to oldest (git log order instead of email order) in the cover letter. Btw, I always work against linux-next and Dave M is always getting annoyed with me for not marking which patches go to net and which go to net-next. I don't use git format-patch, but I will probably start using "Applies-to: net" or "Applies-to: net-next". regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [RFC/PATCH 1/1] format-patch: add an option to record base tree info
So this is the format for the first patch? base commit: 0233b800c838ddda41db318ee396320b3c21a560 Can we change it to include the name of the public tree we are starting from? applies-to: 0233b800c838 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master Of course, my absolute prefered format would be: applies-to: net-next 0233b800c838 I don't think that's possible though? I often write that sort of a line in my emails to Dave already. Fengguang was suggesting something like this if we have to include unmerged patches: applies-to: net-next 0233b800c838 private patchset 1 private patchset 2 I don't think git knows what a patchset is. We would have to include the subject line for each unmerged patch. I think we should only do that if there is a cover letter, otherwise the it's too noisy. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/8] staging: et131x: Remove ununsed statistics
On Sat, Sep 13, 2014 at 11:57:51PM +0300, Dan Carpenter wrote: > On Sat, Sep 13, 2014 at 09:47:45PM +0100, Mark Einon wrote: > > On Sat, Sep 13, 2014 at 04:36:45PM -0400, Jeff King wrote: > > > I don't think we can make this 100% foolproof without knowing which mbox > > > variant the writer used. But dropping the line is probably the worst > > > possible thing, as it does not match _any_ variants. :) > > > > Hi, > > > > FYI it was 'git send-email' v2.1.0 that sent the mail, and I don't have > > the offending character in any versions of the mail I can see. > > > > The mailing list version has it. > > http://www.spinics.net/lists/linux-driver-devel/msg54372.html Or based on Peff's email it might be a bug in the spinics list software. Here are some other examples: Piper mail has '>From'. http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2014-September/058299.html but gmane gets it right. http://comments.gmane.org/gmane.linux.drivers.driver-project.devel/57684 regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/8] staging: et131x: Remove ununsed statistics
On Sat, Sep 13, 2014 at 09:47:45PM +0100, Mark Einon wrote: > On Sat, Sep 13, 2014 at 04:36:45PM -0400, Jeff King wrote: > > I don't think we can make this 100% foolproof without knowing which mbox > > variant the writer used. But dropping the line is probably the worst > > possible thing, as it does not match _any_ variants. :) > > Hi, > > FYI it was 'git send-email' v2.1.0 that sent the mail, and I don't have > the offending character in any versions of the mail I can see. > The mailing list version has it. http://www.spinics.net/lists/linux-driver-devel/msg54372.html regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/8] staging: et131x: Remove ununsed statistics
On Sat, Sep 13, 2014 at 08:45:56AM -0700, Greg KH wrote: > On Sat, Sep 13, 2014 at 12:37:46PM +0300, Dan Carpenter wrote: > > On Thu, Sep 11, 2014 at 10:59:42PM +0100, Mark Einon wrote: > > > >From struct ce_stats; unicast_pkts_rcvd, unicast_pkts_xmtd, > > > multicast_pkts_xmtd, broadcast_pkts_rcvd and broadcast_pkts_xmtd > > > > For some reason something adds a '>' to the start of lines which start > > with 'From'. I don't know what it is... > > It's an email protocol requirement, some RFC dictates it as "From" at > the start of the line is an email "start" flag. > > > When I apply this patch with 'git am' then it just removes the From > > line. > > As it should :) > But now the changelog is corrupt. I have tested with the git version 2.1.0.238.gce1d3a9. The first line of the changelog gets chopped off because of the ">From". It's a little annoying. Do we just tell Mark to resend with a different changelog or is there a way to fix the tools? regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/8] staging: et131x: Remove ununsed statistics
On Thu, Sep 11, 2014 at 10:59:42PM +0100, Mark Einon wrote: > >From struct ce_stats; unicast_pkts_rcvd, unicast_pkts_xmtd, > multicast_pkts_xmtd, broadcast_pkts_rcvd and broadcast_pkts_xmtd For some reason something adds a '>' to the start of lines which start with 'From'. I don't know what it is... When I apply this patch with 'git am' then it just removes the From line. I have seen these '>From' lines before but I haven't seen anyone discuss this problem. regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v6 02/11] trailer: process trailers from stdin and arguments
On Fri, Mar 07, 2014 at 07:19:15AM +0100, Christian Couder wrote: > On Wed, Mar 5, 2014 at 11:52 PM, Junio C Hamano wrote: > > > > This round is marked as the sixth, but I still see quite a many > > style issues, which I expect not to see from long timers without > > being told. Somewhat disappointing... > > Yeah, I don't know why, but these days I find it very hard to review > style issues in my own code without being distracted. > And by the way is there a good script to check them? Many of these would have been caught with kernel.org's checkpatch.pl script. http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/scripts/checkpatch.pl regards, dan carpenter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
