1. 06 3月, 2012 12 次提交
    • A
      drm, gma500: Fix Cedarview boot failures in 3.3-rc · 055bf38d
      Alan Cox 提交于
      Production GMA3600/3650 hardware turns out to be subtly different to the
      development platforms.  This combined with a minor driver bug is causing
      the kernel to hang on these platforms.
      
      This patch does the following
      
       - turn down a couple of messages that were meant to be debug and are
         causing much confusion
      
       - ensure the hotplug interrupt is disabled on Cedartrail systems.
      
       - fix a bug where gtt roll mode called psbfb_sync, which tries to sync
         the 2D engine. On other devices it is harmless as the 2D engine is
         present but not in use when in gtt roll mode, on Cedartrail it causes
         a hang
      
      Without these changes 3.3-rc hangs on boot on Cedartrail based systems.
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      055bf38d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · aa139092
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
      1) TCP SACK processing can calculate an incorrect reordering value in
         some cases, fix from Neal Cardwell.
      
      2) tcp_mark_head_lost() can split SKBs in situations where it should
         not, violating send queue invariants expected by other pieces of
         code and thus resulting (eventually) in corrupted retransmit state
         counters.  Also from Neal Cardwell.
      
      3) qla3xxx erroneously calls spin_lock_irqrestore() with constant
         hw_flags of zero.  Fix from Santosh Nayak.
      
      4) Fix NULL deref in rt2x00, from Gabor Juhos.
      
      5) pch_gbe passes address of wrong typed object to pch_gbe_validate_option
         thus corrupting part of the value.  From Dan Carpenter.
      
      6) We must check the return value of nlmsg_parse() before trying to use
         the results.  From Eric Dumazet.
      
      7) Bridging code fails to check return value of ipv6_dev_get_saddr()
         thus potentially leaving uninitialized garbage in the outgoing ipv6
         header.  From Ulrich Weber.
      
      8) Due to rounding and a reversed operation on jiffies, bridge message
         ages can go backwards instead of forwards, thus breaking STP.  Fixes
         from Joakim Tjernlund.
      
      9) r8169 modifies Config* registers without properly holding the
         Config9346 lock, resulting in corrupted IP fragments on some chips.
         Fix from Francois Romieu.
      
      10) NET_PACKET_ENGINE default wan't set properly during the network
         driver mega-move.  Fix from Stephen Hemminger.
      
      11) vmxnet3 uses TCP header size where it actually should use the UDP
         header size, fix from Shreyas Bhatewara.
      
      12) Netfilter bridge module autoload is busted in the compat case, fix
         from Florian Westphal.
      
      13) Wireless Key removal was not setting multicast bits correctly thus
         accidently killing the unicast key 0 and thus all traffic stops.
         Fix from Johannes Berg.
      
      14) Fix endless retries of A-MPDU transmissions in brcm80211 driver.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (22 commits)
        qla3xxx: ethernet: Fix bogus interrupt state flag.
        bridge: check return value of ipv6_dev_get_saddr()
        rtnetlink: fix rtnl_calcit() and rtnl_dump_ifinfo()
        bridge: message age needs to increase, not decrease.
        bridge: Adjust min age inc for HZ > 256
        tcp: don't fragment SACKed skbs in tcp_mark_head_lost()
        r8169: corrupted IP fragments fix for large mtu.
        packetengines: fix config default
        vmxnet3: Fix transport header size
        enic: fix an endian bug in enic_probe()
        pch_gbe: memory corruption calling pch_gbe_validate_option()
        tg3: Fix tg3_get_stats64 for 5700 / 5701 devs
        tcp: fix false reordering signal in tcp_shifted_skb
        tcp: fix comment for tp->highest_sack
        netfilter: bridge: fix module autoload in compat case
        brcm80211: smac: only print block-ack timeout message at trace level
        brcm80211: smac: fix endless retry of A-MPDU transmissions
        mac80211: Fix a warning on changing to monitor mode from STA
        mac80211: zero initialize count field in ieee80211_tx_rate
        iwlwifi: fix key removal
        ...
      aa139092
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci · 4f0449e2
      Linus Torvalds 提交于
      Pull PCI fixes from Jesse Barnes:
       "A couple of fixes for booting specific machines, and one for a minor
        memory leak on pre-_CRS platforms."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
        x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version
        x86/PCI: use host bridge _CRS info on MSI MS-7253
        PCI: fix memleak when ACPI _CRS is not used.
      4f0449e2
    • L
      Merge branch 'for-3.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 789ce9b9
      Linus Torvalds 提交于
      Pull per-cpu patches from Tejun Heo:
       "This pull request contains four patches.  One replaces manual clearing
        with bitmap_clear(), two fix generic definition of __this_cpu ops so
        that they don't choose unnecessarily strict arch version.  One makes
        _this_cpu definition use raw_local_irq_*() so that it doesn't end up
        wrecking irq on/off state tracking when used from inside lockdep.
      
        Of the four patches, the raw_local_irq_*() update is the most
        important, so please feel free to cherry pick only that one patch and
        ignore the rest if you want to - commit e920d597 'percpu: use
        raw_local_irq_* in _this_cpu op'."
      
      * 'for-3.3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: fix __this_cpu_{sub,inc,dec}_return() definition
        percpu: use raw_local_irq_* in _this_cpu op
        percpu: fix generic definition of __this_cpu_add_and_return()
        percpu: use bitmap_clear
      789ce9b9
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3a81a6e7
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "What's in there: a number of MIPS fixes and touchups.  The most
        important change in this pull request is Kautuk Consul's port of
        changes to do_page_fault which fix a hang that affects some
        configurations.  Still not quite ready for a release, there are
        problems with 64-bit platforms."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: traps.c: Fix typo
        MIPS: PowerTV: Fix defconfigs for coverage builds
        MIPS: Netlogic: Fix defconfigs for coverage builds
        MIPS: ATH79: Avoid a kernel bug on AR913X
        MIPS: PCI: use list_for_each_entry() for bus->devices traversal
        MIPS: fault.c: Port OOM changes to do_page_fault
        MIPS: vmlinux.lds.S: remove duplicate _sdata symbol
        MIPS: Alchemy: Increase minimum timeout for 32kHz timer.
        MIPS: txx9 7segled fix struct device has no member
        MIPS: Alchemy: Update Au1300 inlined GPIO macros
        MIPS: Remove temporary kludge from <asm/page.h>
        MIPS: BMIPS: smp-bmips.c does not need to include version.h
      3a81a6e7
    • A
      flush_tlb_range() needs ->page_table_lock when ->mmap_sem is not held · cd2934a3
      Al Viro 提交于
      All other callers already hold either ->mmap_sem (exclusive) or
      ->page_table_lock.  And we need it because some page table flushing
      instanced do work explicitly with ge tables.
      
      See e.g.  arch/powerpc/mm/tlb_hash32.c, flush_tlb_range() and
      flush_range() in there.  The same goes for uml, with a lot more
      extensive playing with page tables.
      
      Almost all callers are actually fine - flush_tlb_range() may have no
      need to bother playing with page tables, but it can do so safely; again,
      this caller is the sole exception - everything else either has exclusive
      ->mmap_sem on the mm in question, or mm->page_table_lock is held.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cd2934a3
    • A
      835ee797
    • A
    • S
      qla3xxx: ethernet: Fix bogus interrupt state flag. · 9d1dfc06
      Santosh Nayak 提交于
      In 'ql_adapter_initialize'
      the first call for 'spin_unlock_irqrestore()' is with hw_flags = 0,
      which is as good as 'spin_unlock_irq()' (unconditional interrupt
      enabling). If this is intended, then for better performance
      'spin_unlock_irqrestore()' can be replaced with 'spin_unlock_irq()'
      and 'spin_lock_irqsave()' can be replaced by 'spin_lock_irq()
      Signed-off-by: NSantosh Nayak <santoshprasadnayak@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9d1dfc06
    • U
      bridge: check return value of ipv6_dev_get_saddr() · d1d81d4c
      Ulrich Weber 提交于
      otherwise source IPv6 address of ICMPV6_MGM_QUERY packet
      might be random junk if IPv6 is disabled on interface or
      link-local address is not yet ready (DAD).
      Signed-off-by: NUlrich Weber <ulrich.weber@sophos.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d1d81d4c
    • L
      Merge tag 'mmc-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 550cf00d
      Linus Torvalds 提交于
      MMC fixes from Chris Ball for 3.3:
       - atmel-mci: oops fix against regression introduced in 3.2
       - core: power saving regression fix against 3.3-rc1
       - core: suspend/resume fix for UHS-I cards
       - esdhc-imx: MMC card regression fix against 3.0
       - mmci: oops fix for ARM systems with large (64k) pages
       - MAINTAINERS update for atmel-mci.
      
      * tag 'mmc-fixes-for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
        mmc: core: Fixup suspend/resume issues for UHS-I cards
        mmc: mmci: reduce max_blk_count to avoid overflowing max_req_size
        mmc: sdhci-esdhc-imx: fix for mmc cards on i.MX5
        mmc: core: fix regression: set default clock gating delay to 0
        MAINTAINERS: hand over atmel-mci (sd/mmc interface)
        mmc: atmel-mci: don't use dma features when using DMA with no chan available
      550cf00d
    • L
      Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 5d329e24
      Linus Torvalds 提交于
      Pull from Jiri Kosina:
       "Please pull to receive updates for HID layer.  Nikolai's patch is
        rather important and should still go in for 3.3, as it's a regression
        fix for commit b4b583d4."
      
      * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: hid-input: allow array fields out of range
        HID: usbhid: Add NOGET quirk for the AIREN Slim+ keyboard
      5d329e24
  2. 05 3月, 2012 12 次提交
  3. 04 3月, 2012 6 次提交
  4. 03 3月, 2012 10 次提交