into ppc970.osdl.org:/home/torvalds/v2.6/linux

into cantab.net:/home/src/ntfs-2.6

      in handling of corner cases.

into cantab.net:/home/src/ntfs-2.6

From: Adam Lackorzynski <adam@os.inf.tu-dresden.de>

one of the macros for get_thread_area extracts the wrong bit.  The
"32bit" field is in bit 22, not 23 (as can be seen in desc.h). 

[ Fix ia64/x86-64 too, while we're at it. Linus ]

From: Andi Kleen <ak@muc.de>

Set up SMT for the domain scheduler on x86-64.  This way the scheduling
works better on HyperThreading aware systems; in particular it will use
both physical CPUs before sharing two virtual CPUs on the same package. 
This improves performance considerably in some cases.

Based on the i386 code and a previous patch from Suresh B. Siddha.

From: Andi Kleen <ak@muc.de>

From: Suresh B. Siddha

Convert sibling map on x86-64 to cpumasks.

This is needed for the SMT patches.

From: Rusty Russell <rusty@rustcorp.com.au>

PowerPC64 ABI has ".funcname" (the actual function) and "funcname" (the
function descriptor) and we strip off the dots in "dedotify" called from
module_frob_arch_sections().  We need to also de-dotify the corresponding
names in the __version section.

Actually has nothing to do with __down, it's just that we only print the
first symbol whose version is missing.

From: Paul Mackerras <paulus@samba.org>

It turns out that we are not handling the TABDLY bits of the termios
c_oflag field correctly on PPC, PPC64 and Alpha.  These three architectures
have a value for XTABS that is different from the TAB3 value.  POSIX
specifies that setting the TABDLY field to TAB3 should result in tabs being
expanded to spaces.  In n_tty.c:opost() we check for O_TABDLY(tty) ==
XTABS, which is fine on most architectures because they have XTABS == TAB3.

I think the right thing to do is just to change the definition of XTABS to
be the same as TAB3 on these architectures.  The patch below does this for
PPC and PPC64 (and I suggest the Alpha maintainer should do the same).  At
the moment, applications using either the XTABS or TAB3 values won't get
the expected behaviour.  With this patch, apps that use TAB3 will get the
expected behaviour.  Apps that use XTABS will need to be recompiled (but
note that the POSIX-specified name to use is TAB3 not XTABS).

Peter Braam said:

    I would just like to say that I have no difficulties with intermezzo
    being rm -rf'd.  There are probably only a handful of users.  

    In the past 4 years nobody has supported InterMezzo sufficiently for
    it to become successful.  I have been fortunate to get really good support
    for the Lustre project.  So I have focussed on that.  Lustre 1.X has
    become really solid.

    The disconnected operation, caching and mirroring functionality of
    InterMezzo will become available in Lustre as a new feature in version 2. 

     So I see no point in keeping InterMezzo if it is a nuisance. 


The patch removes the references to intermezzo.  Please do a `bk rm' of
fs/intermezzo.

From: Olaf Hering <olh@suse.de>

make tags skips security/selinux/include because of find .  -name include
-prune This patch does just add it later.  No idea if it can be done
better.

From: Christoph Hellwig <hch@lst.de>

(partially from the debian kernel tree)

From: Adrian Bunk <bunk@fs.tum.de>

The patch below removes two #ifdef's for kernel 2.2 from
linux-2.6.2-mm1/drivers/telephony/ixj.h

From: Adrian Bunk <bunk@fs.tum.de>

The patch below removes some #ifdef'd kernel 2.2 code from
drivers/net/hamradio/dmascc.c.

From: Joseph Parmelee <jparmele@wildbear.com>

Fixes improper setup of the mixer on Crystal soundcards with the CS4235
chip.

fbcon needs this symbol.

We may as well make usermodehelper_init() core_initcall as well, to make
sure its services are avaialble to all the other initcall levels.

We need to register the binfmts earlier, so normal initcalls can successfully
run call_usermodehelper() to execute things.

From: Stephen Hemminger <shemminger@osdl.org>

Minor tweak to rcu, use __list_splice instead of list_splice because the
  list has already been checked for empty.

From: Christoph Hellwig <hch@lst.de>

->open already has a reference so use __module_get.  The file has no
maintainer noted in it, all credits are from the driver it's copied from.

From: Christoph Hellwig <hch@lst.de>

mtd driver need to get another reference if ->probe succeeds (strange design
if you ask me, but what the heck..), and while most drivers have been switched
to __module_get already two are still missing.

From: Christoph Hellwig <hch@lst.de>

A bunch of framebuffer drivers use MOD_INC_USE_COUNT to prevent themselves
from unloading completely - but we have a much easier way to do so, that is
simply removing the module_exit/cleanup_module handler.

From: Christoph Hellwig <hch@lst.de>

Well, UML is pretty out of date in mainline, but I'd like to squash the last
users of said beasts rather sooner than later.

From: Christoph Hellwig <hch@lst.de>

Driver already sets fops->owner so the open/close methods are entirely
superflous.

From: Christoph Hellwig <hch@lst.de>

Callers are exported register/unregister handlers so the module is locked in
core by users of said exports.

From: <mikem@beardog.cca.cpqcorp.net>

This patch fixes 2 minor issues that break our Array Configuration utility.
 my_io was changed to a pointer so the & had to removed when using it with
copy_to_user().

Sometime in 2.5 SG_MAX got changed to 31.  Maybe to copy cciss?  Now I'm
changing it back to 32 so our app can work.

From: "Chen, Kenneth W" <kenneth.w.chen@intel.com>,
      "Seth, Rohit" <rohit.seth@intel.com>

This patch addresses the longstanding problem wherein Oracle needs
CAP_IPC_LOCK to allocate SHM_HUGETLB shm memory, but people don't want to run
Oracle as root, and capabilties are busted.

Various ideas with rlimits didn't work out, mainly because these objects live
beyond the lifetime of the user processes which establish them.

What we do is to create root-writeable /proc/sys/vm/hugetlb_shm_group which
specifies a single group ID.  Users who belong to that group may allocate
hugepages for SHM_HUGETLB shm segments.

So the sysadmin will greate a new group, say `hugepageusers', will add the
oracle user to that group and will write that group's ID into
/proc/sys/vm/hugetlb_shm_group.

From: David Gibson <david@gibson.dropbear.id.au>

add_to_page_cache() locks the given page if and only if it suceeds.  The
hugepage code (every arch), however, does an unlock_page() after
add_to_page_cache() before checking the return code, which could trip the
BUG() in unlock_page() if add_to_page_cache() failed.

In practice we've never hit this bug, because the only ways
add_to_page_cache() can fail are when we fail to allocate a radix tree node
(very rare), or when there is already a page at that offset in the radix
tree, which never happens during prefault, obviously.  We should probably
fix it anyway, though.

The analagous bug in some of the patches floating about to
demand-allocation of hugepages is more of a problem, because multiple
processes can race to instantiate a particular page in the radix tree -
that's been hit at least once (which is how I found this).

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

Zhenmin's checker tool <zli4@cs.uiuc.edu> detected this:

 9. /drivers/pci/hotplug/shpchp_ctrl.c, Line 1575:
 err("%s: Failed to disable slot, error code(%d)\n", __FUNCTION__, rc);

 Maybe change to:
 err("%s: Failed to disable slot, error code(%d)\n", __FUNCTION__,
 retval);

I think it is right because at line 1564, the slot is turned off, and in
this line (1575) is checked the status to see if we got an error; if so,
the error number is shown.  This number is in 'retval', not in 'rc' ('rc'
does have the return of configure_new_device()).

From: Hanna Linder <hannal@us.ibm.com>

Per Greg's request this is a patch of having run Lindent on cpuid.c.  The
tabs were not the right number of spaces before.  I have verified it still
compiles and boots with this "change".

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/pcmcia/tcic.c:63: warning: `version' defined but not used

From: Jens Axboe <axboe@suse.de>

AS does not correctly account requests inserted with INSERT_FRONT or
INSERT_BACK, barriers for example.  In other elevators, requeued requests also
go through the insert path, but AS has its own requeue handler which means the
code has never been tested.

Also, make inserting a barrier with INSERT_SORT imply INSERT_BACK, which is
the logical behaviour.  Previously such insertions weren't rigorously defined.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

ldisc close can race with the flush_to_ldisc workqueue.

This patch fixes it by killing the workqueue first.

From: Olaf Dabrunz <od@suse.de>

Add the necessary hooks so that a SELinux-enabled kernel will allow the new
"report the size of the printk buffer" query to work.

From: "Chen, Kenneth W" <kenneth.w.chen@intel.com>

It's kind of redundant that queue_congestion_on/off_threshold gets
calculated on every I/O and they produce the same number over and over
again unless q->nr_requests gets changed (which is probably a very rare
event).  We can cache those values in the request_queue structure.

From: Pavel Machek <pavel@ucw.cz>

From: Chris Wright <chrisw@osdl.org>

Currently, if a user creates an mqueue and passes an mq_attr, the
info->messages will be created twice (and the extra one is properly freed).
This patch simply delays the allocation so that it only ever happens once. 
The relevant mq_attr data is passed to lower levels via the dentry->d_fsdata
fs private data.  This also helps isolate the areas we'd need to touch to do
rlimits on mqueues.

From: Jakub Jermar <jermar@itbs.cz>

I found out that BFS filesystem will eventually try to read and interpret
garbage past the end of directory in bfs_add_entry().  If the garbage
(interpreted as i-node number) is not set to zero (does it have to be?)
bfs_add_entry() will consider it a regular directory entry. 

This causes weird things like this:
# touch a
# rm a
# ls
# touch b
# ls
a

My patch detects an attempt to read past the end of directory and explicitly
clears the garbage that represents i-node number.  Thus the correct behaviour
is achieved.

(was unable to contact Tigran)

From: <spam@altium.nl> (Dick Streefland)

The following patch documents the currently undocumented raid= kernel
parameter.