1. 03 2月, 2012 1 次提交
  2. 02 2月, 2012 12 次提交
  3. 01 2月, 2012 13 次提交
  4. 31 1月, 2012 14 次提交
    • I
      Merge tag 'perf-urgent-for-mingo' of... · 45179fec
      Ingo Molnar 提交于
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Fixes cherry picked from perf/core.
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      45179fec
    • L
      Merge branch 'hwmon-for-linus' of... · c5d2bc11
      Linus Torvalds 提交于
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
        hwmon: (sht15) fix bad error code
        MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
        MAINTAINERS: Add hwmon entries for Wolfson
        hwmon: (f71805f) Fix clamping of temperature limits
      c5d2bc11
    • L
      Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8e2a2880
      Linus Torvalds 提交于
      Here are some fixes to the pin control system that has accumulated since
      -rc1.  Mainly Tony Lindgren fixed the module load/unload logic and the
      rest are minor fixes and documentation.
      
      * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: add checks for empty function names
        pinctrl: fix pinmux_hog_maps when ctrl_dev_name is not set
        pinctrl: fix some pinmux typos
        pinctrl: free debugfs entries when unloading a pinmux driver
        pinctrl: unbreak error messages
        Documentation/pinctrl: fix a few syntax errors in code examples
        pinctrl: fix pinconf_pins_show iteration
      8e2a2880
    • S
      perf top: Fix number of samples displayed · 509605db
      Stephane Eranian 提交于
      In recent versions of perf top, pressing the 'e' key to change the
      number of displayed samples had no effect.
      
      The number of samples was still dictated by the size of the terminal
      (stdio mode). That was quite annoying because typically only the first
      dozen samples really matter.
      
      This patch fixes this.
      
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/20120130105037.GA5160@quadSigned-off-by: NStephane Eranian <eranian@google.com>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      509605db
    • S
      perf tools: Fix strlen() bug in perf_event__synthesize_event_type() · d8d9c282
      Stephane Eranian 提交于
      The event_type record has a max length for the event name.
      
      It's called MAX_EVENT_NAME.
      
      The name may be truncated to fit the max length. But the header.size still
      reflects the original name length. If that length is > MAX_EVENT_NAME, then the
      header.size field is bogus. Fix this by using the length of the name after the
      potential truncation.
      
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/20120120094912.GA4882@quadSigned-off-by: NStephane Eranian <eranian@google.com>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      d8d9c282
    • D
      perf tools: Fix broken build by defining _GNU_SOURCE in Makefile · 0a84f007
      David Daney 提交于
      When building on my Debian/mips system, util/util.c fails to build
      because commit 1aed2671 (perf kvm: Do
      guest-only counting by default) indirectly includes stdio.h before the
      feature selection in util.h is done.  This prevents _GNU_SOURCE in
      util.h from enabling the declaration of getline(), from now second
      inclusion of stdio.h, and the build is broken.
      
      There is another breakage in util/evsel.c caused by include ordering,
      but I didn't fully track down the commit that caused it.
      
      The root cause of all this is an inconsistent definition of _GNU_SOURCE,
      so I move the definition into the Makefile so that it is passed to all
      invocations of the compiler and used uniformly for all system header
      files.  All other #define and #undef of _GNU_SOURCE are removed as they
      cause conflicts with the definition passed to the compiler.
      
      All the features.h definitions (_LARGEFILE64_SOURCE _FILE_OFFSET_BITS=64
      and _GNU_SOURCE) are needed by the python glue code too, so they are
      moved to BASIC_CFLAGS, and the misleading comments about BASIC_CFLAGS
      are removed.
      
      This gives me a clean build on x86_64 (fc12) and mips (Debian).
      
      Cc: David Daney <david.daney@cavium.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Joerg Roedel <joerg.roedel@amd.com>
      Cc: Namhyung Kim <namhyung.kim@lge.com>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Link: http://lkml.kernel.org/r/1326836461-11952-1-git-send-email-ddaney.cavm@gmail.comSigned-off-by: NDavid Daney <david.daney@cavium.com>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      0a84f007
    • R
    • T
      RDMA/nes: Copyright update · c5488c57
      Tatyana Nikolova 提交于
      Update copyright information in the source files.
      Signed-off-by: NTatyana Nikolova <Tatyana.E.Nikolova@intel.com>
      Signed-off-by: NFaisal Latif <Faisal.Latif@intel.com>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      c5488c57
    • J
      IB/mlx4: pass SMP vendor-specific attribute MADs to firmware · a6f7feae
      Jack Morgenstein 提交于
      In the current code, vendor-specific MADs (e.g with the FDR-10
      attribute) are silently dropped by the driver, resulting in timeouts
      at the sending side and inability to query/configure the relevant
      feature.  However, the ConnectX firmware is able to handle such MADs.
      For unsupported attributes, the firmware returns a GET_RESPONSE MAD
      containing an error status.
      
      For example, for a FDR-10 node with LID 11:
      
          # ibstat mlx4_0 1
      
          CA: 'mlx4_0'
          Port 1:
          State: Active
          Physical state: LinkUp
          Rate: 40 (FDR10)
          Base lid: 11
          LMC: 0
          SM lid: 24
          Capability mask: 0x02514868
          Port GUID: 0x0002c903002e65d1
          Link layer: InfiniBand
      
      Extended Port Query (EPI) vendor mad timeouts before the patch:
      
          # smpquery MEPI 11 -d
      
          ibwarn: [4196] smp_query_via: attr 0xff90 mod 0x0 route Lid 11
          ibwarn: [4196] _do_madrpc: retry 1 (timeout 1000 ms)
          ibwarn: [4196] _do_madrpc: retry 2 (timeout 1000 ms)
          ibwarn: [4196] _do_madrpc: timeout after 3 retries, 3000 ms
          ibwarn: [4196] mad_rpc: _do_madrpc failed; dport (Lid 11)
          smpquery: iberror: [pid 4196] main: failed: operation EPI: ext port info query failed
      
      EPI query works OK with the patch:
      
          # smpquery MEPI 11 -d
      
          ibwarn: [6548] smp_query_via: attr 0xff90 mod 0x0 route Lid 11
          ibwarn: [6548] mad_rpc: data offs 64 sz 64
          mad data
          0000 0000 0000 0001 0000 0001 0000 0001
          0000 0000 0000 0000 0000 0000 0000 0000
          0000 0000 0000 0000 0000 0000 0000 0000
          0000 0000 0000 0000 0000 0000 0000 0000
          # Ext Port info: Lid 11 port 0
          StateChangeEnable:...............0x00
          LinkSpeedSupported:..............0x01
          LinkSpeedEnabled:................0x01
          LinkSpeedActive:.................0x01
      Signed-off-by: NJack Morgenstein <jackm@mellanox.com>
      Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
      Acked-by: NIra Weiny <weiny2@llnl.gov>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NRoland Dreier <roland@purestorage.com>
      a6f7feae
    • L
      Merge tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 27ba234c
      Linus Torvalds 提交于
      Here are some tty/serial patches for 3.3-rc1
      
      Big thing here is the movement of the 8250 serial drivers to their own
      directory, now that the patch churn has calmed down.
      
      Other than that, only minor stuff (omap patches were reverted as they
      were found to be wrong), and another broken driver removed from the
      system.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      * tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: Kill off Moorestown code
        Revert "tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode"
        Revert "tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip"
        serial: Fix wakeup init logic to speed up startup
        docbook: don't use serial_core.h in device-drivers book
        serial: amba-pl011: lock console writes against interrupts
        amba-pl011: do not disable RTS during shutdown
        tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip
        tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode
        omap-serial: make serial_omap_restore_context depend on CONFIG_PM_RUNTIME
        omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP.
        TTY: fix UV serial console regression
        jsm: Fixed EEH recovery error
        Updated TTY MAINTAINERS info
        serial: group all the 8250 related code together
      27ba234c
    • S
      firewire: ohci: disable MSI on Ricoh controllers · 320cfa6c
      Stefan Richter 提交于
      The PCIe device
      
          FireWire (IEEE 1394) [0c00]: Ricoh Co Ltd FireWire Host Controller
          [1180:e832] (prog-if 10 [OHCI])
      
      is unable to access attached FireWire devices when MSI is enabled but
      works if MSI is disabled.
      http://www.mail-archive.com/alsa-user@lists.sourceforge.net/msg28251.html
      
      Hence add the "disable MSI" quirks flag for this device, or in fact for
      safety and simplicity for all current (R5U230, R5U231, R5U240) and
      future Ricoh PCIe 1394 controllers.
      Reported-by: NStefan Thomas <kontrapunktstefan@googlemail.com>
      Cc: 2.6.36+ <stable@vger.kernel.org>
      Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>
      320cfa6c
    • L
      Merge tag 'usb-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 6bc2b95e
      Linus Torvalds 提交于
      Here are a bunch of USB patches for 3.3-rc1.
      
      Nothing major, largest thing here is the removal of some drivers that
      did not work at all.  Other than that, the normal collection of bugfixes
      and new device ids.
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      
      * tag 'usb-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (52 commits)
        uwb & wusb: fix kconfig error
        USB: Realtek cr: fix autopm scheduling while atomic
        USB: ftdi_sio: Add more identifiers
        xHCI: Cleanup isoc transfer ring when TD length mismatch found
        usb: musb: omap2430: minor cleanups.
        qcaux: add more Pantech UML190 and UML290 ports
        Revert "drivers: usb: Fix dependency for USB_HWA_HCD"
        usb: mv-otg - Fix build if CONFIG_USB is not set
        USB: cdc-wdm: Avoid hanging on interface with no USB_CDC_DMM_TYPE
        usb: add support for STA2X11 host driver
        drivers: usb: Fix dependency for USB_HWA_HCD
        kernel-doc: fix new warning in usb.h
        USB: OHCI: fix new compiler warnings
        usb: serial: kobil_sct: fix compile warning:
        drivers/usb/host/ehci-fsl.c: add missing iounmap
        USB: cdc-wdm: better allocate a buffer that is at least as big as we tell the USB core
        USB: cdc-wdm: call wake_up_all to allow driver to shutdown on device removal
        USB: cdc-wdm: use two mutexes to allow simultaneous read and write
        USB: cdc-wdm: updating desc->length must be protected by spin_lock
        USB: usbsevseg: fix max length
        ...
      6bc2b95e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · a14a8d93
      Linus Torvalds 提交于
      1) Setting link attributes can modify the size of the attributes that
         would be reported on a subsequent getlink netlink operation,
         therefore min_ifinfo_dump_size needs to be adjusted.  From Stefan
         Gula.
      
      2) Resegmentation of TSO frames while trimming can violate invariants
         expected by callers, namely that the number of segments can only stay
         the same or decrease, never increase.  If MSS changes, however, we
         can trim data but then end up with more segments.  Fix this by only
         segmenting to the MSS already recorded in the SKB.  That's the
         simplest fix for now and if we want to get more fancy in the future
         that's a more involved change.
      
         This probably explains some retransmit counter inaccuracies.
      
         From Neal Cardwell.
      
      3) Fix too-many-wakeups in POLL with AF_UNIX sockets, from Eric Dumazet.
      
      4) Fix CAIF crashes wrt.  namespace handling.  From Eric Dumazet and
         Eric W. Biederman.
      
      5) TCP port selection fixes from Flavio Leitner.
      
      6) More socket memory cgroup build fixes in certain randonfig
         situations.  From Glauber Costa.
      
      7) Fix TCP memory sysctl regression reported by Ingo Molnar, also from
         Glauber Costa.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        af_unix: fix EPOLLET regression for stream sockets
        tcp: fix tcp_trim_head() to adjust segment count with skb MSS
        net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL
        net caif: Register properly as a pernet subsystem.
        netns: Fail conspicously if someone uses net_generic at an inappropriate time.
        net: explicitly add jump_label.h header to sock.h
        net: RTNETLINK adjusting values of min_ifinfo_dump_size
        ipv6: Fix ip_gre lockless xmits.
        xen-netfront: correct MAX_TX_TARGET calculation.
        netns: fix net_alloc_generic()
        tcp: bind() optimize port allocation
        tcp: bind() fix autoselection to share ports
        l2tp: l2tp_ip - fix possible oops on packet receive
        iwlwifi: fix PCI-E transport "inta" race
        mac80211: set bss_conf.idle when vif is connected
        mac80211: update oper_channel on ibss join
      a14a8d93
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · b527a233
      Linus Torvalds 提交于
      This fixes an integration issue with the regulator device tree bindings
      which shook out in -rc.  The bindings were overly enthusiatic when
      deciding to set a voltage on a regulator and would try to set zero volts
      on an unconfigured regulator which isn't supported.
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Set apply_uV only when min and max voltages are defined
      b527a233