1. 11 12月, 2012 7 次提交
  2. 08 12月, 2012 7 次提交
  3. 04 12月, 2012 2 次提交
  4. 28 11月, 2012 2 次提交
  5. 27 11月, 2012 2 次提交
  6. 26 11月, 2012 5 次提交
    • L
      Linux 3.7-rc7 · 9489e9dc
      Linus Torvalds 提交于
      9489e9dc
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 08e627b5
      Linus Torvalds 提交于
      Pull powerpc EEH bugfixes from Benjamin Herrenschmidt.
      
      Two one-liner fixes for the new EEH code.
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/eeh: Do not invalidate PE properly
        powerpc/pseries: Fix oops with MSIs when missing EEH PEs
      08e627b5
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · c2a65d3d
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Three issues fixed accross the field:
      
         - Some functions that were recently outlined as part of a preemption
           fix were causing problems with function tracing.
         - The recently merged in-kernel MPI library uses very outdated
           headers that contain MIPS-specific code which won't build on with
           gcc 4.4 or newer.
         - The MIPS non-NUMA memory initialization was making only a very
           half-baked attempt at merging adjacent memory ranges.  This kept
           the code simple enough but is now causing issues with kexec."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MPI: Fix compilation on MIPS with GCC 4.4 and newer
        MIPS: Fix crash that occurs when function tracing is enabled
        MIPS: Merge overlapping bootmem ranges
      c2a65d3d
    • G
      powerpc/eeh: Do not invalidate PE properly · e716e014
      Gavin Shan 提交于
      While the EEH does recovery on the specific PE that has PCI errors,
      the PCI devices belonging to the PE will be removed and the PE will
      be marked as invalid since we still need the information stored in
      the PE. We only invalidate the PE when it doesn't have associated
      EEH devices and valid child PEs. However, the code used to check
      that is wrong. The patch fixes that.
      Signed-off-by: NGavin Shan <shangw@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      e716e014
    • C
      Revert "drm/i915: enable rc6 on ilk again" · 6567d748
      Chris Wilson 提交于
      Even with the cumulative set of ilk w/a, rc6 is demonstrably still
      failing and causing GPU hangs as found by Peter Wu. So we need to disable
      it again until it is stable.
      
      This reverts
      
      commit 456470eb
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Wed Aug 8 23:35:40 2012 +0200
      
          drm/i915: enable rc6 on ilk again
      
      and the follow-on
      
      commit cd7988ee
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Sun Aug 26 20:33:18 2012 +0200
      
          drm/i915: disable rc6 on ilk when vt-d is enabled
      
      Note: The situation around the gen4/5 gpu hangs that cropped up in 3.7
      is rather strange. Most useful bisects have lead to
      
      commit 6c085a72
      Author: Chris Wilson <chris@chris-wilson.co.uk>
      Date:   Mon Aug 20 11:40:46 2012 +0200
      
          drm/i915: Track unbound pages
      
      or even later commits that affect the gem bo recycling, which all is
      way past the point where we re-enabled rc6. But somehow
      reverting/disabling those commits doesn't help, but disabling rc6 at
      least helps for many hangs on ilk. Obviously it doesn't change
      anything at all on gen4, and there are still strange issues left on
      gen5 (which we unfortunately can't readily reproduce).
      
      Also, the error_state signature of the hangs which can be fixed with
      this patch look remarkably different to those which seem to be
      unaffected by the rc6 settings: The rc6 hangs are in the ring,
      somewhere in the MI_FLUSH/PIPE_CONTROL sequence to make ilk coherent,
      wheras all the other hangs tend to be at a random point in the middle
      of the user batch. So it could also be that we have different issues.
      
      Until we grow more clue, this at least helps some users.
      Reported-by: NPeter Wu <lekensteyn@gmail.com>
      References: https://bugs.freedesktop.org/show_bug.cgi?id=55984Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      [danvet: Added note with some more details about the gen4/5 3.7
      gpu hang regression.]
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      6567d748
  7. 25 11月, 2012 1 次提交
  8. 24 11月, 2012 14 次提交
    • T
      ALSA: hda - Fix build without CONFIG_PM · d846b174
      Takashi Iwai 提交于
      I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM
      Reported-by: NMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      d846b174
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds 提交于
      Pull x86 arch fixes from Peter Anvin:
       "Here is a collection of fixes for 3.7-rc7.  This is a superset of
        tglx' earlier pull request."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix ordering of CFI directives and recent ASM_CLAC additions
        x86, microcode, AMD: Add support for family 16h processors
        x86-32: Export kernel_stack_pointer() for modules
        x86-32: Fix invalid stack address while in softirq
        x86, efi: Fix processor-specific memcpy() build error
        x86: remove dummy long from EFI stub
        x86, mm: Correct vmflag test for checking VM_HUGETLB
        x86, amd: Disable way access filter on Piledriver CPUs
        x86/mce: Do not change worker's running cpu in cmci_rediscover().
        x86/ce4100: Fix PCI configuration register access for devices without interrupts
        x86/ce4100: Fix reboot by forcing the reboot method to be KBD
        x86/ce4100: Fix pm_poweroff
        MAINTAINERS: Update email address for Robert Richter
        x86, microcode_amd: Change email addresses, MAINTAINERS entry
        MAINTAINERS: Change Boris' email address
        EDAC: Change Boris' email address
        x86, AMD: Change Boris' email address
      2654ad44
    • L
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds 提交于
      Pull MTD fixes from David Woodhouse:
       "The most important part of this is that it fixes a regression in
        Samsung NAND chip detection, introduced by some rework which went into
        3.7.  The initial fix wasn't quite complete, so it's in two parts.  In
        fact the first part is committed twice (Artem committed his own copy
        of the same patch) and I've merged Artem's tree into mine which
        already had that fix.
      
        I'd have recommitted that to make it somewhat cleaner, but figured by
        this point in the release cycle it was better to merge *exactly* the
        commits which have been in linux-next.
      
        If I'd recommitted, I'd also omit the sparse warning fix.  But it's
        there, and it's harmless — just marking one function as 'static' in
        onenand code.
      
        This also includes a couple more fixes for stable: an AB-BA deadlock
        in JFFS2, and an invalid range check in slram."
      
      * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
        mtd: nand: fix Samsung SLC detection regression
        mtd: nand: fix Samsung SLC NAND identification regression
        jffs2: Fix lock acquisition order bug in jffs2_write_begin
        mtd: onenand: Make flexonenand_set_boundary static
        mtd: slram: invalid checking of absolute end address
        mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
        mtd: nand: fix Samsung SLC NAND identification regression
      35f95d22
    • L
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 5e351cdc
      Linus Torvalds 提交于
      Pull device tree regression fix from Grant Likely:
       "Simple build regression fix for DT device drivers on Sparc.  An
        earlier change had masked out the of_iomap() helper on SPARC."
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of/address: sparc: Declare of_iomap as an extern function for sparc again
      5e351cdc
    • L
      Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · a0543d64
      Linus Torvalds 提交于
      Pull power management update from Rafael Wysocki:
       "Fix for an incorrect error condition check in device PM QoS code that
        may lead to an Oops from Guennadi Liakhovetski."
      
      * tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / QoS: fix wrong error-checking condition
      a0543d64
    • L
      Merge tag 'md-3.7-fixes' of git://neil.brown.name/md · 1d838d70
      Linus Torvalds 提交于
      Pull md fixes from NeilBrown:
       "Several bug fixes for md in 3.7:
      
         - raid5 discard has problems
         - raid10 replacement devices have problems
         - bad block lock seqlock usage has problems
         - dm-raid doesn't free everything"
      
      * tag 'md-3.7-fixes' of git://neil.brown.name/md:
        md/raid10: decrement correct pending counter when writing to replacement.
        md/raid10: close race that lose writes lost when replacement completes.
        md/raid5: Make sure we clear R5_Discard when discard is finished.
        md/raid5: move resolving of reconstruct_state earlier in stripe_handle.
        md/raid5: round discard alignment up to power of 2.
        md: make sure everything is freed when dm-raid stops an array.
        md: Avoid write invalid address if read_seqretry returned true.
        md: Reassigned the parameters if read_seqretry returned true in func md_is_badblock.
      1d838d70
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · a8946afe
      Linus Torvalds 提交于
      Pull block layer fixes from Jens Axboe:
       "Distilled down version of bug fixes for 3.7.  The patches have been
        well tested.  If you notice that commit dates are from today, it's
        because I pulled less important bits out and shuffled them into the
        3.8 mix.  Apart from that, no changes, base still the same.
      
        It contains:
      
         - Fix for aoe, don't run request_fn while it's plugged.
      
         - Fix for a regression in floppy since 3.6, which causes problems if
           no floppy is found.
      
         - Stable fix for blk_exec(), don't touch a request after it has been
           sent to the scheduler (and the device as well).
      
         - Five fixes for various nasties in mtip32xx."
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: Don't access request after it might be freed
        mtip32xx: Fix padding issue
        aoe: avoid running request handler on plugged queue
        mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function()
        mtip32xx: fix shift larger than type warning
        mtip32xx: Fix incorrect mask used for erase mode
        mtip32xx: Fix to make lba address correct in big-endian systems
        mtip32xx: fix potential crash on SEC_ERASE_UNIT
        dm: fix deadlock with request based dm and queue request_fn recursion
        floppy: destroy floppy workqueue before cleaning up the queue
      a8946afe
    • A
      of/address: sparc: Declare of_iomap as an extern function for sparc again · 0e622d39
      Andreas Larsson 提交于
      This bug-fix makes sure that of_iomap is defined extern for sparc so that the
      sparc-specific implementation of_iomap is once again used when including
      include/linux/of_address.h in a sparc context. OF_GPIO that is now available for
      sparc relies on this.
      
      The bug was inadvertently introduced in a850a755, "of/address: add empty static
      inlines for !CONFIG_OF", that added a static dummy inline for of_iomap when
      !CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for sparc, but
      there is a sparc-specific implementation /arch/sparc/kernel/of_device_common.c.
      
      This fix takes the same approach as 0bce04be that solved the equivalent problem
      for of_address_to_resource.
      Signed-off-by: NAndreas Larsson <andreas@gaisler.com>
      Acked-by: NDavid Miller <davem@davemloft.net>
      Signed-off-by: NGrant Likely <grant.likely@secretlab.ca>
      0e622d39
    • L
      Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux · f789dcc7
      Linus Torvalds 提交于
      Pull omapdss fixes from Tomi Valkeinen:
       "Here are a few OMAPDSS fixes for the next -rc.  I'm sending these
        directly to you, and quite late, as the fbdev tree maintainer
        (Florian) has been busy with his work and hasn't had time to manage
        the fb patches."
      
      * tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux:
        OMAPDSS: do not fail if dpll4_m4_ck is missing
        OMAPFB: Fix possible null pointer dereferencing
        OMAPDSS: HDMI: fix missing unlock on error in hdmi_dump_regs()
        omapdss: dss: Fix clocks on OMAP363x
        OMAPDSS: DSI: fix dsi_get_dsidev_from_id()
      f789dcc7
    • L
      Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux · 33f14593
      Linus Torvalds 提交于
      Pull i2c fixes from Wolfram Sang:
       "Bugfixes for the i2c subsystem.
      
        Except for a few one-liners, there is mainly one revert because of an
        overlooked dependency.  Since there is no linux-next at the moment, I
        did some extra testing, and all was fine for me."
      
      * 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux:
        i2c: mxs: Handle i2c DMA failure properly
        i2c: s3c2410: Fix code to free gpios
        i2c: omap: ensure writes to dev->buf_len are ordered
        Revert "ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints"
        i2c: at91: fix SMBus quick command
      33f14593
    • L
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · f470b8c2
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "The highlight of this update is the fixes for ASoC kirkwood by
        Russell.  In addition to that, a couple of regression fixes for
        HD-audio due to the runtime PM support on 3.7, and other driver-
        specific regression fixes like USB MIDI on non-standard USB audio
        drivers."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: snd-usb: properly initialize the sync endpoint
        ALSA: hda - Cirrus: Correctly clear line_out_pins when moving to speaker
        ALSA: hda - Add support for Realtek ALC292
        ASoC: kirkwood-i2s: more pause-mode fixes
        ASoC: kirkwood-i2s: fix DMA underruns
        ASoC: kirkwood-i2s: fix DCO lock detection
        ASoC: kirkwood-dma: don't ignore other irq causes on error
        ASoC: kirkwood-dma: fix use of virt_to_phys()
        ALSA: hda - Limit runtime PM support only to known Intel chips
        ALSA: hda - Fix recursive suspend/resume call
        ALSA: ua101, usx2y: fix broken MIDI output
        ASoC: arizona: Fix typo - Swap value in 48k_rates[] and 44k1_rates[]
        ASoC: bells: Fix up git patch application failure
        ASoC: cs4271: free allocated GPIO
      f470b8c2
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · eb5aaedd
      Linus Torvalds 提交于
      Pull networkign fixes from David Miller:
       "Networking bug fixes, Cacio e Pepe edition:
      
        1) BNX2X accidently accesses chip rev specific registers without an
           appropriate guard, fix from Ariel Elior.
      
        2) When we removed the routing cache, we set ip_rt_max_size to ~0 just
           to keep reporting a value to userspace via sysfs.  But the ipv4
           IPSEC layer was using this to tune itself which is completely bogus
           to now do.  Fix from Steffen Klassert.
      
        3) Missing initialization in netfilter ipset code from Jozsef
           Kadlecsik.
      
        4) Check CTA_TIMEOUT_NAME length properly in netfilter cttimeout code,
           fix from Florian Westphal.
      
        5) After removing the routing cache, we inadvertantly are caching
           multicast routes that end up looping back locally, we cannot do
           that legitimately any more.  Fix from Julian Anastasov.
      
        6) Revert a race fix for 8139cp qemu/kvm that doesn't actually work
           properly on real hardware.  From Francois Romieu.
      
        7) Fixup errors in example command lines in VXLAN device docs."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        bnx2x: remove redundant warning log
        vxlan: fix command usage in its doc
        8139cp: revert "set ring address before enabling receiver"
        ipv4: do not cache looped multicasts
        netfilter: cttimeout: fix buffer overflow
        netfilter: ipset: Fix range bug in hash:ip,port,net
        xfrm: Fix the gc threshold value for ipv4
      eb5aaedd
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f3a443af
      Linus Torvalds 提交于
      Pull sparc fix from David Miller:
       "Bug fix from Al Viro"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: not any error from do_sigaltstack() should fail rt_sigreturn()
      f3a443af
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 45aaff06
      Linus Torvalds 提交于
      Pull one more ARM SoC fix from Olof Johansson:
       "I missed one pull request from Samsung with one fix in the previous
        batch.  Here it is -- a dma driver fix for an early version of silicon
        that they still support."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOC
      45aaff06