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

[AmÃrico Wang]

On Mon, Nov 30, 2009 at 2:41 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi AmÃrico,
>
> On Mon, 30 Nov 2009 13:51:03 +0800 AmÃrico Wang <xiyou.wangcong@xxxxxxxxx> 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/