From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Eric Dumazet <eric.dumazet@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the sysctl tree with Linus' tree
Date: Tue, 17 Nov 2009 19:04:06 +1100 [thread overview]
Message-ID: <20091117190406.108f967d.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
Hi Eric,
Today's linux-next merge of the sysctl tree got a conflict in
net/decnet/sysctl_net_decnet.c between commit
887e671f324d9898aaedb29a6ece6c853c394067 ("decnet: netdevice refcount
leak") from Linus' tree and commit
f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl net: Remove unused
binary sysctl code") from the sysctl tree.
The latter removed the code (function dn_def_dev_strategy()) modified by
the former, so I just used the latter. I can carry this fix for a while,
but it can be fixed by merging v2.6.32-rc7 (or just the
above commit from Linus' tree - which would merge a much smaller number of
commits) into the sysctl tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2009-11-17 8:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-17 8:04 Stephen Rothwell [this message]
2009-11-17 8:21 ` linux-next: manual merge of the sysctl tree with Linus' tree Eric W. Biederman
2023-03-21 2:20 Stephen Rothwell
2023-03-21 2:22 ` Stephen Rothwell
2023-03-21 5:40 ` Luis Chamberlain
2023-03-21 14:42 ` Jiaqi Yan
2023-12-06 2:49 Stephen Rothwell
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=20091117190406.108f967d.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).