into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

        inode size has changed and to only output an error if so.
      - Rename fs/ntfs/attrib.h::attribute_value_length() to ntfs_attr_size().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

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

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

      and ntfs_filldir() as per suggestion from Al Viro.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

        kernel.
      - Update ->setattr (fs/ntfs/inode.c::ntfs_setattr()) to refuse to
        change the uid, gid, and mode of an inode as we do not support NTFS
        ACLs yet.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into kanga.twiddle.home:/home/rth/work/linux/axp-2.6

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

The adt746x driver currently adds a "°C" suffix to temperatures exposed via
sysfs, and I don't like that.  First, we all agree that any other unit here
makes no sense (do we ?  do we ?  yes of course :) and I don't like having
anything but numbers in there, and finally it's more consistent with what
the g5 driver does.

And finally, the _REAL_ reason is that this is not a low ASCII character
and so has nothing to do in the kernel sources or in /sys :)

Unfortunately, generating a patch here is nasty because of that (my mailer
is rightfully complaining about the non-ASCII char on text import) so you
might have to apply by hand...
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There is another (minor) bug that the smp_processor_id() debugger
unearthed: diskstats_show() could do a disk_round_stats() ->
disk_stat_add() with preemption enabled - possibly resulting in losing
statistics updates.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fix ->cpuinfo.transition_latency for powernow-k7
Signed-off-by: Bruno Ducrot <ducrot@poupinou.org>
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Heinz Mauelshagen <mauelshagen@redhat.com>

Make mirror log synchronization optional.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Rename EMIT macro to DMEMIT and move to header file.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix minor number allocation check: (1 << MINORBITS) is invalid.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If setting the printk log buffer (with the boot command line option
"log_buf_len") to a value that's not a power of two, the index calculations
go wrong and yield confusing results.

This patch rounds the size to the next higher power of two.  It'll yield
garbage for sizes > INT_MAX bytes.
Signed-off-by: Werner Almesberger <werner@almesberger.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- s/390 dasd moved to major 94.

- s/390 VM/ESA moved to major 95.

- INFTL moved to major 96.

- Patch also adds Marvell MPSC low-density device to Minor 44 & 45 (Major
  204).  This one was in my queue.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Steffen Thoss <thoss@de.ibm.com>
From: Ursula Braun-Krahl <braunu@de.ibm.com>

qeth network driver change:
 - Change misleading message about hardware ip fragmentation.
 - Include qeth_snmp_ureq_hdr structure in user copy in qeth_snmp_command.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Horst Hummel <horst.hummel@de.ibm.com>

dasd driver changes:
 - Add control unit types 0x2107 and 0x1750.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

s390 core changes:
 - Replace invoke_softirq mechanism with own version of do_softirq.
 - Move /proc/inteerrupts functions to re-added arch/s390/kernel/irq.c
 - Add some includes to avoid compiler warnings.
 - Remove unused #defines.
 - Regenerate default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Stack usage is reduced from 268 to 120 bytes on i386.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This change had fixed definition order of _sigchld about MIPS.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes gcc-3.4 cast-as-lvalue warnings in the 2.6.9-rc2 kernel's
Specialix RIO driver.  This is a forward port of the fix I made for the 2.4
kernel.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

make ARCH=ppc64 -j12 O=/dev/shm/R all fails, the linker script is not in
the output directory.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes gcc-3.4 cast-as-lvalue warnings in the 2.6.9-rc2 kernel's
WANPIPE/SDLA net drivers.  This is a forward port of the fix I made for the
2.4 kernel.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here's a patch to fix a bug in compat_sys_fcntl64 in fs/compat.c.  The bug
occurs with a 32 bit app that calls fcntl and checking for a lock near the
end of a file.

    struct flock sflp;
    sflp.l_start = 2147483345;
    sflp.l_len = 302;
    /* 2147483345 + 302 == 2147483647 (this should not overflow 31 bits) */
    /* 2^31 ==             2147483648 */
    fcntl_stat = fcntl(fd, F_GETLK, &sflp);

