Commits on May 28, 2010
  1. @torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon: fix the r100/r200 ums block 0 page fix
    torvalds committed May 28, 2010
  2. @torvalds

    Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/ker…

    …nel/git/lenb/linux-idle-2.6
    
    * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
      intel_idle: native hardware cpuidle driver for latest Intel processors
      ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
      acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING
      sched: clarify commment for TS_POLLING
      ACPI: allow a native cpuidle driver to displace ACPI
      cpuidle: make cpuidle_curr_driver static
      cpuidle: add cpuidle_unregister_driver() error check
      cpuidle: fail to register if !CONFIG_CPU_IDLE
    torvalds committed May 28, 2010
  3. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
      ACPI: Don't let acpi_pad needlessly mark TSC unstable
      drivers/acpi/sleep.h: Checkpatch cleanup
      ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion
      ACPI: delete unused c-state promotion/demotion data strucutures
      ACPI: video: fix acpi_backlight=video
      ACPI: EC: Use kmemdup
      drivers/acpi: use kasprintf
      ACPI, APEI, EINJ injection parameters support
      Add x64 support to debugfs
      ACPI, APEI, Use ERST for persistent storage of MCE
      ACPI, APEI, Error Record Serialization Table (ERST) support
      ACPI, APEI, Generic Hardware Error Source memory error support
      ACPI, APEI, UEFI Common Platform Error Record (CPER) header
      Unified UUID/GUID definition
      ACPI Hardware Error Device (PNP0C33) support
      ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup
      ACPI, APEI, Document for APEI
      ACPI, APEI, EINJ support
      ACPI, APEI, HEST table parsing
      ACPI, APEI, APEI supporting infrastructure
      ...
    torvalds committed May 28, 2010
  4. drm/radeon: fix the r100/r200 ums block 0 page fix

    airlied -> brown paper bag.
    
    I blame Hi-5 or the Wiggles for lowering my IQ, move the fix inside some
    brackets instead of breaking everything in site.
    
    Cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed May 29, 2010
  5. @lenb
  6. @lenb
  7. @lenb
  8. @lenb
  9. @lenb
  10. @lenb

    ACPI: Don't let acpi_pad needlessly mark TSC unstable

    acpi pad driver kind of aggressively marks TSC as unstable at init
    time, on mwait capable and non X86_FEATURE_NONSTOP_TSC systems. This is
    irrespective of whether pad driver is ever going to be used on the
    system or deep C-states are supported/used. This will affect every user
    who just happens to compile in (or get a kernel version which
    compiles in) acpi pad driver.
    
    Move mark_tsc_unstable() out of init to the actual idle invocation path
    of the pad driver.
    
    There is also another bug/missing_feature in the code that it does not
    support 'always running apic timer' and switches to broadcast mode
    unconditionally. Shaohua, can you take a look at that please.
    
    Signed-off-by: Venkatesh Pallipadi <venki@google.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Venkatesh Pallipadi committed with lenb May 18, 2010
  11. @Gelma @lenb

    drivers/acpi/sleep.h: Checkpatch cleanup

    drivers/acpi/sleep.h:3: WARNING: space prohibited between function name and open parenthesis '('
    
    Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Gelma committed with lenb Feb 27, 2010
  12. @lenb

    ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion

    acpi_enter_[simple,bm] does
    idle timing in ns, convert it to timeval, then to us, then to
    pmtimer_ticks and then back to ns.
    
    This patch changes things to
    idle timing in ns, convert it to us, and then to pmtimer_ticks.
    
    Just saves an imul along this path, but makes the code cleaner.
    
    Signed-off-by: Venkatesh Pallipadi <venki@google.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Venkatesh Pallipadi committed with lenb Apr 22, 2010
  13. @lenb

    intel_idle: native hardware cpuidle driver for latest Intel processors

    This EXPERIMENTAL driver supersedes acpi_idle on
    Intel Atom Processors, Intel Core i3/i5/i7 Processors
    and associated Intel Xeon processors.
    
    It does not support the Intel Core2 processor or earlier.
    
    For kernels configured with ACPI, CONFIG_INTEL_IDLE=y
    allows intel_idle to probe before the ACPI processor driver.
    Booting with "intel_idle.max_cstate=0" disables intel_idle
    and the system will fall back on ACPI's "acpi_idle".
    
    Typical Linux distributions load ACPI processor module early,
    making CONFIG_INTEL_IDLE=m not easily useful on ACPI platforms.
    
    intel_idle probes all processors at module_init time.
    Processors that are hot-added later will be limited
    to using C1 in idle.
    
    Signed-off-by: Len Brown <len.brown@intel.com>
    lenb committed Mar 8, 2010
  14. @lenb

    ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case

    commit d306ebc
    (ACPI: Be in TS_POLLING state during mwait based C-state entry)
    fixed an important power & performance issue where ACPI c2 and c3 C-states
    were clearing TS_POLLING even when using MWAIT (ACPI_STATE_FFH).
    That bug had been causing us to receive redundant scheduling interrups
    when we had already been woken up by MONITOR/MWAIT.
    
    Following up on that...
    
    In the MWAIT case, we don't have to subsequently
    check need_resched(), as that c heck was there
    for the TS_POLLING-clearing case.
    
    Note that not only does the cpuidle calling function
    already check need_resched() before calling us, the
    low-level entry into monitor/mwait calls it twice --
    guaranteeing that a write to the trigger address
    can not go un-noticed.
    
    Also, in this case, we don't have to set TS_POLLING
    when we wake, because we never cleared it.
    
    Signed-off-by: Len Brown <len.brown@intel.com>
    Acked-by: Venkatesh Pallipadi <venki@google.com>
    lenb committed May 24, 2010
  15. @torvalds

    Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
      leds: Fix leds-gpio openfirmware compile issue
      leds: Kconfig fixes
    torvalds committed May 28, 2010
  16. @torvalds

    tracing: fix for tracepoint API change

    Commit 38516ab ("tracing: Let
    tracepoints have data passed to tracepoint callbacks") requires this
    fixup to the powerpc code.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Stephen Rothwell committed with torvalds May 28, 2010
  17. @torvalds

    Merge branch 'for-linus/2635-updates' of git://git.fluff.org/bjdooks/…

    …linux
    
    * 'for-linus/2635-updates' of git://git.fluff.org/bjdooks/linux:
      ARM: S5PV210: serial: Fix section mismatch warning
      ARM: s3c2410_defconfig: Add new machines
      ARM: s3c6400_defconfig: Add framebuffer and basic LCD
      ARM: s3c6400_defconfig: Add RTC driver support
      ARM: s3c6400_defconfig: Enable USB host side
      ARM: s3c6400_defconfig: Add SPI driver
      ARM: s3c6400_defconfig: Update compiled machines
      ARM: S5P: Regoster clk_xusbxti clock for hsotg driver
      ARM: S3C64XX: Add USB OTG HCLK to the list of clocks
      ARM: SAMSUNG: gpio-cfg.h: update documentation
      ARM: SAMSUNG: Documentation: add documentation on GPIO code
      ARM: SAMSUNG: Fix documentation for s3c_gpio_cfgpin()
      ARM: S3C24XX: Documentation: add section on gpiolib changes
      ARM: S3C24XX: Documentation: update GPIO documentation
      ARM: S3C24XX: Documentation: update documentation overview
      ARM: SAMSUNG: Documentation: update directory layout
      ARM: SAMSUNG: Documentation: update the list of SoCs supported
    torvalds committed May 28, 2010
  18. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (22 commits)
      netlink: bug fix: wrong size was calculated for vfinfo list blob
      netlink: bug fix: don't overrun skbs on vf_port dump
      xt_tee: use skb_dst_drop()
      netdev/fec: fix ifconfig eth0 down hang issue
      cnic: Fix context memory init. on 5709.
      drivers/net: Eliminate a NULL pointer dereference
      drivers/net/hamradio: Eliminate a NULL pointer dereference
      be2net: Patch removes redundant while statement in loop.
      ipv6: Add GSO support on forwarding path
      net: fix __neigh_event_send()
      vhost: fix the memory leak which will happen when memory_access_ok fails
      vhost-net: fix to check the return value of copy_to/from_user() correctly
      vhost: fix to check the return value of copy_to/from_user() correctly
      vhost: Fix host panic if ioctl called with wrong index
      net: fix lock_sock_bh/unlock_sock_bh
      net/iucv: Add missing spin_unlock
      net: ll_temac: fix checksum offload logic
      net: ll_temac: fix interrupt bug when interrupt 0 is used
      sctp: dubious bitfields in sctp_transport
      ipmr: off by one in __ipmr_fill_mroute()
      ...
    torvalds committed May 28, 2010
  19. @torvalds

    FRV: ARCH_KMALLOC_MINALIGN was already defined

    ARCH_KMALLOC_MINALIGN was already defined in asm/mem-layout.h and so shouldn't
    have been added to asm/cache.h as well, but rather altered in place.
    
    The commit that added it to asm/cache.h was:
    
    	commit 69dcf3d
    	Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    	Date:   Mon May 24 14:32:54 2010 -0700
    
    	    frv: set ARCH_KMALLOC_MINALIGN
    
    	    Architectures that handle DMA-non-coherent memory need to set
    	    ARCH_KMALLOC_MINALIGN to make sure that kmalloc'ed buffer is
    	    DMA-safe: the buffer doesn't share a cache with the others.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds May 28, 2010
  20. @torvalds

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm…

    …/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      posix_timer: Fix error path in timer_create
      hrtimer: Avoid double seqlock
      timers: Move local variable into else section
      timers: Fix slack calculation really
    torvalds committed May 28, 2010
  21. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      remove detritus left by "mm: make read_cache_page synchronous"
      fix fs/sysv s_dirt handling
      fat: convert to use the new truncate convention.
      ext2: convert to use the new truncate convention.
      tmpfs: convert to use the new truncate convention
      fs: convert simple fs to new truncate
      kill spurious reference to vmtruncate
      fs: introduce new truncate sequence
      fs/super: fix kernel-doc warning
      fs/minix: bugfix, number of indirect block ptrs per block depends on block size
      rename the generic fsync implementations
      drop unused dentry argument to ->fsync
      fs: Add missing mutex_unlock
      Fix racy use of anon_inode_getfd() in perf_event.c
      get rid of the magic around f_count in aio
      VFS: fix recent breakage of FS_REVAL_DOT
      Revert "anon_inode: set S_IFREG on the anon_inode"
    torvalds committed May 28, 2010
  22. remove detritus left by "mm: make read_cache_page synchronous"

    gets minix get_dir_page() in sync with its analogs; back in 2007
    Nick has switched read_cache_page() and friends to sync behaviour
    (i.e.  they wait for the page to get unlocked, check if it's uptodate
    and if it isn't return ERR_PTR(-EIO) instead) and removed the
    duplicate logics from the callers.  In case of fs/minix/dir.c he'd
    removed only half of that...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Al Viro committed May 28, 2010
  23. @davem330

    netlink: bug fix: wrong size was calculated for vfinfo list blob

    The wrong size was being calculated for vfinfo.  In one case, it was over-
    calculating using nlmsg_total_size on attrs, in another case, it was
    under-calculating by assuming ifla_vf_* structs are packed together, but
    each struct is it's own attr w/ hdr (and padding).
    
    Signed-off-by: Scott Feldman <scofeldm@cisco.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Scott Feldman committed with davem330 May 28, 2010
  24. @davem330

    netlink: bug fix: don't overrun skbs on vf_port dump

    Noticed by Patrick McHardy: was continuing to fill skb after a
    nla_put_failure, ignoring the size calculated by upper layer.  Now,
    return -EMSGSIZE on any overruns, but also allow netdev to
    fail ndo_get_vf_port with error other than -EMSGSIZE, thus unwinding
    nest.
    
    Signed-off-by: Scott Feldman <scofeldm@cisco.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Scott Feldman committed with davem330 May 28, 2010
  25. @davem330

    xt_tee: use skb_dst_drop()

    After commit 7fee226 (net: add a noref bit on skb dst), its wrong to
    use : dst_release(skb_dst(skb)), since we could decrement a refcount
    while skb dst was not refcounted.
    
    We should use skb_dst_drop(skb) instead.
    
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet committed with davem330 May 28, 2010
  26. @davem330

    netdev/fec: fix ifconfig eth0 down hang issue

    BugLink: http://bugs.launchpad.net/bugs/559065
    
    In fec open/close function, we need to use phy_connect and phy_disconnect
    operation before we start/stop phy. Otherwise it will cause system hang.
    
    Only call fec_enet_mii_probe() in open function, because the first open
    action will cause NULL pointer error.
    
    Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Bryan Wu committed with davem330 May 28, 2010
  27. ARM: S5PV210: serial: Fix section mismatch warning

    Rename the structure to avoid the following warning:
    
    WARNING: drivers/serial/built-in.o(.data+0x534): Section mismatch in reference from the variable s5p_serial_drv to the function .devexit.text:s3c24xx_serial_remove()
    The variable s5p_serial_drv references
    the function __devexit s3c24xx_serial_remove()
    If the reference is valid then annotate the
    variable with __exit* (see linux/init.h) or name the variable:
    *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,
    
    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Marek Szyprowski committed with Ben Dooks May 28, 2010
  28. ARM: Merge for-2635/defconfig3

    Merge branch 'for-2635/defconfig3' into for-linus/2635-updates
    Ben Dooks committed May 28, 2010
  29. ARM: s3c2410_defconfig: Add new machines

    Add the SMDK2416, and the GTA02 to the list of machines
    that are included in the s3c2410_defconfig.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 28, 2010
  30. ARM: s3c6400_defconfig: Add framebuffer and basic LCD

    Add the framebuffer driver and some basic LCD configurations
    that should be suitable for the SMDK boards.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 28, 2010
  31. ARM: s3c6400_defconfig: Add RTC driver support

    Now that the RTC driver supports the S3C64XX, enable
    it in the build.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 28, 2010
  32. ARM: s3c6400_defconfig: Enable USB host side

    Enable the USB Host side by adding the USB OHCI and
    some basic USB driver modules.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 28, 2010
  33. ARM: s3c6400_defconfig: Add SPI driver

    The SPI driver was added last kernel round, so enable
    the core SPI and add the 64XX and bitbang driver as
    modules.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 28, 2010
  34. ARM: s3c6400_defconfig: Update compiled machines

    Add the machines that have been added in the last round
    to the list of builds.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed May 28, 2010
  35. @omas-ab

    ARM: S5P: Regoster clk_xusbxti clock for hsotg driver

    The clk_xusbxti clock is added to the list of clocks to be
    registred during boot time clock registration.
    
    Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
    Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
    [ben-linux@fluff.org: edited title]
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    omas-ab committed with Ben Dooks May 28, 2010