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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpaH3gSHUHmY.pgp
Description: PGP signature