The patch also contains a fix to handle l_len < 0 which is now defined in
POSIX 1003.1-2001 from the fcntl man page.
Signed-off-by: John Engel <jhe@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This change had fixed undeclared identifier in
arch/mips/vr41xx/common/giu.c
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This change had fixed initialization error in arch/mips/vr41xx/common/icu.c
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

UPF_RESOURCES isn't used now.
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This attached patch adds list_replace_rcu() to include/linux/list.h for
atomic updating operations according to RCU-model.

void list_replace_rcu(struct list_head *old, struct list_head *new)

The 'old' element is detached from the linked list, and the 'new' element
is inserted to the same point of the linked list concurrently.

This patch is necessary for the performance improvement of SELinux.
See, http://lkml.org/lkml/2004/8/16/54
       (Subject: RCU issue with SELinux)
     http://lkml.org/lkml/2004/8/30/63
       (Subject: [PATCH]SELinux performance improvement by RCU)
Signed-off-by: KaiGai, Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

reiserfs_set_xattr() explicitly updates the ctime for the host inode.

This works for direct setfacl/setfattr calls, but for the more common case
of an inherited default ACL, it breaks.  The ACL is inherited in the middle
of the new inode creation, before the inode has been hashed.

When mark_inode_dirty is called, one of the checks bails out if the inode
is unhashed -- but AFTER inode->i_state is updated, so the inode is marked
dirty but never placed on any dirty list.

Since the inode is never placed on a dirty list, __sync_single_inode from
the writeback_inodes() path can never be called on it to clear the dirty
flags.  Once the inode is hashed and mark_inode_dirty is called for it
again, it's too late -- it will bail early assuming (correctly) that the
inode is already marked dirty.  This ultimately results in I/O stalls that
can't be resolved by the fs path, only be the memory allocation path that
uses pages directly.

The attached patch makes the update of the ctime conditional on the inode
being hashed already.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch reaaranges inode_lock taking in writeback_inodes().  It narrows
down use of inode_lock and removes unneccassary nesting of sb_lock and
inode_lock.  Instead of holding inode_lock for all the time I moved it
around sync_sb_inodes() as it is in all other places.
Signed-Off-By: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes race in writeback_inodes() described below:

writeback_inodes()
{
     ....
     sb->s_count++;
     spin_unlock(&sb_lock);
     ....
     spin_lock(&sb_lock);
     if (__put_super(sb))        <<< X
         goto restart;
     }
}

deactivate_super()
{
     fs->kill_sb(s);
         kill_block_super(sb)
             generic_shutdown_super(sb)
                     spin_lock(&sb_lock);
                     list_del(&sb->s_list);    <<< Y
                     spin_unlock(&sb_lock);
     ....
     put_super(s);
             spin_lock(&sb_lock);
             __put_super(sb);            <<< Z
             spin_unlock(&sb_lock);
}

The problem with it is that writeback_inodes() supposes that if
__put_super() returns 0 then no super block was deleted from the list and
we can safely traverse sb list further.

But as it is obvious from the deactivate_super() it's not actually true.
because at point Y we delete super block from the list and drop the lock.
We do __put_super() very much later...  So we can find sb with poisoned
sb->s_list at point X and we won't be the last sb reference holders.  The
last reference will be dropped in point Z.

So in case of the following sequence of execution Y -> X -> Z we'll get an
oops after point X in writeback_inodes().

This patch introduces __put_super_and_need_restart() function which allows
safe traversing of sb list.  I'll send a couple of patches later which
remove O(n^2) algos and using this function.
Signed-Off-By: Kirill Korotaev <dev@sw.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

I booted IA64 kernel with "maxcpus=" set to less than the total available
processors in the system.  Then I tried to online the CPU which was offline
due to "maxcpus=" restirction.  i.e when I tried to online the CPU which
never was online at boot crashed the system.
Signed-off-by: Anil Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch supplies an device so that ibmvscsic will actually have its
probe routine called and so allow ti to actually initialise on (legacy)
iSeries machines.

It also adds a device for the virtual console (for consistency only at the
moment).
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>