1. 19 10月, 2012 7 次提交
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · c9623de4
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "Media fixes for:
         - one Kconfig fix patch;
         - one patch fixing DocBook breakage due to the drivers/media UAPI
           changes;
         - the remaining UAPI media changes (DVB API).
      
        I'm aware that is is a little late for the UAPI renames for the DVB
        API, but IMHO, it is better to merge it for 3.7, due to two reasons:
      
         1) There is a major rename at 3.7 (not only uapi changes, but also
            the entire media drivers were reorganized on 3.7, in order to
            simplify the Kconfig logic, and easy drivers selection, especially
            for hybrid devices).  By confining all those renames there at 3.7
            it will cause all the harm at for media developers on just one
            shot.  Stable backports upstream and at distros will likely
            welcome it as well, as they won't need to check what changed on
            3.7 and what was postponed for on 3.8.
      
         2) The V4L2 DocBook Makefile creates a cross-reference between the
            media API headers and the specs.  This helps us _a_lot_ to be sure
            that all API improvements are properly documented.  Every time a
            header changes from one place to another, DocBook/media/Makefile
            needs to be patched.  Currently, the DocBook breakage patch
            depends on the DVB UAPI."
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] Kconfig: Fix dependencies for driver autoselect options
        DocBook/media/Makefile: Fix build due to uapi breakage
        UAPI: (Scripted) Disintegrate include/linux/dvb
      c9623de4
    • J
      crypto: aesni - fix XTS mode on x86-32, add wrapper function for asmlinkage aesni_enc() · 32bec973
      Jussi Kivilinna 提交于
      Calling convention for internal functions and 'asmlinkage' functions is
      different on x86-32. Therefore do not directly cast aesni_enc as XTS tweak
      function, but use wrapper function in between. Fixes crash with "XTS +
      aesni_intel + x86-32" combination.
      
      Cc: stable@vger.kernel.org
      Reported-by: NKrzysztof Kolasa <kkolasa@winsoft.pl>
      Signed-off-by: NJussi Kivilinna <jussi.kivilinna@mbnet.fi>
      Acked-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      32bec973
    • D
      fs, xattr: fix bug when removing a name not in xattr list · 43385846
      David Rientjes 提交于
      Commit 38f38657 ("xattr: extract simple_xattr code from tmpfs") moved
      some code from tmpfs but introduced a subtle bug along the way.
      
      If the name passed to simple_xattr_remove() does not exist in the list of
      xattrs, then it is possible to call kfree(new_xattr) when new_xattr is
      actually initialized to itself on the stack via uninitialized_var().
      
      This causes a BUG() since the memory was not allocated via the slab
      allocator and was not bypassed through to the page allocator because it
      was too large.
      
      Initialize the local variable to NULL so the kfree() never takes place.
      Reported-by: NFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: NDavid Rientjes <rientjes@google.com>
      Acked-by: NHugh Dickins <hughd@google.com>
      Acked-by: NAristeu Rozanski <aris@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      43385846
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d63e210e
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Random small fixes across the MIPS code."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: CMP: Fix physical core number calculation logic
        MIPS: JZ4740: Forward declare struct uart_port in header.
        MIPS: JZ4740: Fix '#include guard' in serial.h
        MIPS: hugetlbfs: Fix hazard between tlb write and pagemask restoration.
        MIPS: Restore pagemask after dumping the TLB.
        MIPS: Hugetlbfs: Handle huge pages correctly in pmd_bad()
        MIPS: R5000: Fix TLB hazard handling.
        MIPS: tlbex: Deal with re-definition of label
        MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
      d63e210e
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a0a6a39e
      Linus Torvalds 提交于
      Pull powerpc fixes from Benjamin Herrenschmidt:
       "Here are a handful of powerpc related fixes."
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
        cpuidle/powerpc: Fix smt_snooze_delay functionality.
        cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
        powerpc: Build fix for powerpc KVM
        Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
      a0a6a39e
    • L
      Merge tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux · bab58350
      Linus Torvalds 提交于
      Pull DeviceTree fixes from Rob Herring:
       "A handful of fixes:
         - a fix for dtc from upstream
         - sparse fixes in DeviceTree code
         - stub of_get_child_by_name for !OF builds"
      
      * tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux:
        dtc: fix for_each_*() to skip first object if deleted
        of/platform: sparse fix
        of/irq: sparse fixes
        of/address: sparse fixes
        of: add stub of_get_child_by_name for non-OF builds
      bab58350
    • L
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ec351832
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Significant changes are:
         - A regression fix for the new HD-audio LPIB delay counting,
           VGA-switcheroo race fix
         - ASoC ams-delta fix for the broken driver loading
      
        Otherwise a collection of mostly small / trivial fixes."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: emu10k1: add chip details for E-mu 1010 PCIe card
        ALSA: hda - Always check array bounds in alc_get_line_out_pfx
        ASoC: bells: Correct typo in sub speaker DAI name for WM5110
        ALSA: hda - Stop LPIB delay counting on broken hardware
        ALSA: hda - Fix registration race of VGA switcheroo
        ALSA: hda - Clean up superfluous position_fix list entries
        ALSA: ac97 - Fix missing NULL check in snd_ac97_cvol_new()
        ASoC: codecs: da9055: Minor improvement in ALC calibration process
        ASoC: dmaengine: Correct Makefile when sound is built as module
        ASoC: fsi: don't reschedule DMA from an atomic context
        ASoC: fix documentation in soc-jack
        ARM: pxa: Fix build error caused by sram.h rename
        ASoC: wm2200: Fix non-inverted OUT2 mute control
        ASoC: wm2200: Use rev A register patches on rev B
        ASoC: bells: Correct typo in sub speaker DAI name for WM5110
        ASoC: ams-delta: Convert to use snd_soc_register_card()
        ASoC: omap-mcpdm: Remove OMAP revision check
        ASoC: Fix wrong include for McPDM
        ASoC: omap-abe-twl6040: Fix typo of Vibrator
        ASoC: twl6040: Fix Stream DAPM mapping
      ec351832
  2. 18 10月, 2012 17 次提交
    • J
      MIPS: CMP: Fix physical core number calculation logic · 0cc40dac
      jerin jacob 提交于
      The CPUNum Field in EBase register is 10bit wide, so after 1 bit right
      shift, the mask value should be 0x1ff.
      Signed-off-by: Njerin jacob <jerinjacobk@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/4420/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      0cc40dac
    • D
      cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries. · 83dac594
      Deepthi Dharwar 提交于
      Earlier without cpuidle framework on pseries, the native arch
      idle routine comprised of both snooze and nap
      states.  smt_snooze_delay variable was used to delay
      the idle process entry to deeper idle state like  nap.
      With the coming of cpuidle, this arch specific idle was replaced
      by two different idle routines, one for supporting snooze and other
      for nap. This enabled addition of more
      low level idle states on pseries in the future.
      
      On adopting the generic cpuidle framework for POWER systems,
      the decision of which idle state to choose from,  given a predicted
      idle time is taken by the menu governor based on
      target_residency and  exit_latency of the idle states.
      target_residency is the minimum time to be resident in that idle state.
      Exit_latency is time taken to exit out of idle state.
      Deeper the idle state, both the target residency and exit latency
      would be higher.
      
      In the current design, smt_snooze_delay is used as target_residency
      for the  snooze state which is incorrect, as it is not the
      minimum but the maximum duration to be in snooze state.
      This would  result in the governor in taking bad decision,
      as presently target_residency of nap < target_residency of snooze
      inspite of nap being deeper idle state.
      
      This patch aims to fix this problem by replacing the smt_snooze_delay loop
      in snooze state, with the need_resched()  as the governor is aware of
      entry and exit of various idle transitions based on which
      next idle time prediction.
      
      The governor is intelligent enough to determine the idle state the needs to
      be transitioned to and maintains a whole of heuristics including
      io load, previous idle states predictions etc for the same, based on
      which idle state entry decision is taken.
      
      With this fix, of setting target_residency of snooze to 0
      					     nap to smt_snooze_delay
      if the predicted idle time is less
      than smt_snooze_delay (target_residency of nap)
      value governor would pick snooze state, else nap. This adhers to the
      previous native idle design.
      Signed-off-by: NDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      83dac594
    • D
      cpuidle/powerpc: Fix smt_snooze_delay functionality. · 8ea959a1
      Deepthi Dharwar 提交于
      smt_snooze_delay was designed to  delay idle loop's nap entry
      in the native idle code before it got  ported over to use as part of
      the cpuidle framework.
      
      A -ve value  assigned to smt_snooze_delay should result in
      busy looping, in other words disabling the entry to nap state.
      
      	- https://lists.ozlabs.org/pipermail/linuxppc-dev/2010-May/082450.html
      
      This particular functionality can be achieved currently by
      echo 1 > /sys/devices/system/cpu/cpu*/state1/disable
      but it is broken when one assigns -ve value to  the smt_snooze_delay
      variable either via sysfs entry or ppc64_cpu util.
      
      This patch aims to fix this, by disabling nap state when smt_snooze_delay
      variable is set to -ve value.
      Signed-off-by: NDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      8ea959a1
    • D
      cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle · 817deb05
      Deepthi Dharwar 提交于
      Remove the redundant target residency initialisation in pseries_cpuidle_driver_init().
      This is currently over-writing the residency time updated as part of the static
      table, resulting in  all the idle states having the same target
      residency of 100us which is incorrect. This may result in the menu governor making
      wrong state decisions.
      Signed-off-by: NDeepthi Dharwar <deepthi@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      817deb05
    • A
      powerpc: Build fix for powerpc KVM · ce236ab5
      Aneesh Kumar K.V 提交于
      Fix build failure for powerpc KVM by adding missing VPN_SHIFT definition
      and the ';'
      
      arch/powerpc/kvm/book3s_32_mmu_host.c: In function 'kvmppc_mmu_map_page':
      arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: 'VPN_SHIFT' undeclared (first use in this function)
      arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: (Each undeclared identifier is reported only once
      arch/powerpc/kvm/book3s_32_mmu_host.c:176: error: for each function it appears in.)
      arch/powerpc/kvm/book3s_32_mmu_host.c:178: error: expected ';' before 'next_pteg'
      arch/powerpc/kvm/book3s_32_mmu_host.c:190: error: label 'next_pteg' used but not defined
      make[1]: *** [arch/powerpc/kvm/book3s_32_mmu_host.o] Error 1
      Signed-off-by: NAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      ce236ab5
    • B
      Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events" · 72523d80
      Benjamin Herrenschmidt 提交于
      This reverts commit 81331211.
      
      This revert was requested by the author of the patch as it seems
      to cause system hangs with some low frequency events
      72523d80
    • J
      apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40 · 43c422ed
      John Johansen 提交于
      The capability defines have moved causing the auto generated names
      of capabilities that apparmor uses in logging to be incorrect.
      
      Fix the autogenerated table source to uapi/linux/capability.h
      Reported-by: NYanHong <clouds.yan@gmail.com>
      Reported-by: NKrzysztof Kolasa <kkolasa@winsoft.pl>
      Analyzed-by: NAl Viro <viro@ZenIV.linux.org.uk>
      Signed-off-by: NJohn Johansen <john.johansen@canonical.com>
      Acked-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NJames Morris <james.l.morris@oracle.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      43c422ed
    • S
      dtc: fix for_each_*() to skip first object if deleted · 205a8eb7
      Stephen Warren 提交于
      The previous definition of for_each_*() would always include the very
      first object within the list, irrespective of whether it was marked
      deleted, since the deleted flag was not checked on the first object,
      but only on any "next" object.
      
      Fix for_each_*() to check the deleted flag in the loop body every
      iteration to correct this.
      
      (upstream dtc commit 1762ab42ef77db7ab2776d0d6cba3515150f518a)
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      205a8eb7
    • K
      of/platform: sparse fix · 24fb530f
      Kim Phillips 提交于
      drivers/of/platform.c:110:59: warning: incorrect type in argument 2 (different base types)
      drivers/of/platform.c:110:59:    expected restricted __be32 const [usertype] *addr
      drivers/of/platform.c:110:59:    got unsigned int const [usertype] *[assigned] reg
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      24fb530f
    • K
      of/irq: sparse fixes · d2e41518
      Kim Phillips 提交于
      drivers/of/irq.c:195:57: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:196:51: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:199:57: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:201:58: warning: restricted __be32 degrades to integer
      drivers/of/irq.c:470:37: warning: incorrect type in assignment (different modifiers)
      drivers/of/irq.c:470:37:    expected int ( *[usertype] irq_init_cb )( ... )
      drivers/of/irq.c:470:37:    got void const *const data
      drivers/of/irq.c:96:5: error: symbol 'of_irq_map_raw' redeclared with different type (originally declared at include/linux/of_irq.h:61) - incompatible argument 2 (different base types)
      
      drivers/of/of_pci_irq.c:91:40: warning: incorrect type in argument 2 (different base types)
      drivers/of/of_pci_irq.c:91:40:    expected unsigned int const [usertype] *intspec
      drivers/of/of_pci_irq.c:91:40:    got restricted __be32 *<noident>
      drivers/of/of_pci_irq.c:91:53: warning: incorrect type in argument 4 (different base types)
      drivers/of/of_pci_irq.c:91:53:    expected unsigned int const [usertype] *addr
      drivers/of/of_pci_irq.c:91:53:    got restricted __be32 *<noident>
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      d2e41518
    • K
      of/address: sparse fixes · 47b1e689
      Kim Phillips 提交于
      drivers/of/address.c:66:29: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:66:29:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:66:29:    got unsigned int [usertype] *addr
      drivers/of/address.c:87:32: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:87:32:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:87:32:    got unsigned int [usertype] *addr
      drivers/of/address.c:91:30: warning: incorrect type in assignment (different base types)
      drivers/of/address.c:91:30:    expected unsigned int [unsigned] [usertype] <noident>
      drivers/of/address.c:91:30:    got restricted __be32 [usertype] <noident>
      drivers/of/address.c:92:22: warning: incorrect type in assignment (different base types)
      drivers/of/address.c:92:22:    expected unsigned int [unsigned] [usertype] <noident>
      drivers/of/address.c:92:22:    got restricted __be32 [usertype] <noident>
      drivers/of/address.c:147:35: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:147:35:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:147:35:    got unsigned int [usertype] *addr
      drivers/of/address.c:157:34: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:157:34:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:157:34:    got unsigned int [usertype] *
      drivers/of/address.c:256:29: warning: restricted __be32 degrades to integer
      drivers/of/address.c:256:36: warning: restricted __be32 degrades to integer
      drivers/of/address.c:262:34: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:262:34:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:262:34:    got unsigned int [usertype] *
      drivers/of/address.c:372:41: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:372:41:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:372:41:    got unsigned int [usertype] *addr
      drivers/of/address.c:395:53: warning: incorrect type in argument 2 (different base types)
      drivers/of/address.c:395:53:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:395:53:    got unsigned int [usertype] *addr
      drivers/of/address.c:443:50: warning: incorrect type in argument 2 (different base types)
      drivers/of/address.c:443:50:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:443:50:    got unsigned int *<noident>
      drivers/of/address.c:455:49: warning: incorrect type in argument 1 (different base types)
      drivers/of/address.c:455:49:    expected restricted __be32 const [usertype] *cell
      drivers/of/address.c:455:49:    got unsigned int *<noident>
      drivers/of/address.c:480:60: warning: incorrect type in argument 2 (different base types)
      drivers/of/address.c:480:60:    expected restricted __be32 const [usertype] *addr
      drivers/of/address.c:480:60:    got unsigned int *<noident>
      drivers/of/address.c:412:5: warning: symbol '__of_translate_address' was not declared. Should it be static?
      drivers/of/address.c:520:14: error: symbol 'of_get_address' redeclared with different type (originally declared at include/linux/of_address.h:22) - different base types
      Signed-off-by: NKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      47b1e689
    • O
      of: add stub of_get_child_by_name for non-OF builds · 25c040c9
      Olof Johansson 提交于
      Fixes build error on s3c6400_defconfig, introduced by commit
      06455bbc, "dt/s3c64xx/spi: Use
      of_get_child_by_name to get a named child".
      
      drivers/spi/spi-s3c64xx.c: In function 's3c64xx_get_slave_ctrldata':
      drivers/spi/spi-s3c64xx.c:838:2: error: implicit declaration of function
          'of_get_child_by_name' [-Werror=implicit-function-declaration]
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      Signed-off-by: NRob Herring <rob.herring@calxeda.com>
      25c040c9
    • L
      Merge tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers · 985c9e61
      Linus Torvalds 提交于
      Pull misc UAPI fixes from David Howells:
       "They do a number of things:
      
        (1) Import a patch from Catalin Marinas to extend the generic-y in
            Kbuild facility to uapi directories.
      
        (2) Make arch/tile's ucontext.h file use (1) and remove the header-y
            line from the kernel internal side of things.
      
        (3) Remove some now-empty conditional bits from include/linux/Kbuild.
            The contents got moved to the UAPI side of things along with new
            conditionals.
      
        (4) Deal with now-empty files:
      
           (a) Empty Kbuild files under include/ get removed.
      
           (b) Empty Kbuild files under arch/ get comments to hold them as
               they are likely to end up with generic-y or genhdr-y lines.
               Deleting them appears to work if we want to go that route.
      
           (c) Put a comment into uapi/asm-generic/kvm_para.h to prevent the
               patch program from deleting that, and made the arches with
               empty kvm_para.h uapi files use that instead of having their
               own files.
      
           (d) Put comments into four other empty uapi/ headers to prevent the
               patch program from deleting them.
      
        A question: Is this the right way to deal with the now-empty Kbuild
        files?
      
        The ones under include/ are unlikely to be used - even for generated
        files, I think - so getting rid of them is probably okay.  Once all
        the bits are in, we can probably remove all the Kbuild files under
        include/ that aren't also under include/uapi/.
      
        The ones under arch/ are more of an issue because of the potential for
        generic-y and genhdr-y."
      
      * tag 'uapi-fixes-20121017' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-empty
        UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty
        UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty
        UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches
        UAPI: The tile arch uses the generic ucontext.h file
        UAPI: Place comments in empty arch Kbuilds to make them non-empty
        UAPI: Remove empty non-UAPI Kbuild files
        UAPI: Remove empty conditionals from include/linux/Kbuild
        UAPI: Make uapi/linux/irqnr.h non-empty
        uapi: Allow automatic generation of uapi/asm/ header files
      985c9e61
    • M
      [media] Kconfig: Fix dependencies for driver autoselect options · 2c76a12a
      Mauro Carvalho Chehab 提交于
      This option is a merge of both analog TV and DVB CUSTOMISE.
      
      At the merge, the dependencies were not done right: the menu
      currently appears only for analog TV. It should also be opened
      for digital TV. As there are other I2C devices there (flash
      devices, etc) that aren't related to either one, it is better
      to make it generic enough to open for all media devices with
      video.
      Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      2c76a12a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 18673533
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix regression in /proc/net/if_inet6, sometimes devices do not get
          listed.  From Eric Dumazet.
      
       2) Add IPSEC networking sub-section to MAINTAINERS.
      
       3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl.
      
       4) Fix enslavement of devices that can't do VLAN properly, from Jiri
          Pirko.
      
       5) SCTP sack handling fix from Zijie Pan.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        ipv6: addrconf: fix /proc/net/if_inet6
        bnx2x: fix handling mf storage modes
        qeth: fix deadlock between recovery and bonding driver
        smsgiucv: reestablish IUCV path after resume
        sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter()
        vlan: fix bond/team enslave of vlan challenged slave/port
        MAINTAINERS: Add explicit section for IPSEC networking.
      18673533
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · ccbfddb7
      Linus Torvalds 提交于
      Pull sparc fixes from David Miller:
       "Two sparc64 perf bug fixes and add a sysrq facility so I can diagnose
        these kinds of problems more quickly in the future."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix bit twiddling in sparc_pmu_enable_event().
        sparc64: Add global PMU register dumping via sysrq.
        sparc64: Like x86 we should check current->mm during perf backtrace generation.
      ccbfddb7
    • M
      ALSA: emu10k1: add chip details for E-mu 1010 PCIe card · 10f571d0
      Maxim Kachur 提交于
      Add chip details for E-mu 1010 PCIe card. It has the same
      chip as found in E-mu 1010b but it uses different PCI id.
      Signed-off-by: NMaxim Kachur <mcdebugger@duganet.ru>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      10f571d0
  3. 17 10月, 2012 16 次提交