1. 22 9月, 2009 34 次提交
  2. 21 9月, 2009 6 次提交
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 33e6c1a0
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: fix debugging dump
        UBIFS: improve lprops dump
        UBIFS: various minor commentary fixes
        UBIFS: improve journal head debugging prints
        UBIFS: define journal head numbers in ubifs-media.h
        UBIFS: amend commentaries
        UBIFS: check ubifs_scan error codes better
        UBIFS: do not print scary error messages needlessly
        UBIFS: add inode size debugging check
        UBIFS: constify file and inode operations
        UBIFS: remove unneeded call from ubifs_sync_fs
        UBIFS: kill BKL
        UBIFS: remove unused functions
        UBIFS: suppress compilation warning
      33e6c1a0
    • L
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · 0b887ef1
      Linus Torvalds 提交于
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: improve NOR flash erasure quirk
        UBI: introduce flash dump helper
        UBI: eliminate possible undefined behaviour
        UBI: print a warning if too many PEBs are corrupted
        UBI: amend NOR flash pre-erase quirk
        UBI: print a message if ECH is corrupted and VIDH is ok
      0b887ef1
    • L
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 44040f10
      Linus Torvalds 提交于
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
        drm/vgaarb: add VGA arbitration support to the drm and kms.
        drm/radeon: some r420s have a CP race with the DMA engine.
        drm/radeon/r600/kms: rv670 is not DCE3
        drm/radeon/kms: r420 idle after programming GA_ENHANCE
        drm/radeon/kms: more fixes to rv770 suspend/resume path.
        drm/radeon/kms: more alignment for rv770.c with r600.c
        drm/radeon/kms: rv770 blit init called too late.
        drm/radeon/kms: move around new init path code to avoid posting at init
        drm/radeon/r600: fix some issues with suspend/resume.
        drm/radeon/kms: disable VGA rendering engine before taking over VRAM
        drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
        drm/radeon/kms: add initial connector properties
        drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
        drm/radeon/kms: don't fail if we fail to init GPU acceleration
        drm/r600/kms: fixup number of loops per blit calculation.
        drm/radeon/kms: reprogram format in set base.
        drm/radeon: avivo chips have no separate int bit for display
        drm/radeon/r600: don't do interrupts
        drm: fix _DRM_GEM addmap error message
        drm: update crtc x/y when only fb changes
        ...
      
      Fixed up trivial conflicts in firmware/Makefile due to network driver
      (cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
      other.
      44040f10
    • I
      Driver-Core: fix devnode callbacks for dabusb and industrialio · 388dba30
      Ingo Molnar 提交于
      The build of the dabusb driver broke:
      
        drivers/media/video/dabusb.c:758: error: unknown field 'nodename' specified in initializer
        drivers/media/video/dabusb.c:758: warning: initialization from incompatible pointer type
        make[3]: *** wait: No child processes.  Stop.
      
      Due to this commit:
      
        e454cea2: Driver-Core: extend devnode callbacks to provide permissions
      
      Missing the dabusb driver's dabusb_nodename() callback.
      
      Similar issues with the iio/industrialio driver in staging, pointed out
      and patched by Jean Delvare.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      Industrialio-parts-by: NJean Delvare <khali@linux-fr.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      388dba30
    • J
      nfs: initialize the backing_dev_info when creating the server · 48d07649
      Jens Axboe 提交于
      NFS may free the server structure without ever having used the
      bdi, so we either need to flag the bdi as being uninitialized or
      initialize it up front. This does the latter.
      
      This fixes a crash with mounting more than one NFS file system,
      should people ever need that kind of obscure NFS functionality.
      Tested-by: NPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      48d07649
    • J
      writeback: make balance_dirty_pages() gradually back more off · 87c6a9b2
      Jens Axboe 提交于
      Currently it just sleeps for a very short time, just 1 jiffy. If
      we keep looping in there, continually delay for a little longer
      of up to 100msec in total. That was the old limit for congestion
      wait.
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      87c6a9b2