linux-kernel - Re: linux-next: manual merge of the sysctl tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2375c9f90911300121j437ffa9bleec585ebc8e62ea3@mail.gmail.com>
Date:	Mon, 30 Nov 2009 17:21:43 +0800
From:	Américo Wang <xiyou.wangcong@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"Eric W. Biederman" <ebiederm@...ssion.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vlad Yasevich <vladislav.yasevich@...com>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: linux-next: manual merge of the sysctl tree with the net tree

On Mon, Nov 30, 2009 at 2:41 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Américo,
>
> On Mon, 30 Nov 2009 13:51:03 +0800 Américo Wang <xiyou.wangcong@...il.com> wrote:
>>
>> > diff --cc net/sctp/sysctl.c
>> > index ae03ded,d50a042..0000000
>> > --- a/net/sctp/sysctl.c
>> > +++ b/net/sctp/sysctl.c
>> > @@@ -285,19 -241,7 +242,17 @@@ static ctl_table sctp_table[] =
>> >                .extra1         = &zero,
>> >                .extra2         = &addr_scope_max,
>> >        },
>> >  +      {
>> > -               .ctl_name       = CTL_UNNUMBERED,
>> >  +              .procname       = "rwnd_update_shift",
>> >  +              .data           = &sctp_rwnd_upd_shift,
>> >  +              .maxlen         = sizeof(int),
>> >  +              .mode           = 0644,
>> > -               .proc_handler   = &proc_dointvec_minmax,
>> > -               .strategy       = &sysctl_intvec,
>> > ++              .proc_handler   = proc_dointvec_minmax,
>>
>> Hey, what's this??
>
> If you mean "what is this strange looking patch", then it is the output
> from "git diff --cc" after a merge conflict has been fixed up, but before
> it is committed.  The '-' lines were added by one side of the merge or
> the other, but removed from the final result.  The line with '++' did not
> appear in either branch, but is in the final result.  The lines with a
> single '+' appear in one of the branches or the other and in the final
> result as well.
>

Thanks for teaching this! I thought it was a mistake, it is not. :)
No problem then.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/