1. 15 Dec, 2009 34 commits
  2. 14 Dec, 2009 6 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 54430407
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-core: i2c bus should support PM entries in struct dev_pm_ops
        i2c: Get rid of I2C_CLIENT_MODULE_PARM
        i2c: Drop I2C_CLIENT_INSMOD_2 to 8
        i2c: Drop I2C_CLIENT_INSMOD_1
        i2c: Get rid of struct i2c_client_address_data
        i2c: Drop the kind parameter from detect callbacks
      54430407
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 3ea6b3d0
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        udf: Avoid IO in udf_clear_inode
        udf: Try harder when looking for VAT inode
        udf: Fix compilation with UDFFS_DEBUG enabled
      3ea6b3d0
    • Jan Kara's avatar
      udf: Avoid IO in udf_clear_inode · 2c948b3f
      Jan Kara authored
      It is not very good to do IO in udf_clear_inode. First, VFS does not really
      expect inode to become dirty there and thus we have to write it ourselves,
      second, memory reclaim gets blocked waiting for IO when it does not really
      expect it, third, the IO pattern (e.g. on umount) resulting from writes in
      udf_clear_inode is bad and it slows down writing a lot.
      
      The reason why UDF needed to do IO in udf_clear_inode is that UDF standard
      mandates extent length to exactly match inode size. But when we allocate
      extents to a file or directory, we don't really know what exactly the final
      file size will be and thus temporarily set it to block boundary and later
      truncate it to exact length in udf_clear_inode. Now, this is changed to
      truncate to final file size in udf_release_file for regular files. For
      directories and symlinks, we do the truncation at the moment when learn
      what the final file size will be.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      2c948b3f
    • Jan Kara's avatar
      udf: Try harder when looking for VAT inode · e971b0b9
      Jan Kara authored
      Some disks do not contain VAT inode in the last recorded block as required
      by the standard but a few blocks earlier (or the number of recorded blocks
      is wrong). So look for the VAT inode a bit before the end of the media.
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      e971b0b9
    • Jan Kara's avatar
      udf: Fix compilation with UDFFS_DEBUG enabled · 1fefd086
      Jan Kara authored
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      1fefd086
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · 75b08038
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, mce: Clean up thermal init by introducing intel_thermal_supported()
        x86, mce: Thermal monitoring depends on APIC being enabled
        x86: Gart: fix breakage due to IOMMU initialization cleanup
        x86: Move swiotlb initialization before dma32_free_bootmem
        x86: Fix build warning in arch/x86/mm/mmio-mod.c
        x86: Remove usedac in feature-removal-schedule.txt
        x86: Fix duplicated UV BAU interrupt vector
        nvram: Fix write beyond end condition; prove to gcc copy is safe
        mm: Adjust do_pages_stat() so gcc can see copy_from_user() is safe
        x86: Limit the number of processor bootup messages
        x86: Remove enabling x2apic message for every CPU
        doc: Add documentation for bootloader_{type,version}
        x86, msr: Add support for non-contiguous cpumasks
        x86: Use find_e820() instead of hard coded trampoline address
        x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks
      
      Trivial percpu-naming-introduced conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c
      75b08038