Large Capsicum patch for review.

[Warner Losh]

On Feb 25, 2013, at 3:35 AM, Christoph Mallon wrote:

> On 24.02.2013 20:30, Pawel Jakub Dawidek wrote:
>> On Sun, Feb 24, 2013 at 07:05:57AM +0100, Christoph Mallon wrote:
>>> On 23.02.2013 23:11, Pawel Jakub Dawidek wrote:
>>>> On Thu, Feb 14, 2013 at 12:02:22AM +0100, Pawel Jakub Dawidek wrote:
>>>>> I'd like to commit this patch:
>>>>> 
>>>>> 	http://people.freebsd.org/~pjd/patches/capkern.diff
>>>> 
>>>> The patch was updated after the following changes and is available at
>>>> the link above:
>>> 
>>> I was not able to apply this patch cleanly and had to fudge with the diff:
>>> - Two diff headers (contrib/openbsm/etc/audit_event and lib/libc/gen/Makefile.inc) have an extra space after --- and +++, which is recognized as part of the filename.
>>>  Was this patch manually altered?
>> 
>> Nope, but I'm using some script to generate patch(1)-compatbile diff
>> from a perforce diff.
> 
> Ugh, why is p4 still in use, if it is just a hassle and hides history?

Because it is the only VCS that doesn't suck at merging? While git, hg and svn do a passing fair job, they all suck compared to perforce.

Warner