1. 24 Apr, 2008 38 commits
  2. 23 Apr, 2008 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 94bc891b
      Linus Torvalds authored
      * '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
      94bc891b
    • Linus Torvalds's avatar
      Fix cardbus resource allocation · 934b7024
      Linus Torvalds authored
      Commit 88452565 ("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: default avatarJeff Chua <jeff.chua.linux@gmail.com>
      Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
      Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      934b7024