1. 26 7月, 2010 7 次提交
  2. 26 5月, 2010 24 次提交
  3. 25 5月, 2010 9 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes · f16a5e34
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
        GFS2: Fix permissions checking for setflags ioctl()
        GFS2: Don't "get" xattrs for ACLs when ACLs are turned off
        GFS2: Rework reclaiming unlinked dinodes
      f16a5e34
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 110b9384
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: Ensure inode allocation buffers are fully replayed
        xfs: enable background pushing of the CIL
        xfs: forced unmounts need to push the CIL
        xfs: Introduce delayed logging core code
        xfs: Delayed logging design documentation
        xfs: Improve scalability of busy extent tracking
        xfs: make the log ticket ID available outside the log infrastructure
        xfs: clean up log ticket overrun debug output
        xfs: Clean up XFS_BLI_* flag namespace
        xfs: modify buffer item reference counting
        xfs: allow log ticket allocation to take allocation flags
        xfs: Don't reuse the same transaction ID for duplicated transactions.
      110b9384
    • L
      Merge git://git.infradead.org/battery-2.6 · 4961ab93
      Linus Torvalds 提交于
      * git://git.infradead.org/battery-2.6:
        power_supply: Fix regression for 'type' property
      4961ab93
    • F
      ath9k: remove VEOL support for ad-hoc · a65e4cb4
      Felix Fietkau 提交于
      With VEOL, Beacon transmission in ad-hoc does not currently work.
      I believe for larger ad-hoc networks, VEOL is too unreliable, as
      it can get beacon transmissions stuck during synchronization.
      Use SWBA based beacon trasmission similar to AP mode instead.
      Signed-off-by: NFelix Fietkau <nbd@openwrt.org>
      Acked-by: NBenoit Papillault <benoit.papillault@free.fr>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      a65e4cb4
    • F
      ath9k: change beacon allocation to prefer the first beacon slot · 774610e4
      Felix Fietkau 提交于
      This fixes IBSS beacon transmissions without VEOL enabled
      Signed-off-by: NFelix Fietkau <nbd@openwrt.org>
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      774610e4
    • H
      auxdisplay: section cleanup in cfag12864bfb driver · bf87eae9
      Henrik Kretzschmar 提交于
      This fixes a two section mismatches and makes remove() __devexit.
      Signed-off-by: NHenrik Kretzschmar <henne@nachtwindheim.de>
      Cc: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bf87eae9
    • D
      nuc900fb: release correct mem region · a42dcb88
      Dan Carpenter 提交于
      We should be releasing "res->start" here.
      Signed-off-by: NDan Carpenter <error27@gmail.com>
      Acked-by: NWan ZongShun <mcuos.com@gmail.com>
      Cc: Wang Qiang <rurality.linux@gmail.com>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a42dcb88
    • A
      fb_defio: fix for non-dirty ptes · 49bbd815
      Albert Herranz 提交于
      Fix a problem observed while using fb_defio with a short delay on a
      PowerPC platform.
      
      It is possible that page_mkclean() is invoked in the deferred io work
      function _before_ a PTE has been marked dirty.  In this case, the page is
      removed from the defio pagelist but page_mkclean() does not write-protect
      the page again.  The end result is that defio ignores all subsequent
      writes to the page and the corresponding portions of the framebuffer never
      get updated.
      
      The fix consists in keeping track of the pages with non-dirty PTEs,
      re-checking them again on the next deferred io work iteration.  Note that
      those pages are not passed to the defio callback as they are not written
      by userspace yet.
      Signed-off-by: NAlbert Herranz <albert_herranz@yahoo.es>
      Acked-by: NJaya Kumar <jayakumar.lkml@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      49bbd815
    • H
      sgivwfb: fix sections · 0d5b0264
      Henrik Kretzschmar 提交于
      Since the drivers probe call was changed from .init.text to .devinit.text
      in commit c2e13037 ("platform-drivers:
      move probe to .devinit.text in drivers/video") the fb_fix_screeninfo and
      fb_var_screeninfo structures must be changed from .init.data to
      .devinit.data, too.
      
      Also the drivers remove routine should be moved from .text to .devexit.text
      
      It removes these 7 section mismatch warnings from modpost:
      
      WARNING: vmlinux.o(.devinit.text+0x1e28): Section mismatch in reference from the function sgivwfb_probe() to the variable .init.data:sgivwfb_fix
      The function __devinit sgivwfb_probe() references
      a variable __initdata sgivwfb_fix.
      If sgivwfb_fix is only used by sgivwfb_probe then
      annotate sgivwfb_fix with a matching annotation.
      
      WARNING: vmlinux.o(.devinit.text+0x1e50): Section mismatch in reference from the function sgivwfb_probe() to the (unknown reference) .init.data:(unknown)
      The function __devinit sgivwfb_probe() references
      a (unknown reference) __initdata (unknown).
      If (unknown) is only used by sgivwfb_probe then
      annotate (unknown) with a matching annotation.
      
      WARNING: vmlinux.o(.devinit.text+0x1e59): Section mismatch in reference from the function sgivwfb_probe() to the (unknown reference) .init.data:(unknown)
      The function __devinit sgivwfb_probe() references
      a (unknown reference) __initdata (unknown).
      If (unknown) is only used by sgivwfb_probe then
      annotate (unknown) with a matching annotation.
      
      WARNING: vmlinux.o(.devinit.text+0x1e60): Section mismatch in reference from the function sgivwfb_probe() to the variable .init.data:sgivwfb_fix
      The function __devinit sgivwfb_probe() references
      a variable __initdata sgivwfb_fix.
      If sgivwfb_fix is only used by sgivwfb_probe then
      annotate sgivwfb_fix with a matching annotation.
      
      WARNING: vmlinux.o(.devinit.text+0x1e6a): Section mismatch in reference from the function sgivwfb_probe() to the (unknown reference) .init.data:(unknown)
      The function __devinit sgivwfb_probe() references
      a (unknown reference) __initdata (unknown).
      If (unknown) is only used by sgivwfb_probe then
      annotate (unknown) with a matching annotation.
      
      WARNING: vmlinux.o(.devinit.text+0x1e7f): Section mismatch in reference from the function sgivwfb_probe() to the variable .init.data:sgivwfb_var1600sw
      The function __devinit sgivwfb_probe() references
      a variable __initdata sgivwfb_var1600sw.
      If sgivwfb_var1600sw is only used by sgivwfb_probe then
      annotate sgivwfb_var1600sw with a matching annotation.
      
      WARNING: vmlinux.o(.devinit.text+0x1e91): Section mismatch in reference from the function sgivwfb_probe() to the variable .init.data:sgivwfb_var
      The function __devinit sgivwfb_probe() references
      a variable __initdata sgivwfb_var.
      If sgivwfb_var is only used by sgivwfb_probe then
      annotate sgivwfb_var with a matching annotation.
      Signed-off-by: NHenrik Kretzschmar <henne@nachtwindheim.de>
      Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0d5b0264