Skip to content
  1. Oct 20, 2012
    • Linus Torvalds's avatar
      kbuild: Fix module signature generation · b05e585d
      Linus Torvalds authored
      Rusty had clearly not actually tested his module signing changes that I
      (trustingly) applied as commit e2a666d5
      
       ("kbuild: sign the modules
      at install time"). That commit had multiple bugs:
      
       - using "${#VARIABLE}" to get the number of characters in a shell
         variable may look clever, but it's locale-dependent: it returns the
         number of *characters*, not bytes. And we do need bytes.
      
         So don't use "${#..}" expansion, do the stupid "wc -c" thing instead
         (where "c" stands for "bytes", not "characters", despite the letter.
      
       - Rusty had confused "siglen" and "signerlen", and his conversion
         didn't set "signerlen" at all, and incorrectly set "siglen" to the
         size of the signer, not the size of the signature.
      
      End result: the modified sign-file script did create something that
      superficially *looked* like a signature, but didn't actually work at
      all, and would fail the signature check. Oops.
      
      Tssk, tssk, Rusty.
      
      But Rusty was definitely right that this whole thing should be rewritten
      in perl by somebody who has the perl-fu to do so.  That is not me,
      though - I'm just doing an emergency fix for the shell script.
      
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b05e585d
    • Linus Torvalds's avatar
      xen: Fix annoying compile-time warning · 16757372
      Linus Torvalds authored
      Commit cb6b6df1
      
       ("xen/pv-on-hvm kexec: add quirk for Xen 3.4 and
      shutdown watches.") added the xen_strict_xenbus_quirk() function with an
      old K&R-style declaration without proper typing, causing gcc to rightly
      complain:
      
        drivers/xen/xenbus/xenbus_xs.c:628:13: warning: function declaration isn’t a prototype [-Wstrict-prototypes]
      
      because we really don't live in caves using stone-age tools any more,
      and the kernel has always used properly typed ANSI C function
      declarations.
      
      So if a function doesn't take arguments, we tell the compiler so
      explicitly by adding the proper "void" in the prototype.
      
      I'm sure there are tons of other examples of this kind of stuff in the
      tree, but this is the one that hits my workstation config, so..
      
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      16757372
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · e80bd270
      Linus Torvalds authored
      Pull hwmon fixes from Guenter Roeck:
       "Drop some leftover dependencies on CONFIG_EXPERIMENTAL, and add
        support for Intel Atom CE4110/4150/4170."
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (coretemp) Add support for Atom CE4110/4150/4170
        Documentation/hwmon: remove CONFIG_EXPERIMENTAL
        hwmon: (pmbus) remove CONFIG_EXPERIMENTAL
      e80bd270
    • Linus Torvalds's avatar
      Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · ccfc2730
      Linus Torvalds authored
      
      
      Pull TTY fixes from Greg Kroah-Hartman:
       "Here are some tty and serial driver fixes for your 3.7-rc1 tree.
      
        Again, the UABI header file fixes, and a number of build and runtime
        serial driver bugfixes that solve problems people have been reporting
        (the staging driver is a tty driver, hence the fixes coming in through
        this tree.)
      
        All of these have been in the linux-next tree for a while.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        staging: dgrp: check return value of alloc_tty_driver
        staging: dgrp: check for NULL pointer in (un)register_proc_table
        serial/8250_hp300: Missing 8250 register interface conversion bits
        UAPI: (Scripted) Disintegrate include/linux/hsi
        tty: serial: sccnxp: Fix bug with unterminated platform_id list
        staging: serial: dgrp: Add missing #include <linux/uaccess.h>
        serial: sccnxp: Allows the driver to be compiled as a module
        tty: Fix bogus "callbacks suppressed" messages
        net, TTY: initialize tty->driver_data before usage
      ccfc2730
    • Linus Torvalds's avatar
      Merge tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 42bf3e27
      Linus Torvalds authored
      
      
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are the USB patches against your 3.7-rc1 tree.
      
        There are the usual UABI header file movements, and we finally are now
        able to remove the dbg() macro that is over 15 years old (that had to
        wait for after some other trees got merged into yours during the big
        3.7-rc1 merge window.)
      
        Other than that, nothing major, just a number of bugfixes and new
        device ids.  It turns out that almost all of the usb-serial drivers
        had bugs in how they were handling their internal data, leaking
        memory, hence all of those fixups.
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">
      
      * tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (42 commits)
        USB: option: add more ZTE devices
        USB: option: blacklist net interface on ZTE devices
        usb: host: xhci: New system added for Compliance Mode Patch on SN65LVPE502CP
        USB: io_ti: fix sysfs-attribute creation
        USB: iuu_phoenix: fix sysfs-attribute creation
        USB: spcp8x5: fix port-data memory leak
        USB: ssu100: fix port-data memory leak
        USB: ti_usb_3410_5052: fix port-data memory leak
        USB: oti6858: fix port-data memory leak
        USB: iuu_phoenix: fix port-data memory leak
        USB: kl5kusb105: fix port-data memory leak
        USB: io_ti: fix port-data memory leak
        USB: keyspan_pda: fix port-data memory leak
        USB: f81232: fix port-data memory leak
        USB: io_edgeport: fix port-data memory leak
        USB: kobil_sct: fix port-data memory leak
        USB: cypress_m8: fix port-data memory leak
        usb: acm: fix the computation of the number of data bits
        usb: Missing dma_mask in ehci-vt8500.c when probed from device-tree
        usb: Missing dma_mask in uhci-platform.c when probed from device-tree
        ...
      42bf3e27
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel · fb06de04
      Linus Torvalds authored
      Pull hexagon updates from Richard Kuo:
       "It includes the Hexagon UAPI changes from David Howells and some CR
        marking changes for the transition from Code Aurora to Linux
        Foundation."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
        Hexagon: Copyright marking changes
        UAPI: (Scripted) Disintegrate arch/hexagon/include/asm
      fb06de04
    • Linus Torvalds's avatar
      Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 · 22054fbe
      Linus Torvalds authored
      
      
      Pull PARISC changes from James Bottomley:
       "This is a couple of high code motion patches (all within arch/parisc)
        I'd like to apply at -rc1 to avoid conflicts with anything else.  One
        moves us on to the generated instead of included asm file model and
        the other is a pull request from David Howells for UAPI
        disintegration.
      
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com&gt;">
      
      * tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
        UAPI: (Scripted) Disintegrate arch/parisc/include/asm
        [PARISC] asm: redo generic includes
      22054fbe
    • Rafael J. Wysocki's avatar
      MAINTAINERS: Add Rafael's address to ACPI maintainers · ea26d0cf
      Rafael J. Wysocki authored
      
      
      Since I will be maintaining ACPI together with Len from now on, add my
      address to the ACPI maintainers list in the MAINTAINERS file (this is
      the address to send patches to).
      
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Acked-by: default avatarLen Brown <len.brown@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ea26d0cf
    • Linus Torvalds's avatar
      Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux · 90cdb1a0
      Linus Torvalds authored
      Pull nfsd bugfixes from J Bruce Fields.
      
      * 'for-3.7' of git://linux-nfs.org/~bfields/linux:
        SUNRPC: Prevent kernel stack corruption on long values of flush
        NLM: nlm_lookup_file() may return NLMv4-specific error codes
      90cdb1a0
    • Ben Collins's avatar
      USB: ehci-fsl: Return valid error in ehci_fsl_setup_phy · d479c911
      Ben Collins authored
      ehci_fsl_setup_phy is supposed to return an int, but had a void return
      value in the case of controller_ver being invalid.
      
      Introduced by commit 3735ba8d
      
       ("powerpc/usb: fix bug of CPU hang
      when missing USB PHY clock"), which missed one return.
      
      Signed-off-by: default avatarBen Collins <ben.c@servergy.com>
      Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d479c911
    • James Bottomley's avatar
      Merge tag 'disintegrate-parisc-20121016' into for-linus · 6238559f
      James Bottomley authored
      
      
      UAPI Disintegration 2012-10-16
      
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
      6238559f
  2. Oct 19, 2012
    • Rusty Russell's avatar
      kbuild: sign the modules at install time · e2a666d5
      Rusty Russell authored
      
      
      Linus deleted the old code and put signing on the install command,
      I fixed it to extract the keyid and signer-name within sign-file
      and cleaned up that script now it always signs in-place.
      
      Some enthusiast should convert sign-key to perl and pull
      x509keyid into it.
      
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e2a666d5
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · c9623de4
      Linus Torvalds authored
      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
    • Richard Kuo's avatar
      Hexagon: Copyright marking changes · e1858b2a
      Richard Kuo authored
      
      
      Code Aurora Forum (CAF) is becoming a part of Linux Foundation Labs.
      
      Signed-off-by: default avatarRichard Kuo <rkuo@codeaurora.org>
      e1858b2a
    • David Howells's avatar
    • Jussi Kivilinna's avatar
      crypto: aesni - fix XTS mode on x86-32, add wrapper function for asmlinkage aesni_enc() · 32bec973
      Jussi Kivilinna authored
      
      
      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: default avatarKrzysztof Kolasa <kkolasa@winsoft.pl>
      Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      32bec973
    • David Rientjes's avatar
      fs, xattr: fix bug when removing a name not in xattr list · 43385846
      David Rientjes authored
      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: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarAristeu Rozanski <aris@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      43385846
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d63e210e
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · a0a6a39e
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'dt-fixes-for-3.7' of git://sources.calxeda.com/kernel/linux · bab58350
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · ec351832
      Linus Torvalds authored
      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
  3. Oct 18, 2012