Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.25-git5
Commits on Apr 23, 2008
  1. @torvalds

    slab_err: Pass parameters correctly to slab_bug

    Christoph Lameter authored torvalds committed
    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

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

    torvalds authored
    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      [patch 7/7] vfs: mountinfo: show dominating group id
      [patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo
      [patch 5/7] vfs: mountinfo: allow using process root
      [patch 4/7] vfs: mountinfo: add mount peer group ID
      [patch 3/7] vfs: mountinfo: add mount ID
      [patch 2/7] vfs: mountinfo: add seq_file_root()
      [patch 1/7] vfs: mountinfo: add dentry_path()
      [PATCH] remove unused label in xattr.c (noise from ro-bind)
  3. @torvalds

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

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      iwlwifi: Fix built-in compilation of iwlcore
      net: Unexport move_addr_to_{kernel,user}
      rt2x00: Select LEDS_CLASS.
      iwlwifi: Select LEDS_CLASS.
      leds: Do not guard NEW_LEDS with HAS_IOMEM
      [IPSEC]: Fix catch-22 with algorithm IDs above 31
      time: Export set_normalized_timespec.
      tcp: Make use of before macro in tcp_input.c
      hamradio: Remove unneeded and deprecated cli()/sti() calls in dmascc.c
      [NETNS]: Remove empty ->init callback.
      [DCCP]: Convert do_gettimeofday() to getnstimeofday().
      [NETNS]: Don't initialize err variable twice.
      [NETNS]: The ip6_fib_timer can work with garbage on net namespace stop.
      [IPV4]: Convert do_gettimeofday() to getnstimeofday().
      [IPV4]: Make icmp_sk_init() static.
      [IPV6]: Make struct ip6_prohibit_entry_template static.
      tcp: Trivial fix to correct function name in a comment in net/ipv4/tcp.c
      [NET]: Expose netdevice dev_id through sysfs
      skbuff: fix missing kernel-doc notation
      [ROSE]: Fix soft lockup wrt. rose_node_list_lock
  4. @lenb @torvalds

    pnpacpi: fix potential corruption on "pnpacpi: exceeded the max numbe…

    lenb authored torvalds committed
    …r of IRQ resources 2"
    
    PNP_MAX_IRQ is 2
    If a device invokes pnpacpi_parse_allocated_irqresource() 0, 1, or 2 times, we are happy.
    The 3rd time, we will fail and print "pnpacpi: exceeded the max number of IRQ resources: 2"
    The 4th and subsequent calls (if this ever happened) would silently scribble on
    irq_resource[2], which doesn't actualy exist.
    
    Found-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @davem330

    iwlwifi: Fix built-in compilation of iwlcore

    Tomas Winkler authored davem330 committed
    This patch fixes problem in Makefile that prevented
    built-in compilation of iwlcore
    
    Commit that caused this problem: eadd3c4 ("iwlwifi: make Makefile
    more concise")
    
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Yi Zhu <yi.zhu@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. @davem330

    net: Unexport move_addr_to_{kernel,user}

    Adrian Bunk authored davem330 committed
    After the removal of the Solaris binary emulation the exports of 
    move_addr_to_{kernel,user} are no longer used.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    rt2x00: Select LEDS_CLASS.

    davem330 authored
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @davem330

    iwlwifi: Select LEDS_CLASS.

    davem330 authored
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @davem330

    leds: Do not guard NEW_LEDS with HAS_IOMEM

    davem330 authored
    The LEDS infrastructure itself does not require anything
    that a platform dependant upon HAS_IOMEM.
    
    The individual drivers do, but they are properly guarded
    with the necessary platform dependencies.
    
    One can even imagine a hypervisor based LED driver that
    a platform without HAS_IOMEM might have.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. [patch 7/7] vfs: mountinfo: show dominating group id

    Miklos Szeredi authored Al Viro committed
    Show peer group ID of nearest dominating group that has intersection
    with the mount's namespace.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  11. [patch 6/7] vfs: mountinfo: add /proc/<pid>/mountinfo

    Ram Pai authored Al Viro committed
    [mszeredi@suse.cz] rewrite and split big patch into managable chunks
    
    /proc/mounts in its current form lacks important information:
    
     - propagation state
     - root of mount for bind mounts
     - the st_dev value used within the filesystem
     - identifier for each mount and it's parent
    
    It also suffers from the following problems:
    
     - not easily extendable
     - ambiguity of mountpoints within a chrooted environment
     - doesn't distinguish between filesystem dependent and independent options
     - doesn't distinguish between per mount and per super block options
    
    This patch introduces /proc/<pid>/mountinfo which attempts to address
    all these deficiencies.
    
    Code shared between /proc/<pid>/mounts and /proc/<pid>/mountinfo is
    extracted into separate functions.
    
    Thanks to Al Viro for the help in getting the design right.
    
    Signed-off-by: Ram Pai <linuxram@us.ibm.com>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  12. [patch 5/7] vfs: mountinfo: allow using process root

    Miklos Szeredi authored Al Viro committed
    Allow /proc/<pid>/mountinfo to use the root of <pid> to calculate
    mountpoints.
    
     - move definition of 'struct proc_mounts' to <linux/mnt_namespace.h>
     - add the process's namespace and root to this structure
     - pass a pointer to 'struct proc_mounts' into seq_operations
    
    In addition the following cleanups are made:
    
     - use a common open function for /proc/<pid>/{mounts,mountstat}
     - surround namespace.c part of these proc files with #ifdef CONFIG_PROC_FS
     - make the seq_operations structures const
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  13. [patch 4/7] vfs: mountinfo: add mount peer group ID

    Miklos Szeredi authored Al Viro committed
    Add a unique ID to each peer group using the IDR infrastructure.  The
    identifiers are reused after the peer group dissolves.
    
    The IDR structures are protected by holding namepspace_sem for write
    while allocating or deallocating IDs.
    
    IDs are allocated when a previously unshared vfsmount becomes the
    first member of a peer group.  When a new member is added to an
    existing group, the ID is copied from one of the old members.
    
    IDs are freed when the last member of a peer group is unshared.
    
    Setting the MNT_SHARED flag on members of a subtree is done as a
    separate step, after all the IDs have been allocated.  This way an
    allocation failure can be cleaned up easilty, without affecting the
    propagation state.
    
    Based on design sketch by Al Viro.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  14. [patch 3/7] vfs: mountinfo: add mount ID

    Miklos Szeredi authored Al Viro committed
    Add a unique ID to each vfsmount using the IDR infrastructure.  The
    identifiers are reused after the vfsmount is freed.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  15. [patch 2/7] vfs: mountinfo: add seq_file_root()

    Miklos Szeredi authored Al Viro committed
    Add a new function:
    
      seq_file_root()
    
    This is similar to seq_path(), but calculates the path relative to the
    given root, instead of current->fs->root.  If the path was unreachable
    from root, then modify the root parameter to reflect this.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  16. [patch 1/7] vfs: mountinfo: add dentry_path()

    Ram Pai authored Al Viro committed
    [mszeredi@suse.cz] split big patch into managable chunks
    
    Add the following functions:
    
      dentry_path()
      seq_dentry()
    
    These are similar to d_path() and seq_path().  But instead of
    calculating the path within a mount namespace, they calculate the path
    from the root of the filesystem to a given dentry, ignoring mounts
    completely.
    
    Signed-off-by: Ram Pai <linuxram@us.ibm.com>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  17. [PATCH] remove unused label in xattr.c (noise from ro-bind)

    Al Viro authored
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  18. @torvalds

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

    torvalds authored
    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      [PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()
      [PATCH] proc_readfd_common() race fix
      [PATCH] double-free of inode on alloc_file() failure exit in create_write_pipe()
      [PATCH] teach seq_file to discard entries
      [PATCH] umount_tree() will unhash everything itself
      [PATCH] get rid of more nameidata passing in namespace.c
      [PATCH] switch a bunch of LSM hooks from nameidata to path
      [PATCH] lock exclusively in collect_mounts() and drop_collected_mounts()
      [PATCH] move a bunch of declarations to fs/internal.h
  19. @torvalds

    Fix cardbus resource allocation

    torvalds authored
    Commit 8845256 ("PCI: clean up resource
    alignment management") didn't set the alignment information for the
    cardbus window resources, causing their subsequent allocations to fail
    miserably with a message like
    
      yenta_cardbus 0000:15:00.0: device not available because of BAR 7 [100:1ff] collisions
      yenta_cardbus: probe of 0000:15:00.0 failed with error -16
    
    or similar.
    
    This fixes it and clarifies the code a bit too (we used to have to use
    the insane PCI bridge alignment logic that put the alignment in the
    "start" field, this makes it use the slightly easier-to-understand
    size-based alignment, and allows us to set the resource start to zero
    until it gets allocated).
    
    Reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. @rjwysocki @torvalds

    bus_remove_device: be more careful about incomplete initialization

    rjwysocki authored torvalds committed
    Prevent bus_remove_device() from crashing if dev->knode_bus has not been
    initialized before it's called.
    
    This can happen if the device_add() ended up breaking out early due to
    an error, for example.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @rjwysocki @torvalds

    Relax check on adding children of suspended devices

    rjwysocki authored torvalds committed
    Do not refuse to actually register children of suspended devices,
    but still warn about attempts to do that.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Apr 22, 2008
  1. [PATCH] get rid of __exit_files(), __exit_fs() and __put_fs_struct()

    Al Viro authored
    The only reason to have separated __...() for those was to keep them inlined
    for local users in exit.c.  Since Alexey removed the inline on those, there's
    no reason whatsoever to keep them around; just collapse with normal variants.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  2. [PATCH] proc_readfd_common() race fix

    Al Viro authored
    Since we drop the rcu_read_lock inside the loop, we can't assume
    that files->fdt will remain unchanged (and not freed) between
    iterations.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  3. [PATCH] double-free of inode on alloc_file() failure exit in create_w…

    Al Viro authored
    …rite_pipe()
    
    Duh...  Fortunately, the bug is quite recent (post-2.6.25) and, embarrassingly,
    mine ;-/
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  4. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl
      [IA64] run rest drivers/misc/sgi-xp through scripts/Lindent
      [IA64] run some drivers/misc/sgi-xp through scripts/Lindent
      [IA64] move XP and XPC to drivers/misc/sgi-xp
      [IA64] minor irq handler cleanups
      [IA64] simplify notify hooks in mca.c
      [IA64] do notify DIE_MCA_MONARCH_PROCESS for each monarchs
      [IA64] disable interrupts on exit of ia64_trace_syscall
  5. @torvalds

    fs: use loff_t type instead of long long

    David Sterba authored torvalds committed
    Use offset type consistently.
    
    Signed-off-by: David Sterba <dsterba@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

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

    torvalds authored
    …/git/jmorris/selinux-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
      SELinux fixups needed for preemptable RCU from -rt
      SELinux: no BUG_ON(!ss_initialized) in selinux_clone_mnt_opts
  7. [IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl

    Dean Nelson authored Tony Luck committed
    Addressed issues raised by scripts/checkpatch.pl. Removed unnecessary curly
    braces. Eliminated uses of volatiles and use of kernel_thread() and daemonize().
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  8. [IA64] run rest drivers/misc/sgi-xp through scripts/Lindent

    Dean Nelson authored Tony Luck committed
    Ran patches through scripts/Lindent (part 2).
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  9. [IA64] run some drivers/misc/sgi-xp through scripts/Lindent

    Dean Nelson authored Tony Luck committed
    Ran patches through scripts/Lindent (part 1).
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  10. [IA64] move XP and XPC to drivers/misc/sgi-xp

    Dean Nelson authored Tony Luck committed
    Move XPC and XPNET from arch/ia64/sn/kernel to drivers/misc/sgi-xp.
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  11. @torvalds

    Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare…

    torvalds authored
    …-2.6
    
    * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
      i2c: Fix platform driver hotplug/coldplug
      i2c: New driver for the SuperH Mobile I2C bus controller
      i2c/scx200_acb: Don't use 0 as NULL pointer
      i2c-bfin-twi: Fix mismatch in add timer and delete timer
      i2c-bfin-twi: Just let i2c-bfin-twi driver depends on BLACKFIN
      i2c-bfin-twi: Use simpler comment headers and strip out information that is maintained in the scm's log
      i2c-bfin-twi: Cleanup driver descriptions, versions and some module useful information
      i2c-bfin-twi: Add missing pin mux operation
      i2c-bfin-twi: Add platform_resource interface to support multi-port TWI controllers
      i2c-bfin-twi: Add repeat start feature to avoid break of a bundle of i2c master xfer operation
      i2c: Remove trailing whitespaces in busses/Kconfig
      i2c: Replace remaining __FUNCTION__ occurrences
      i2c: Renesas SH7760 I2C master driver
      i2c-dev: Split i2cdev_ioctl
      i2c-ibm_iic: Support building as an of_platform driver
      i2c-ibm_iic: Change the log levels
      i2c: Add platform driver on top of the new pca-algorithm
      i2c-algo-pca: Extend for future drivers
      i2c-algo-pca: Remove trailing whitespaces and unnecessary UTF
      i2c: Remove the algorithm drivers from the config menu
  12. @torvalds

    kernel-doc: fix sched.c missing parameter

    Randy Dunlap authored torvalds committed
    Add missing kernel-doc in kernel/sched.c:
    
    Warning(linux-2.6.25-git3//kernel/sched.c:7044): No description found for parameter 'span'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

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

    torvalds authored
    …/git/teigland/dlm
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
      dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
      dlm: common max length definitions
      dlm: move plock code from gfs2
      dlm: recover nodes that are removed and re-added
      dlm: save master info after failed no-queue request
      dlm: make dlm_print_rsb() static
      dlm: match signedness between dlm_config_info and cluster_set
  14. @torvalds

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

    torvalds authored
    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: Suppress hidinput for Samsung IR control
      HID: remove 60x GTCO devices from blacklist
      HID: export headers properly
      HID: WiseGroup 866 Dual Joypad needs output reports quirk
      HID: ThrustMaster FF driver is no longer experimental
      HID: Logitech diNovo Mini pad support
      HID: fix race between open() and disconnect() in usbhid
      HID: make hid_input_field and usbhid_modify_dquirk static
      HID: pass numbered reports properly to hidraw
      HID: fix misplaced rdesc quirk
      HID: force feedback driver for Logitech Rumblepad 2
      HID: move wait from hid to usbhid
      HID: make function from dbg_hid
      HID: fix sparse warnings
      HID: only dump report traffic with debug level 2
      HID: patch to add NOGET for DMI/Acomdata
      HID: Sunplus Wireless Desktop needs report descriptor fixup
      HID: quirk for MS Wireless Desktop Receiver (model 1028)
      HID: fixup fullspeed interval on highspeed Afatech DVB-T IR kbd
      HID: fix build failure in hiddev_ioctl with gcc 3.2
Something went wrong with that request. Please try again.