The patch titled
namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit.patch
has been added to the -mm tree. Its filename is
namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit.patch
git-klibc.patch nuked net/ipv4/ipconfig.c. Save this hunk for later.
Cc: Serge Hallyn <serue@xxxxxxxxxx>
Cc: Kirill Korotaev <dev@xxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Herbert Poetzl <herbert@xxxxxxxxxxxx>
Cc: Andrey Savochkin <saw@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/ipv4/ipconfig.c | 2 +-
sound/core/info_oss.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff -puN net/ipv4/ipconfig.c~namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit net/ipv4/ipconfig.c
--- 25/net/ipv4/ipconfig.c~namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit Fri May 19 11:44:25 2006
+++ 25-akpm/net/ipv4/ipconfig.c Fri May 19 11:44:25 2006
@@ -367,7 +367,7 @@ static int __init ic_defaults(void)
*/
if (!ic_host_name_set)
- sprintf(system_utsname.nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr));
+ sprintf(init_utsname()->nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr));
if (root_server_addr == INADDR_NONE)
root_server_addr = ic_servaddr;
diff -puN sound/core/info_oss.c~namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit sound/core/info_oss.c
--- 25/sound/core/info_oss.c~namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit Fri May 19 11:44:25 2006
+++ 25-akpm/sound/core/info_oss.c Fri May 19 11:44:25 2006
@@ -96,11 +96,11 @@ static void snd_sndstat_proc_read(struct
{
snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");
snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",
- system_utsname.sysname,
- system_utsname.nodename,
- system_utsname.release,
- system_utsname.version,
- system_utsname.machine);
+ init_utsname()->sysname,
+ init_utsname()->nodename,
+ init_utsname()->release,
+ init_utsname()->version,
+ init_utsname()->machine);
snd_iprintf(buffer, "Config options: 0\n");
snd_iprintf(buffer, "\nInstalled drivers: \n");
snd_iprintf(buffer, "Type 10: ALSA emulation\n");
_
Patches currently in -mm which might be from serue@xxxxxxxxxx are
origin.patch
namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit.patch
namespaces-utsname-use-init_utsname-when-appropriate-klibc-bit.patch
namespaces-add-nsproxy.patch
namespaces-incorporate-fs-namespace-into-nsproxy.patch
namespaces-utsname-introduce-temporary-helpers.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
namespaces-utsname-remove-system_utsname.patch
namespaces-utsname-implement-clone_newuts-flag.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
