kernel/linux.git, branch v2.6.18-rc2

Linux 2.6.18-rc2

2006-07-15T21:53:08+00:00

Finishing up for the kernel summit. Ottawa, here I come. Signed-off-by: Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

2006-07-15T21:43:30+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: commit_mutex cleanups

[PATCH] UML - fix utsname build breakage

2006-07-15T21:42:24+00:00

Some -mm-only material leaked into a patch destined for mainline, and I didn't notice. This was the replacement of system_utsname with utsname() that's required by the uts namespace patch. This patch reverts those changes (which are correct in -mm) so that mainline UML builds again. Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds

Don't allow chmod() on the /proc// files

2006-07-15T19:26:45+00:00

This just turns off chmod() on the /proc// files, since there is no good reason to allow it, and had we disallowed it originally, the nasty /proc race exploit wouldn't have been possible. The other patches already fixed the problem chmod() could cause, so this is really just some final mop-up.. This particular version is based off a patch by Eugene and Marcel which had much better naming than my original equivalent one. Signed-off-by: Eugene Teo Signed-off-by: Marcel Holtmann Signed-off-by: Linus Torvalds

Mark /proc MS_NOSUID and MS_NOEXEC

2006-07-15T19:20:05+00:00

Not that we really need this any more, but at the same time there's no reason not to do this. Signed-off-by: Linus Torvalds

[PATCH] sch_htb compile fix.

2006-07-15T18:40:20+00:00

net/sched/sch_htb.c: In function 'htb_change_class': net/sched/sch_htb.c:1605: error: expected ';' before 'do_gettimeofday' Signed-off-by: Dave Jones Signed-off-by: Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

2006-07-15T04:57:45+00:00

* master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6: [CRYPTO] padlock: Fix alignment after aes_ctx rearrange

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

2006-07-15T04:57:23+00:00

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64] Fix PSYCHO PCI controler init. [SPARC64] psycho: Fix pbm->name handling in pbm_register_toplevel_resources() [SERIAL] sunsab: Fix significant typo in sab_probe() [SERIAL] sunsu: Report keyboard and mouse ports in kernel log. [SPARC64]: Make sure IRQs are disabled properly during early boot.

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2006-07-15T04:57:06+00:00

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [VLAN]: __vlan_hwaccel_rx can use the faster ether_compare_addr [PKT_SCHED] HTB: initialize upper bound properly [IPV4]: Clear skb cb on IP input [NET]: Update frag_list in pskb_trim

[PATCH] remove set_wmb - arch removal

2006-07-15T04:56:14+00:00

set_wmb should not be used in the kernel because it just confuses the code more and has no benefit. Since it is not currently used in the kernel this patch removes it so that new code does not include it. All archs define set_wmb(var, value) to do { var = value; wmb(); } while(0) except ia64 and sparc which use a mb() instead. But this is still moot since it is not used anyway. Hasn't been tested on any archs but x86 and x86_64 (and only compiled tested) Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds