Permalink
Commits on Mar 14, 2010
  1. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y
    torvalds committed Mar 14, 2010
  2. Add include to i2c-xii.c to fix build error

    drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: "Richard Röjfors" <richard.rojfors@pelagicore.com>
    Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
    Cc: linux-i2c@vger.kernel.org
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Randy Dunlap committed with torvalds Feb 4, 2010
  3. Add the platform data include for the Xilinx XPS IIC Bus Interface

    This file was missed in the original patch that went into Linus' tree.
    
    Cc: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
    Cc: linux-i2c@vger.kernel.org
    Signed-off-by: Richard Röjfors <richard.rojfors@pelagicore.com>
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Richard Röjfors committed with torvalds Mar 9, 2010
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table
      Input: ALPS - fix stuck buttons on some touchpads
      Input: wm831x-on - convert to use genirq
      Input: ads7846 - add wakeup support
      Input: appletouch - fix integer overflow issue
      Input: ad7877 - increase pen up imeout
      Input: ads7846 - add support for AD7843 parts
      Input: bf54x-keys - fix system hang when pressing a key
      Input: alps - add support for the touchpad on Toshiba Tecra A11-11L
      Input: remove BKL, fix input_open_file() locking
      Input: serio_raw - remove BKL
      Input: mousedev - remove BKL
      Input: add driver for TWL4030 vibrator device
      Input: enable remote wakeup for PNP i8042 keyboard ports
      Input: scancode in get/set_keycodes should be unsigned
      Input: i8042 - use platfrom_create_bundle() helper
      Input: wacom - merge out and in prox events
      Input: gamecon - fix off by one range check
      Input: wacom - replace WACOM_PKGLEN_PENABLED
    torvalds committed Mar 14, 2010
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: remove whitespaces before quoted newlines
      nilfs2: remove spaces before tabs
      nilfs2: fix various typos in comments
      nilfs2: fix typo "cout" -> "count" in error message
      nilfs2: fix function name typos in docbook comments
      nilfs2: fix discrepancy in use of static specifier
    torvalds committed Mar 14, 2010
  6. Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/jdelvare/staging
    
    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
      i2c-algo-bit: Add pre- and post-xfer hooks
      at24: Init dynamic bin_attribute structures
      i2c: Drop configure option I2C_DEBUG_CHIP
      tsl2550: Move from i2c/chips to misc
      i2c-i801: Don't use the block buffer for I2C block writes
      i2c-powermac: Be less verbose in the absence of real errors.
      i2c-smbus: Use device_lock/device_unlock
    torvalds committed Mar 14, 2010
  7. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ericvh/v9fs
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
      9p: Skip check for mandatory locks when unlocking
      9p: Fixes a simple bug enabling writes beyond 2GB.
      9p: Change the name of new protocol from 9p2010.L to 9p2000.L
      fs/9p: re-init the wstat in readdir loop
      net/9p: Add sysfs mount_tag file for virtio 9P device
      net/9p: Use the tag name in the config space for identifying mount point
    torvalds committed Mar 14, 2010
  8. x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_…

    …INTEL=y
    
    Commit f56e8a0 "x86/mce: Fix RCU lockdep splats" introduced the
    following build bug:
    
      arch/x86/kernel/cpu/mcheck/mce.c: In function 'mce_log':
      arch/x86/kernel/cpu/mcheck/mce.c:166: error: 'mce_read_mutex' undeclared (first use in this function)
      arch/x86/kernel/cpu/mcheck/mce.c:166: error: (Each undeclared identifier is reported only once
      arch/x86/kernel/cpu/mcheck/mce.c:166: error: for each function it appears in.)
    
    Move the in-the-middle-of-file lock variable up to the variable
    definition section, the top of the .c file.
    
    Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: x86@kernel.org
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Mar 14, 2010
  9. Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table

    ALDI/MEDION netbook E1222 needs to be in the reset quirk list for
    its touchpad's proper function.
    
    Reported-by: Michael Fischer <mifi@gmx.de>
    Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
    Cc: stable@kernel.org
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    ch-f committed with dtor Mar 14, 2010
  10. Input: ALPS - fix stuck buttons on some touchpads

    Enable button release event redirection to the device that got the
    button press not only for touchpads with interleaved protocols, but
    unconditionally for all Alps touchpads. This is required at least
    for the touchpads in Dell Inspiron 8200 and Latitude d630.
    
    Signed-off-by: Martin Buck <mb-tmp-yvahk-vachg@gromit.dyndns.org>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Martin Buck committed with dtor Mar 14, 2010
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Add very basic XVR-1000 framebuffer driver.
      qlogicpti: Remove slash in QlogicPTI irq name
    torvalds committed Mar 14, 2010
  12. nilfs2: remove whitespaces before quoted newlines

    This kills the following checkpatch warnings:
    
     WARNING: unnecessary whitespace before a quoted newline
     #869: FILE: super.c:869:
     +     	           "remount to a different snapshot. \n",
    
     WARNING: unnecessary whitespace before a quoted newline
     #389: FILE: the_nilfs.c:389:
     +     	    printk(KERN_ERR "NILFS: too short segment. \n");
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    konis committed Mar 13, 2010
  13. nilfs2: remove spaces before tabs

    This kills the following checkpatch warnings:
    
     WARNING: please, no space before tabs
     #74: FILE: segment.h:74:
     +^Iunsigned ^I^Iflags;$
    
     WARNING: please, no space before tabs
     #35: FILE: segbuf.c:35:
     +^Iint ^I^I^Istart, end; /* The region to be submitted */$
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    konis committed Mar 13, 2010
  14. nilfs2: fix various typos in comments

    This fixes various typos I found in comments of nilfs2.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    konis committed Mar 13, 2010
  15. nilfs2: fix typo "cout" -> "count" in error message

    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    konis committed Mar 13, 2010
  16. nilfs2: fix function name typos in docbook comments

    Fixes the following typos in docbook comments:
    
     nilfs_detroy_transaction_cache -> nilfs_destroy_transaction_cache
     nilfs_secgtor_start_timer -> nilfs_segctor_start_timer
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    konis committed Mar 13, 2010
  17. nilfs2: fix discrepancy in use of static specifier

    Two segbuf functions, nilfs_segbuf_write and nilfs_segbuf_wait, are
    declared with the static storage class specifier, but their
    implementations are not.
    
    This fixes the discrepancy.
    
    Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
    konis committed Mar 13, 2010
  18. sparc64: Add very basic XVR-1000 framebuffer driver.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    Acked-by: Frans van Berckel <fberckel@xs4all.nl>
    davem330 committed Mar 14, 2010
Commits on Mar 13, 2010
  1. 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: (108 commits)
      bridge: ensure to unlock in error path in br_multicast_query().
      drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages
      sky2: Avoid rtnl_unlock without rtnl_lock
      ipv6: Send netlink notification when DAD fails
      drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant
      ipconfig: Handle devices which take some time to come up.
      mac80211: Fix memory leak in ieee80211_if_write()
      mac80211: Fix (dynamic) power save entry
      ipw2200: use kmalloc for large local variables
      ath5k: read eeprom IQ calibration values correctly for G mode
      ath5k: fix I/Q calibration (for real)
      ath5k: fix TSF reset
      ath5k: use fixed antenna for tx descriptors
      libipw: split ieee->networks into small pieces
      mac80211: Fix sta_mtx unlocking on insert STA failure path
      rt2x00: remove KSEG1ADDR define from rt2x00soc.h
      net: add ColdFire support to the smc91x driver
      asix: fix setting mac address for AX88772
      ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
      net: Fix dev_mc_add()
      ...
    torvalds committed Mar 13, 2010
  2. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: Fix pick_next_highest_task_rt() for cgroups
      sched: Cleanup: remove unused variable in try_to_wake_up()
      x86: Fix sched_clock_cpu for systems with unsynchronized TSC
    torvalds committed Mar 13, 2010
  3. Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/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, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems
      x86, UV: Fix target_cpus() in x2apic_uv_x.c
      x86: Reduce per cpu warning boot up messages
      x86: Reduce per cpu MCA boot up messages
      x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already
    torvalds committed Mar 13, 2010
  4. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      locking: Make sparse work with inline spinlocks and rwlocks
      x86/mce: Fix RCU lockdep splats
      rcu: Increase RCU CPU stall timeouts if PROVE_RCU
      ftrace: Replace read_barrier_depends() with rcu_dereference_raw()
      rcu: Suppress RCU lockdep warnings during early boot
      rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare()
      rcu: Suppress __mpol_dup() false positive from RCU lockdep
      rcu: Make rcu_read_lock_sched_held() handle !PREEMPT
      rcu: Add control variables to lockdep_rcu_dereference() diagnostics
      rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU
      rcu: Use wrapper function instead of exporting tasklist_lock
      sched, rcu: Fix rcu_dereference() for RCU-lockdep
      rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use
      rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU
      x86/gart: Unexport gart_iommu_aperture
    
    Fix trivial conflicts in kernel/trace/ftrace.c
    torvalds committed Mar 13, 2010
  5. Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    …m/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      tracing: Do not record user stack trace from NMI context
      tracing: Disable buffer switching when starting or stopping trace
      tracing: Use same local variable when resetting the ring buffer
      function-graph: Init curr_ret_stack with ret_stack
      ring-buffer: Move disabled check into preempt disable section
      function-graph: Add tracing_thresh support to function_graph tracer
      tracing: Update the comm field in the right variable in update_max_tr
      function-graph: Use comment notation for func names of dangling '}'
      function-graph: Fix unused reference to ftrace_set_func()
      tracing: Fix warning in s_next of trace file ops
      tracing: Include irqflags headers from trace clock
    torvalds committed Mar 13, 2010
  6. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55
      sound: fix opti92x-ad1848 build
      ALSA: hda - Fix input source elements of secondary ADCs on Realtek
      ALSA: hda - Fix wrong model range check for ALC268
    torvalds committed Mar 13, 2010
  7. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Provide generic perf_sample_data initialization
      MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer
      perf trace: Don't use pager if scripting
      perf trace/scripting: Remove extraneous header read
      perf, ARM: Modify kuser rmb() call to compile for Thumb-2
      x86/stacktrace: Don't dereference bad frame pointers
      perf archive: Don't try to collect files without a build-id
      perf_events, x86: Fixup fixed counter constraints
      perf, x86: Restrict the ANY flag
      perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE
      perf, x86: add some IBS macros to perf_event.h
      perf, x86: make IBS macros available in perf_event.h
      hw-breakpoints: Remove stub unthrottle callback
      x86/hw-breakpoints: Remove the name field
      perf: Remove pointless breakpoint union
      perf lock: Drop the buffers multiplexing dependency
      perf lock: Fix and add misc documentally things
      percpu: Add __percpu sparse annotations to hw_breakpoint
    torvalds committed Mar 13, 2010
  8. Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      GFS2: Skip check for mandatory locks when unlocking
      GFS2: Allow the number of committed revokes to temporarily be negative
      GFS2: do not select QUOTA
    torvalds committed Mar 13, 2010
  9. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      RDMA/nes: Fix CX4 link problem in back-to-back configuration
      RDMA/nes: Clear stall bit before destroying NIC QP
      RDMA/nes: Set assume_aligned_header bit
      RDMA/cxgb3: Wait at least one schedule cycle during device removal
      IB/mad: Ignore iWARP devices on device removal
      IPoIB: Include return code in trace message for ib_post_send() failures
      IPoIB: Fix TX queue lockup with mixed UD/CM traffic
    torvalds committed Mar 13, 2010
  10. bridge: ensure to unlock in error path in br_multicast_query().

    Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    YOSHIFUJI Hideaki committed with davem330 Mar 13, 2010
  11. drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages

    On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote:
    > From: Mikael Pettersson <mikpe@it.uu.se>
    > Date: Wed, 10 Mar 2010 16:33:28 +0100
    > > Booting 2.6.34-rc1 on a machine with a tulip nic I see
    > > a number of kernel messages that include "(null)" where
    > > previous kernels included the string "tulip0":
    > CC:'ing the guilty party :-)  It's one of the following
    > commits:
    
    Thanks Mikael.
    
    Anonymity has some good attributes.
    Blame avoidance is one of them.
    
    I've broad shoulders.  It's me, then Dwight Howard...
    
    There might be another few of these where ->name or ->dev
    was used before struct device or net_device was registered.
    I'll go back and check.
    
    tulip_core has:
    
    	if (tp->flags & HAS_MEDIA_TABLE) {
    		sprintf(dev->name, DRV_NAME "%d", board_idx);	/* hack */
    		tulip_parse_eeprom(dev);
    		strcpy(dev->name, "eth%d");			/* un-hack */
    	}
    
    So I don't feel _too_ bad.
    
    tulip_parse_eeprom is done before register_netdev so the logging
    there can not use netdev_<level> or dev_<level>(&dev->dev
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Tested-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    JoePerches committed with davem330 Mar 13, 2010
  12. sky2: Avoid rtnl_unlock without rtnl_lock

    Make sure we always call rtnl_lock before going down the
    error path in sky2_resume, which unlocks the rtnl lock.
    
    Signed-off-by: Mike McCormack <mikem@ring3k.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    mikemccormack committed with davem330 Mar 13, 2010
  13. ipv6: Send netlink notification when DAD fails

    If we are managing IPv6 addresses using DHCP, it would be nice
    for user-space to be notified if an address configured through
    DHCP fails DAD.  Otherwise user-space would have to poll to see
    whether DAD succeeds.
    
    This patch uses the existing notification mechanism and simply
    hooks it into the DAD failure code path.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    herbertx committed with davem330 Mar 13, 2010
  14. drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONL…

    …Y constant
    
    The constant TG3_FLAG_10_100_ONLY should be used with the tg3_flags field,
    not the tg3_flags2 field, as done elsewhere in the same file.
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    JuliaLawall committed with davem330 Mar 13, 2010
  15. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/linville/wireless-2.6
    davem330 committed Mar 13, 2010
  16. i2c-algo-bit: Add pre- and post-xfer hooks

    Drivers might have to do random things before and/or after I2C
    transfers. Add hooks to the i2c-algo-bit implementation to let them do
    so.
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Alex Deucher <alexdeucher@gmail.com>
    Jean Delvare committed Mar 13, 2010
  17. at24: Init dynamic bin_attribute structures

    Commit 6992f53 introduced this requirement.
    
    Reported-by: Albrecht Dress <albrecht.dress@arcor.de>
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Wolfram Sang committed with Jean Delvare Mar 13, 2010