tcpdump mailing list archives
Re: [PATCH] Bugfix/improvement for linux mmap ring buffer
From: Guy Harris <guy () alum mit edu>
Date: Wed, 15 Jul 2009 13:25:21 -0700
On Jul 15, 2009, at 12:40 PM, Dustin Spicuzza wrote:
Found this bug while trying to add the buffer statistics API. git formatted patch attached: - Fixed bug where create_ring would fail for particular snaplen and buffer size combinations- Changed ring allocation to retry with 5% less buffer size instead of 50%
Applied manually: $ git am --whitespace=nowarn /tmp/patch.eml Applying: Bugfix/improvement for linux mmap ring buffer error: patch failed: pcap-linux.c:2599 error: pcap-linux.c: patch does not apply Patch failed at 0001. 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". $ git --version git version 1.6.1.3 committed, and pushed.Should I upgrade to a newer version of Git or something? Every time I've gotten a patch in what I assume is the "standard" form for Git patches, "git am"
1) warns about whitespace and 2) fails to apply the patchwithout giving me any useful information as the the cause of the failure, leaving me unable to "[resolve] the problem" except by not using "git am".
NOTE: for better or worse, at least by default, my mail program (OS X's Mail application - and, no, I have no interest in changing applications and certainly won't do so merely to make Git happy) saves mail messages with CR-LF line endings (no, not old-style Mac OS CR- only line endings, and not Macs-are-UN*X-boxes-now LF-only line endings, DOS-and-Windows CR-LF line endings). Is that all that's pissing Git off? I'll probably file a bug against Mail anyway, especially given that in the maildir(ish) mail store itself, the line endings in the file for a message are the LFs that God^WKen and Dennis^W^W^Wthe Multics people intended.
- This is the tcpdump-workers list. Visit https://cod.sandelman.ca/ to unsubscribe.
Current thread:
- [PATCH] Bugfix/improvement for linux mmap ring buffer Dustin Spicuzza (Jul 15)
- Re: [PATCH] Bugfix/improvement for linux mmap ring buffer Guy Harris (Jul 15)
- Re: [PATCH] Bugfix/improvement for linux mmap ring Dustin Spicuzza (Jul 15)
- Re: [PATCH] Bugfix/improvement for linux mmap ring buffer Guy Harris (Jul 15)