public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Vlad Yasevich <vladislav.yasevich@hp.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"David S. Miller" <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the sysctl tree with the net tree
Date: Tue, 01 Dec 2009 09:13:29 -0500	[thread overview]
Message-ID: <4B152489.7000201@hp.com> (raw)
In-Reply-To: <20091130164415.f418834b.sfr@canb.auug.org.au>


Stephen Rothwell wrote:
> Hi Eric,
> 
> Today's linux-next merge of the sysctl tree got a conflict in
> net/sctp/sysctl.c between commit 90f2f5318b3a5b0898fef0fec9b91376c7de7a2c
> ("sctp: Update SWS avaoidance receiver side algorithm") from the net tree
> and commit f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl net: Remove
> unused binary sysctl code") from the sysctl tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  I also
> removed the strategy member from the new added ctl_table entry.

Thanks for fixing this up Stephen.  I was basing my work on linux-next
which, it appears, didn't have the sysctl changes.

-vlad

  parent reply	other threads:[~2009-12-01 14:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-30  5:44 linux-next: manual merge of the sysctl tree with the net tree Stephen Rothwell
2009-11-30  5:51 ` Américo Wang
2009-11-30  6:39   ` Eric W. Biederman
2009-11-30  9:26     ` Américo Wang
2009-11-30  6:41   ` Stephen Rothwell
2009-11-30  9:21     ` Américo Wang
2009-12-01 14:13 ` Vlad Yasevich [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-12-04  8:43 Stephen Rothwell
2009-12-04 12:16 ` William Allen Simpson
2009-12-04 12:21   ` Stephen Rothwell
2009-12-04 21:42   ` Eric W. Biederman
2009-12-04  8:36 Stephen Rothwell
2009-12-04  8:50 ` Eric W. Biederman
2009-11-17  8:04 Stephen Rothwell
2009-11-17  9:17 ` Eric W. Biederman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B152489.7000201@hp.com \
    --to=vladislav.yasevich@hp.com \
    --cc=davem@davemloft.net \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox