1. 28 Nov, 2012 25 commits
  2. 25 Nov, 2012 4 commits
  3. 24 Nov, 2012 2 commits
  4. 23 Nov, 2012 9 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 5e351cdc
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'pm-for-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · a0543d64
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'md-3.7-fixes' of git://neil.brown.name/md · 1d838d70
      Linus Torvalds authored
      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.
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · a8946afe
      Linus Torvalds authored
      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
    • Andreas Larsson's avatar
      of/address: sparc: Declare of_iomap as an extern function for sparc again · 0e622d39
      Andreas Larsson authored
      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: default avatarAndreas Larsson <andreas@gaisler.com>
      Acked-by: default avatarDavid Miller <davem@davemloft.net>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
    • Linus Torvalds's avatar
      Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux · f789dcc7
      Linus Torvalds authored
      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()
    • Linus Torvalds's avatar
      Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux · 33f14593
      Linus Torvalds authored
      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