1. 20 Dec, 2012 27 commits
    • Sasha Levin's avatar
      x86, efi: correct precedence of operators in setup_efi_pci · 886d751a
      Sasha Levin authored
      With the current code, the condition in the if() doesn't make much sense due to
      precedence of operators.
      Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Link: http://lkml.kernel.org/r/1356030701-16284-25-git-send-email-sasha.levin@oracle.com
      Cc: Matt Fleming <matt.fleming@intel.com>
      Cc: Matthew Garrett <mjg@redhat.com>
      Cc: Bjorn Helgaas <bhelgaas@google.com>
      Cc: Seth Forshee <seth.forshee@canonical.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      886d751a
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 787314c3
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "A few new features this merge-window.  The most important one is
        probably, that dma-debug now warns if a dma-handle is not checked with
        dma_mapping_error by the device driver.  This requires minor changes
        to some architectures which make use of dma-debug.  Most of these
        changes have the respective Acks by the Arch-Maintainers.
      
        Besides that there are updates to the AMD IOMMU driver for refactor
        the IOMMU-Groups support and to make sure it does not trigger a
        hardware erratum.
      
        The OMAP changes (for which I pulled in a branch from Tony Lindgren's
        tree) have a conflict in linux-next with the arm-soc tree.  The
        conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is
        deleted in the arm-soc tree.  It is safe to delete the file too so
        solve the conflict.  Similar changes are done in the arm-soc tree in
        the common clock framework migration.  A missing hunk from the patch
        in the IOMMU tree will be submitted as a seperate patch when the
        merge-window is closed."
      
      * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits)
        ARM: dma-mapping: support debug_dma_mapping_error
        ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks
        iommu/omap: Adapt to runtime pm
        iommu/omap: Migrate to hwmod framework
        iommu/omap: Keep mmu enabled when requested
        iommu/omap: Remove redundant clock handling on ISR
        iommu/amd: Remove obsolete comment
        iommu/amd: Don't use 512GB pages
        iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch
        iommu/tegra: gart: Move bus_set_iommu after probe for multi arch
        iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all
        tile: dma_debug: add debug_dma_mapping_error support
        sh: dma_debug: add debug_dma_mapping_error support
        powerpc: dma_debug: add debug_dma_mapping_error support
        mips: dma_debug: add debug_dma_mapping_error support
        microblaze: dma-mapping: support debug_dma_mapping_error
        ia64: dma_debug: add debug_dma_mapping_error support
        c6x: dma_debug: add debug_dma_mapping_error support
        ARM64: dma_debug: add debug_dma_mapping_error support
        intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
        ...
      787314c3
    • Woodhouse, David's avatar
      intel-iommu: Free old page tables before creating superpage · 6491d4d0
      Woodhouse, David authored
      The dma_pte_free_pagetable() function will only free a page table page
      if it is asked to free the *entire* 2MiB range that it covers. So if a
      page table page was used for one or more small mappings, it's likely to
      end up still present in the page tables... but with no valid PTEs.
      
      This was fine when we'd only be repopulating it with 4KiB PTEs anyway
      but the same virtual address range can end up being reused for a
      *large-page* mapping. And in that case were were trying to insert the
      large page into the second-level page table, and getting a complaint
      from the sanity check in __domain_mapping() because there was already a
      corresponding entry. This was *relatively* harmless; it led to a memory
      leak of the old page table page, but no other ill-effects.
      
      Fix it by calling dma_pte_clear_range (hopefully redundant) and
      dma_pte_free_pagetable() before setting up the new large page.
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Tested-by: default avatarRavi Murty <Ravi.Murty@intel.com>
      Tested-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
      Cc: stable@kernel.org [3.0+]
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6491d4d0
    • Vaibhav Bedia's avatar
      ARM: OMAP: Fix build breakage due to missing include in i2c.c · 18000985
      Vaibhav Bedia authored
      Merge commit 752451f0 ("Merge branch 'i2c-embedded/for-next' of
      git://git.pengutronix.de/git/wsa/linux") resulted in a build breakage
      for OMAP
      
        arch/arm/mach-omap2/i2c.c: In function 'omap_pm_set_max_mpu_wakeup_lat_compat':
        arch/arm/mach-omap2/i2c.c:130:2: error: implicit declaration of function 'omap_pm_set_max_mpu_wakeup_lat'
        make[1]: *** [arch/arm/mach-omap2/i2c.o] Error 1
      
      Fix this by including the appropriate header file with the function
      prototype.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      18000985
    • Linus Torvalds's avatar
      Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · b7dfde95
      Linus Torvalds authored
      Pull virtio update from Rusty Russell:
       "Some nice cleanups, and even a patch my wife did as a "live" demo for
        Latinoware 2012.
      
        There's a slightly non-trivial merge in virtio-net, as we cleaned up
        the virtio add_buf interface while DaveM accepted the mq virtio-net
        patches."
      
      * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (27 commits)
        virtio_console: Add support for remoteproc serial
        virtio_console: Merge struct buffer_token into struct port_buffer
        virtio: add drv_to_virtio to make code clearly
        virtio: use dev_to_virtio wrapper in virtio
        virtio-mmio: Fix irq parsing in command line parameter
        virtio_console: Free buffers from out-queue upon close
        virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
        virtio_console: Use kmalloc instead of kzalloc
        virtio_console: Free buffer if splice fails
        virtio: tools: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: scsi: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: rpmsg: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: net: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: console: make it clear that virtqueue_add_buf() no longer returns > 0
        virtio: make virtqueue_add_buf() returning 0 on success, not capacity.
        virtio: console: don't rely on virtqueue_add_buf() returning capacity.
        virtio_net: don't rely on virtqueue_add_buf() returning capacity.
        virtio-net: remove unused skb_vnet_hdr->num_sg field
        virtio-net: correct capacity math on ring full
        virtio: move queue_index and num_free fields into core struct virtqueue.
        ...
      b7dfde95
    • Linus Torvalds's avatar
      Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 03c850ec
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "This update contains overall only driver-specific fixes.  Slightly
        large LOC are seen in usb-audio driver for a couple of new device
        quirks and cs42l71 ASoC driver for enhanced features.  The others are
        a few small (regression) fixes HD-audio, and yet other small / trival
        ASoC fixes."
      
      * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: Support for Digidesign Mbox 2 USB sound card:
        ALSA: HDA: Fix sound resume hang
        ALSA: hda - bug fix for invalid connection list of Haswell HDMI codec pins
        ALSA: hda - Fix the wrong pincaps set in ALC861VD dallas/hp fixup
        ALSA: hda - Set codec->single_adc_amp flag for Realtek codecs
        ASoC: atmel-ssc: change disable to disable in dts node
        ASoC: Prevent pop_wait overwrite
        ALSA: usb-audio: ignore-quirk for HP Wireless Audio
        ALSA: hda - Always turn on pins for HDMI/DP
        ALSA: hda - Fix pin configuration of HP Pavilion dv7
        ASoC: core: Fix splitting of log messages
        ASoC: cs42l73: Change VSPIN/VSPOUT to VSPINOUT
        ASoC: cs42l73: Add DAPM events for power down.
        ASoC: cs42l73: Add DMIC's as DAPM inputs.
        ASoC: sigmadsp: Fix endianness conversion issue
        ASoC: tpa6130a2: Use devm_* APIs
      03c850ec
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi · 85d5b70d
      Linus Torvalds authored
      Pull UBI update from Artem Bityutskiy:
       "Nothing exciting, just clean-ups and nicification.  Oh, and one small
        optimization which makes UBI to use less RAM."
      
      * tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi:
        UBI: embed ubi_debug_info field in ubi_device struct
        UBI: introduce helpers dbg_chk_{io, gen}
        UBI: replace memcpy with struct assignment
        UBI: remove spurious comment
        UBI: gluebi: rename misleading variables
        UBI: do not allocate the memory unnecessarily
        UBI: use list_move_tail instead of list_del/list_add_tail
      85d5b70d
    • Linus Torvalds's avatar
      Merge tags 'disintegrate-h8300-20121219', 'disintegrate-m32r-20121219' and... · 43260ade
      Linus Torvalds authored
      Merge tags 'disintegrate-h8300-20121219', 'disintegrate-m32r-20121219' and 'disintegrate-score-20121220' of git://git.infradead.org/users/dhowells/linux-headers
      
      Pull UAPI disintegration for H8/300, M32R and Score from David Howells.
      
      Scripted UAPI patches for architectures that apparently never reacted to
      it on their own.
      
      * tag 'disintegrate-h8300-20121219' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/h8300/include/asm
      
      * tag 'disintegrate-m32r-20121219' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/m32r/include/asm
      
      * tag 'disintegrate-score-20121220' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/score/include/asm
      43260ade
    • Linus Torvalds's avatar
      Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris · 0c544501
      Linus Torvalds authored
      Pull CRIS changes from Jesper Nilsson.
      
      ... mainly the UAPI disintegration.
      
      * tag 'cris-for-linus-3.8' of git://jni.nu/cris:
        UAPI: Fix up empty files in arch/cris/
        CRIS: locking: fix the return value of arch_read_trylock()
        CRIS: use kbuild.h instead of defining macros in asm-offset.c
        UAPI: (Scripted) Disintegrate arch/cris/include/asm
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
      0c544501
    • Linus Torvalds's avatar
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1ffab3d4
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "This is a batch of fixes for arm-soc platforms, most of it is for OMAP
        but there are others too (i.MX, Tegra, ep93xx).  Fixes warnings, some
        broken platforms and drivers, etc.  A bit all over the map really."
      
      There was some concern about commit 68136b10 ("RM: sunxi: Change device
      tree naming scheme for sunxi"), but Tony says:
       "Looks like that's trivial to fix as needed, no need to rebuild the
        branch to fix that AFAIK.
      
        The fix can be done once Olof is available online again.
      
        Linus, I suggest that you go ahead and pull this if there are no other
        issues with this branch."
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        ARM: sunxi: Change device tree naming scheme for sunxi
        ARM: ux500: fix missing include
        ARM: u300: delete custom pin hog code
        ARM: davinci: fix build break due to missing include
        ARM: exynos: Fix warning due to missing 'inline' in stub
        ARM: imx: Move platform-mx2-emma to arch/arm/mach-imx/devices
        ARM i.MX51 clock: Fix regression since enabling MIPI/HSP clocks
        ARM: dts: mx27: Fix the AIPI bus for FEC
        ARM: OMAP2+: common: remove use of vram
        ARM: OMAP3/4: cpuidle: fix sparse and checkpatch warnings
        ARM: OMAP4: clock data: DPLLs are missing bypass clocks in their parent lists
        ARM: OMAP4: clock data: div_iva_hs_clk is a power-of-two divider
        ARM: OMAP4: Fix EMU clock domain always on
        ARM: OMAP4460: Workaround ABE DPLL failing to turn-on
        ARM: OMAP4: Enhance support for DPLLs with 4X multiplier
        ARM: OMAP4: Add function table for non-M4X dplls
        ARM: OMAP4: Update timer clock aliases
        ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
        ARM: dts: Add build target for omap4-panda-a4
        ARM: dts: OMAP2420: Correct H4 board memory size
        ...
      1ffab3d4
    • Linus Torvalds's avatar
      Merge tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf · ddedec28
      Linus Torvalds authored
      Pull dma-buf updates from Sumit Semwal:
       "A fairly small dma-buf pull request for 3.8 - only 2 patches"
      
      * tag 'tag-for-linus-3.8' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
        dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER
        dma-buf: might_sleep() in dma_buf_unmap_attachment()
      ddedec28
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 8cb68bdf
      Linus Torvalds authored
      Pull hwmon subsystem update from Jean Delvare:
       "There are many improvements to the it87 driver, as well as suspend
        support for the Winbond Super-I/O chips, and a few other fixes."
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon-vid: Add support for AMD family 11h to 15h processors
        hwmon: (it87) Support PECI for additional chips
        hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate
        hwmon: (it87) Manage device specific features with table
        hwmon: (it87) Replace pwm group macro with direct attribute definitions
        hwmon: (it87) Avoid quoted string splits across lines
        hwmon: (it87) Save fan registers in 2-dimensional array
        hwmon: (it87) Introduce support for tempX_offset sysfs attribute
        hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions
        hwmon: (it87) Save voltage register values in 2-dimensional array
        hwmon: (it87) Save temperature registers in 2-dimensional array
        hwmon: (w83627ehf) Get rid of smatch warnings
        hwmon: (w83627hf) Don't touch nonexistent I2C address registers
        hwmon: (w83627ehf) Add support for suspend
        hwmon: (w83627hf) Add support for suspend
        hwmon: Fix PCI device reference leak in quirk
      8cb68bdf
    • Hugh Dickins's avatar
      ksm: make rmap walks more scalable · b6b19f25
      Hugh Dickins authored
      The rmap walks in ksm.c are like those in rmap.c: they can safely be
      done with anon_vma_lock_read().
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b6b19f25
    • Hugh Dickins's avatar
      sched: numa: ksm: fix oops in task_numa_placment() · 2832bc19
      Hugh Dickins authored
      task_numa_placement() oopsed on NULL p->mm when task_numa_fault() got
      called in the handling of break_ksm() for ksmd.  That might be a
      peculiar case, which perhaps KSM could takes steps to avoid? but it's
      more robust if task_numa_placement() allows for such a possibility.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2832bc19
    • Zlatko Calusic's avatar
      mm: do not sleep in balance_pgdat if there's no i/o congestion · cda73a10
      Zlatko Calusic authored
      On a 4GB RAM machine, where Normal zone is much smaller than DMA32 zone,
      the Normal zone gets fragmented in time.  This requires relatively more
      pressure in balance_pgdat to get the zone above the required watermark.
      Unfortunately, the congestion_wait() call in there slows it down for a
      completely wrong reason, expecting that there's a lot of
      writeback/swapout, even when there's none (much more common).  After a
      few days, when fragmentation progresses, this flawed logic translates to
      a very high CPU iowait times, even though there's no I/O congestion at
      all.  If THP is enabled, the problem occurs sooner, but I was able to
      see it even on !THP kernels, just by giving it a bit more time to occur.
      
      The proper way to deal with this is to not wait, unless there's
      congestion.  Thanks to Mel Gorman, we already have the function that
      perfectly fits the job.  The patch was tested on a machine which nicely
      revealed the problem after only 1 day of uptime, and it's been working
      great.
      Signed-off-by: default avatarZlatko Calusic <zlatko.calusic@iskon.hr>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cda73a10
    • David Howells's avatar
      UAPI: Fix up empty files in arch/cris/ · 77c8006d
      David Howells authored
      Fix up three empty files in arch/cris/ by sticking placeholder comments in
      there to prevent the patch program from deleting them.
      
      I decided not to delete the arch-v*/Kbuild files as it's possibly someone might
      want to use them for genhdr-y lines in the future, but they could be deleted
      and the pointer lines removed from asm/Kbuild.  The uapi/arch-v*/Kbuild files
      ought to be uneffected by such a change.
      
      asm/swab.h didn't have anything outside of __KERNEL__ so nothing appeared in
      uapi/asm/swab.h.  The latter, however, is exported by Kbuild.asm.
      
      This needs to be applied after the CRIS UAPI disintegration patch.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      77c8006d
    • Wei Yongjun's avatar
      CRIS: locking: fix the return value of arch_read_trylock() · 00addd1a
      Wei Yongjun authored
      arch_write_trylock() should return 'ret' instead of always
      return 1.
      
      dpatch engine is used to auto generate this patch.
      (https://github.com/weiyj/dpatch)
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      00addd1a
    • Jesper Nilsson's avatar
      Merge tag 'disintegrate-cris-20121009' of... · e61ac0b0
      Jesper Nilsson authored
      Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2
      
      UAPI Disintegration 2012-10-09
      
      * tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/cris/include/asm
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
      e61ac0b0
    • James Hogan's avatar
      CRIS: use kbuild.h instead of defining macros in asm-offset.c · 8e6b4dd1
      James Hogan authored
      This is modelled on commits such as the one below:
      
      Commit fc1c3a00 ("sh: use kbuild.h
      instead of defining macros in asm-offsets.c") introduced in v2.6.26.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      8e6b4dd1
    • David Howells's avatar
    • Maarten Lankhorst's avatar
      dma-buf: remove fallback for !CONFIG_DMA_SHARED_BUFFER · ada65c74
      Maarten Lankhorst authored
      Documentation says that code requiring dma-buf should add it to
      select, so inline fallbacks are not going to be used. A link error
      will make it obvious what went wrong, instead of silently doing
      nothing at runtime.
      Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: default avatarRob Clark <rob.clark@linaro.org>
      Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
      ada65c74
    • Rob Clark's avatar
      dma-buf: might_sleep() in dma_buf_unmap_attachment() · b6fa0cd6
      Rob Clark authored
      We never really clarified if unmap could be done in atomic context.
      But since mapping might require sleeping, this implies mutex in use
      to synchronize mapping/unmapping, so unmap could sleep as well.  Add
      a might_sleep() to clarify this.
      Signed-off-by: default avatarRob Clark <rob@ti.com>
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
      b6fa0cd6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f01af9f8
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Please pull to get these sparc AES/DES/CAMELLIA crypto bug fixes as
        well as an addition of a pte_accessible() define for sparc64 and a
        hugetlb fix from Dave Kleikamp."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
        sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code.
        sparc64: Fix ECB looping constructs in AES code.
        sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
        sparc64: Fix AES ctr mode block size.
        sparc64: Fix unrolled AES 256-bit key loops.
        sparc64: Define pte_accessible()
        sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
      f01af9f8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9eb127cc
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Really fix tuntap SKB use after free bug, from Eric Dumazet.
      
       2) Adjust SKB data pointer to point past the transport header before
          calling icmpv6_notify() so that the headers are in the state which
          that function expects.  From Duan Jiong.
      
       3) Fix ambiguities in the new tuntap multi-queue APIs.  From Jason
          Wang.
      
       4) mISDN needs to use del_timer_sync(), from Konstantin Khlebnikov.
      
       5) Don't destroy mutex after freeing up device private in mac802154,
          fix also from Konstantin Khlebnikov.
      
       6) Fix INET request socket leak in TCP and DCCP, from Christoph Paasch.
      
       7) SCTP HMAC kconfig rework, from Neil Horman.
      
       8) Fix SCTP jprobes function signature, otherwise things explode, from
          Daniel Borkmann.
      
       9) Fix typo in ipv6-offload Makefile variable reference, from Simon
          Arlott.
      
      10) Don't fail USBNET open just because remote wakeup isn't supported,
          from Oliver Neukum.
      
      11) be2net driver bug fixes from Sathya Perla.
      
      12) SOLOS PCI ATM driver bug fixes from Nathan Williams and David
          Woodhouse.
      
      13) Fix MTU changing regression in 8139cp driver, from John Greene.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
        solos-pci: ensure all TX packets are aligned to 4 bytes
        solos-pci: add firmware upgrade support for new models
        solos-pci: remove superfluous debug output
        solos-pci: add GPIO support for newer versions on Geos board
        8139cp: Prevent dev_close/cp_interrupt race on MTU change
        net: qmi_wwan: add ZTE MF880
        drivers/net: Use of_match_ptr() macro in smsc911x.c
        drivers/net: Use of_match_ptr() macro in smc91x.c
        ipv6: addrconf.c: remove unnecessary "if"
        bridge: Correctly encode addresses when dumping mdb entries
        bridge: Do not unregister all PF_BRIDGE rtnl operations
        use generic usbnet_manage_power()
        usbnet: generic manage_power()
        usbnet: handle PM failure gracefully
        ksz884x: fix receive polling race condition
        qlcnic: update driver version
        qlcnic: fix unused variable warnings
        net: fec: forbid FEC_PTP on SoCs that do not support
        be2net: fix wrong frag_idx reported by RX CQ
        be2net: fix be_close() to ensure all events are ack'ed
        ...
      9eb127cc
    • Linus Torvalds's avatar
      Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of... · e3279550
      Linus Torvalds authored
      Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
      
      Pull devicetree, gpio and spi bugfixes from Grant Likely:
       "Device tree v3.8 bug fix:
         - Fixes an undefined struct device build error and a missing symbol
           export.
      
        GPIO device driver bug fixes:
         - gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
         - gpio/ich: Add missing spinlock init
      
        SPI device driver bug fixes:
         - Most of this is bug fixes to the core code and the sh-hspi and
           s3c64xx device drivers.
      
         - There is also a patch here to add DT support to the Atmel driver.
           This one should have been in the first round, but I missed it.
           It's a low risk change contained within a single driver and the
           Atmel maintainer has requested it."
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS
        of: Fix export of of_find_matching_node_and_match()
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
        gpio/ich: Add missing spinlock init
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        spi/sh-hspi: fix return value check in hspi_probe().
        spi: fix tegra SPI binding examples
        spi/atmel: add DT support
        of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.
        spi: Change FIFO flush operation and spi channel off
        spi: Keep chipselect assertion during one message
      e3279550
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · dcd6a97d
      Linus Torvalds authored
      Pull drm bugfix from Dave Airlie:
       "Just a single urgent regression fix, seeing a few wierd behaviours I'd
        like not to persist."
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
        drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling
      dcd6a97d
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 7005cd39
      Linus Torvalds authored
      Pull random updates from Ted Ts'o:
       "A few /dev/random improvements for the v3.8 merge window."
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: Mix cputime from each thread that exits to the pool
        random: prime last_data value per fips requirements
        random: fix debug format strings
        random: make it possible to enable debugging without rebuild
      7005cd39
  2. 19 Dec, 2012 13 commits