1. 19 Oct, 2012 15 commits
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-linux · 17dbe27d
      Linus Torvalds authored
      Pull Xtensa patchset from Chris Zankel:
       "These are all limited to the xtensa subtree and include some important
        changes (adding long missing system calls for newer libc versions and
        other fixes) and the UAPI changes"
      
      * tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-linux:
        xtensa: add missing system calls to the syscall table
        xtensa: minor compiler warning fix
        xtensa: Use Kbuild infrastructure to handle asm-generic headers
        UAPI: (Scripted) Disintegrate arch/xtensa/include/asm
        xtensa: fix unaligned usermode access
        xtensa: reorganize SR referencing
        xtensa: fix boot parameters parsing
        xtensa: fix missing return in do_page_fault for SIGBUS case
        xtensa: copy_thread with CLONE_VM must not copy live parent AR windows
        xtensa: fix memmove(), bcopy(), and memcpy().
        xtensa: ISS: fix rs_put_char
        xtensa: ISS: fix specific simcalls
      17dbe27d
    • 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * 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: James Bottomley <JBottomley@Parallels.com>"
      
      * 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
    • Chris Zankel's avatar
      xtensa: add missing system calls to the syscall table · 7216cabf
      Chris Zankel authored
      Add the following system calls to the syscall table:
      
      fallocate
      sendmmsg
      umount2
      syncfs
      epoll_create1
      inotify_init1
      signalfd4
      dup3
      pipe2
      timerfd_create
      timerfd_settime
      timerfd_gettime
      eventfd2
      preadv
      pwritev
      fanotify_init
      fanotify_mark
      process_vm_readv
      process_vm_writev
      name_to_handle_at
      open_by_handle_at
      sync_file_range
      perf_event_open
      rt_tgsigqueueinfo
      clock_adjtime
      prlimit64
      kcmp
      
      Note that we have to use the 'sys_sync_file_range2' version, so that
      the 64-bit arguments are aligned correctly to the argument registers.
      Signed-off-by: default avatarChris Zankel <chris@zankel.net>
      7216cabf
    • 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
    • Chris Zankel's avatar
      xtensa: minor compiler warning fix · 39070cb8
      Chris Zankel authored
      Fix two compiler warnings complaining about truncating a value on
      a 64-bit host, and about declaring an unused variable that is only
      used for a specific configuration.
      Signed-off-by: default avatarChris Zankel <chris@zankel.net>
      39070cb8
    • 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
  2. 18 Oct, 2012 16 commits
  3. 17 Oct, 2012 9 commits