28 Oct, 2010

35 commits


27 Oct, 2010

5 commits

  • usbfs_get_inode() is something completely different...

    Bogosity introduced by commit 85fe4025c616 ("fs: do not assign default
    i_ino in new_inode").

    Signed-off-by: Al Viro
    Cc: Christoph Hellwig
    Signed-off-by: Linus Torvalds

    Al Viro
     
  • * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (476 commits)
    vmwgfx: Implement a proper GMR eviction mechanism
    drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2
    drm/radeon/kms: properly compute group_size on 6xx/7xx
    drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker
    drm/radeon/kms/evergreen: set the clear state to the blit state
    drm/radeon/kms: don't poll dac load detect.
    gpu: Add Intel GMA500(Poulsbo) Stub Driver
    drm/radeon/kms: MC vram map needs to be >= pci aperture size
    drm/radeon/kms: implement display watermark support for evergreen
    drm/radeon/kms/evergreen: add some additional safe regs v2
    drm/radeon/r600: fix tiling issues in CS checker.
    drm/i915: Move gpu_write_list to per-ring
    drm/i915: Invalidate the to-ring, flush the old-ring when updating domains
    drm/i915/ringbuffer: Write the value passed in to the tail register
    agp/intel: Restore valid PTE bit for Sandybridge after bdd3072
    drm/i915: Fix flushing regression from 9af90d19f
    drm/i915/sdvo: Remove unused encoding member
    i915: enable AVI infoframe for intel_hdmi.c [v4]
    drm/i915: Fix current fb blocking for page flip
    drm/i915: IS_IRONLAKE is synonymous with gen == 5
    ...

    Fix up conflicts in
    - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the
    new simplified stack-based kmap_atomic() interface
    - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL
    removal cleanups.

    Linus Torvalds
     
  • …scm/linux/kernel/git/jeremy/xen

    * 'upstream/xenfs' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
    xen/privcmd: make privcmd visible in domU
    xen/privcmd: move remap_domain_mfn_range() to core xen code and export.
    privcmd: MMAPBATCH: Fix error handling/reporting
    xenbus: export xen_store_interface for xenfs
    xen/privcmd: make sure vma is ours before doing anything to it
    xen/privcmd: print SIGBUS faults
    xen/xenfs: set_page_dirty is supposed to return true if it dirties
    xen/privcmd: create address space to allow writable mmaps
    xen: add privcmd driver
    xen: add variable hypercall caller
    xen: add xen_set_domain_pte()
    xen: add /proc/xen/xsd_{kva,port} to xenfs

    * 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (29 commits)
    xen: include xen/xen.h for definition of xen_initial_domain()
    xen: use host E820 map for dom0
    xen: correctly rebuild mfn list list after migration.
    xen: improvements to VIRQ_DEBUG output
    xen: set up IRQ before binding virq to evtchn
    xen: ensure that all event channels start off bound to VCPU 0
    xen/hvc: only notify if we actually sent something
    xen: don't add extra_pages for RAM after mem_end
    xen: add support for PAT
    xen: make sure xen_max_p2m_pfn is up to date
    xen: limit extra memory to a certain ratio of base
    xen: add extra pages for E820 RAM regions, even if beyond mem_end
    xen: make sure xen_extra_mem_start is beyond all non-RAM e820
    xen: implement "extra" memory to reserve space for pages not present at boot
    xen: Use host-provided E820 map
    xen: don't map missing memory
    xen: defer building p2m mfn structures until kernel is mapped
    xen: add return value to set_phys_to_machine()
    xen: convert p2m to a 3 level tree
    xen: make install_p2mtop_page() static
    ...

    Fix up trivial conflict in arch/x86/xen/mmu.c, and fix the use of
    'reserve_early()' - in the new memblock world order it is now
    'memblock_x86_reserve_range()' instead. Pointed out by Jeremy.

    Linus Torvalds
     
  • Use Ben's new range manager hooks to implement a manager for
    GMRs that manages ids rather than ranges.
    This means we can use the standard TTM code for binding, unbinding and
    eviction.

    Signed-off-by: Thomas Hellstrom
    Signed-off-by: Dave Airlie

    Thomas Hellstrom
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (52 commits)
    split invalidate_inodes()
    fs: skip I_FREEING inodes in writeback_sb_inodes
    fs: fold invalidate_list into invalidate_inodes
    fs: do not drop inode_lock in dispose_list
    fs: inode split IO and LRU lists
    fs: switch bdev inode bdi's correctly
    fs: fix buffer invalidation in invalidate_list
    fsnotify: use dget_parent
    smbfs: use dget_parent
    exportfs: use dget_parent
    fs: use RCU read side protection in d_validate
    fs: clean up dentry lru modification
    fs: split __shrink_dcache_sb
    fs: improve DCACHE_REFERENCED usage
    fs: use percpu counter for nr_dentry and nr_dentry_unused
    fs: simplify __d_free
    fs: take dcache_lock inside __d_path
    fs: do not assign default i_ino in new_inode
    fs: introduce a per-cpu last_ino allocator
    new helper: ihold()
    ...

    Linus Torvalds