Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 20, 2012
  1. Linux 3.7-rc2

    authored
  2. Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/cmarinas/linux-aarch64
    
    Pull arm64 fixes from Catalin Marinas:
     "Main changes:
       - AArch64 Linux compilation fixes following 3.7-rc1 changes
         (MODULES_USE_ELF_RELA, update_vsyscall() prototype)
       - Unnecessary register setting in start_thread() (thanks to Al Viro)
       - ptrace fixes"
    
    * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
      arm64: fix alignment padding in assembly code
      arm64: ptrace: use HW_BREAKPOINT_EMPTY type for disabled breakpoints
      arm64: ptrace: make structure padding explicit for debug registers
      arm64: No need to set the x0-x2 registers in start_thread()
      arm64: Ignore memory blocks below PHYS_OFFSET
      arm64: Fix the update_vsyscall() prototype
      arm64: Select MODULES_USE_ELF_RELA
      arm64: Remove duplicate inclusion of mmu_context.h in smp.c
  3. arm64: fix alignment padding in assembly code

    Marc Zyngier authored Catalin Marinas committed
    An interesting effect of using the generic version of linkage.h
    is that the padding is defined in terms of x86 NOPs, which can have
    even more interesting effects when the assembly code looks like this:
    
    ENTRY(func1)
    	mov	x0, xzr
    ENDPROC(func1)
    	// fall through
    ENTRY(func2)
    	mov	x0, #1
    	ret
    ENDPROC(func2)
    
    Admittedly, the code is not very nice. But having code from another
    architecture doesn't look completely sane either.
    
    The fix is to add arm64's version of linkage.h, which causes the insertion
    of proper AArch64 NOPs.
    
    Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  4. @kees

    use clamp_t in UNAME26 fix

    kees authored committed
    The min/max call needed to have explicit types on some architectures
    (e.g. mn10300). Use clamp_t instead to avoid the warning:
    
      kernel/sys.c: In function 'override_release':
      kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default]
    
    Reported-by: Fengguang Wu <fengguang.wu@intel.com>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…

    authored
    …linux/kernel/git/tip/tip
    
    Pull perf fixes from Ingo Molnar:
     "Assorted small fixes"
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      perf python: Properly link with libtraceevent
      perf hists browser: Add back callchain folding symbol
      perf tools: Fix build on sparc.
      perf python: Link with libtraceevent
      perf python: Initialize 'page_size' variable
      tools lib traceevent: Fix missed freeing of subargs in free_arg() in filter
      lib tools traceevent: Add back pevent assignment in __pevent_parse_format()
      perf hists browser: Fix off-by-two bug on the first column
      perf tools: Remove warnings on JIT samples for srcline sort key
      perf tools: Fix segfault when using srcline sort key
      perf: Require exclude_guest to use PEBS - kernel side enforcement
      perf tool: Precise mode requires exclude_guest
  6. @acmel

    perf python: Properly link with libtraceevent

    acmel authored Ingo Molnar committed
    Namhyung Kim reported that the build fails with:
    
      GEN python/perf.so
      gcc: error: python_ext_build/tmp//../../libtraceevent.a: No such file or directory
      error: command 'gcc' failed with exit status 1
      cp: cannot stat `python_ext_build/lib/perf.so': No such file or directory
      make: *** [python/perf.so] Error 1
    
    We need to propagate the TE_PATH variable to the setup.py file.
    
    Reported-by: Namhyung Kim <namhyung@kernel.org>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Link: http://lkml.kernel.org/n/tip-8umiPbm4sxpknKivbjgykhut@git.kernel.org
    [ Fixed superfluous variable build error. ]
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  7. Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…

    Ingo Molnar authored
    …ux/kernel/git/acme/linux into perf/urgent
    
    Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
    
    * The python binding needs to link with libtraceevent and to initialize
      the 'page_size' variable so that mmaping works again.
    
    * The callchain folding character that appears on the TUI just before
      the overhead had disappeared due to recent changes, add it back.
    
    * Intel PEBS in VT-x context uses the DS address as a guest linear address,
      even though its programmed by the host as a host linear address. This either
      results in guest memory corruption and or the hardware faulting and 'crashing'
      the virtual machine.  Therefore we have to disable PEBS on VT-x enter and
      re-enable on VT-x exit, enforcing a strict exclude_guest.
    
      Kernel side enforcement fix by Peter Zijlstra, tooling side fix by David Ahern.
    
    * Fix build on sparc due to UAPI, fix from David Miller.
    
    * Fixes for the srclike sort key for unresolved symbols and when processing
      samples in JITted code, where we don't have an ELF file, just an special
      symbol table, fixes from Namhyung Kim.
    
    * Fix some leaks in libtraceevent, from Steven Rostedt.
    
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
  8. Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/arm/arm-soc
    
    Pull ARM soc fixes from Olof Johansson:
     "A set of fixes and some minor cleanups for -rc2:
    
       - A series from Arnd that fixes warnings in drivers and other code
         included by ARM defconfigs.  Most have been acked by corresponding
         maintainers (and seem quite hard to argue not picking up anyway in
         the few exception cases).
       - A few misc patches from the list for integrator/vt8500/i.MX
       - A batch of fixes to OMAP platforms, fixing:
         - boot problems on beaglebone,
         - regression fixes for local timers
         - clockdomain locking fixes
         - a few boot/sparse warnings
       - For Tegra:
         - Clock rate calculation overflow fix
         - Revert a change that removed timer clocks and a fix for symbol
           name clashes
       - For Renesas:
         - IO accessor / annotation cleanups to remove warnings
       - For Kirkwood/Dove/mvebu:
         - Fixes for device trees for Dove (some minor cleanups, some fixes)
         - Fixes for the mvebu gpio driver
         - Fix build problem for Feroceon due to missing ifdefs
         - Fix lsxl DTS files"
    
    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (31 commits)
      ARM: kirkwood: fix buttons on lsxl boards
      ARM: kirkwood: fix LEDs names for lsxl boards
      ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
      gpio: mvebu: Add missing breaks in mvebu_gpio_irq_set_type
      ARM: dove: Add crypto engine to DT
      ARM: dove: Remove watchdog from DT
      ARM: dove: Restructure SoC device tree descriptor
      ARM: dove: Fix clock names of sata and gbe
      ARM: dove: Fix tauros2 device tree init
      ARM: dove: Add pcie clock support
      ARM: OMAP2+: Allow kernel to boot even if GPMC fails to reserve memory
      ARM: OMAP: clockdomain: Fix locking on _clkdm_clk_hwmod_enable / disable
      ARM: s3c: mark s3c2440_clk_add as __init_refok
      spi/s3c64xx: use correct dma_transfer_direction type
      ARM: OMAP4: devices: fixup OMAP4 DMIC platform device error message
      ARM: OMAP2+: clock data: Add dev-id for the omap-gpmc dummy fck
      ARM: OMAP: resolve sparse warning concerning debug_card_init()
      ARM: OMAP4: Fix twd_local_timer_register regression
      ARM: tegra: add tegra_timer clock
      ARM: tegra: rename tegra system timer
      ...
  9. MODSIGN: Move the magic string to the end of a module and eliminate t…

    David Howells authored committed
    …he search
    
    Emit the magic string that indicates a module has a signature after the
    signature data instead of before it.  This allows module_sig_check() to
    be made simpler and faster by the elimination of the search for the
    magic string.  Instead we just need to do a single memcmp().
    
    This works because at the end of the signature data there is the
    fixed-length signature information block.  This block then falls
    immediately prior to the magic number.
    
    From the contents of the information block, it is trivial to calculate
    the size of the signature data and thus the size of the actual module
    data.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Oct 19, 2012
  1. @olofj

    Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/…

    olofj authored
    …jcooper/linux into fixes
    
    From Jason Cooper:
     - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2
     - lsxl board dts fixes
    
    * tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux:
      ARM: kirkwood: fix buttons on lsxl boards
      ARM: kirkwood: fix LEDs names for lsxl boards
      ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2
  2. MODSIGN: Cleanup .gitignore

    David Howells authored committed
    The module build process no longer creates intermediate files for module
    signing, so remove them from .gitignore.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. MODSIGN: perlify sign-file and merge in x509keyid

    David Howells authored committed
    Turn sign-file into perl and merge in x509keyid.  The latter doesn't
    need to be a separate script as it doesn't actually need to work out the
    SHA1 sum of the X.509 certificate itself, since it can get that from the
    X.509 certificate.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @olofj

    Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/sc…

    olofj authored
    …m/linux/kernel/git/arm/arm-soc into fixes
    
    A collection of warning fixes on non-ARM code from Arnd Bergmann:
    
    * 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: s3c: mark s3c2440_clk_add as __init_refok
      spi/s3c64xx: use correct dma_transfer_direction type
      pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
      USB: EHCI: mark ehci_orion_conf_mbus_windows __devinit
      mm/slob: use min_t() to compare ARCH_SLAB_MINALIGN
      SCSI: ARM: make fas216_dumpinfo function conditional
      SCSI: ARM: ncr5380/oak uses no interrupts
  5. hold task->mempolicy while numa_maps scans.

    KAMEZAWA Hiroyuki authored committed
      /proc/<pid>/numa_maps scans vma and show mempolicy under
      mmap_sem. It sometimes accesses task->mempolicy which can
      be freed without mmap_sem and numa_maps can show some
      garbage while scanning.
    
    This patch tries to take reference count of task->mempolicy at reading
    numa_maps before calling get_vma_policy(). By this, task->mempolicy
    will not be freed until numa_maps reaches its end.
    
    V2->v3
      -  updated comments to be more verbose.
      -  removed task_lock() in numa_maps code.
    V1->V2
      -  access task->mempolicy only once and remember it.  Becase kernel/exit.c
         can overwrite it.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kerne…

    authored
    …l/git/tip/tip
    
    Pull miscellaneous x86 fixes from Peter Anvin:
     "The biggest ones are fixing suspend/resume breakage on 32 bits, and an
      interrim fix for mapping over holes that allows AMD kit with more than
      1 TB.
    
      A final solution for the latter is in the works, but involves some
      fairly invasive changes that will probably mean it will only be
      appropriate for 3.8."
    
    * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86, MCE: Remove bios_cmci_threshold sysfs attribute
      x86, amd, mce: Avoid NULL pointer reference on CPU northbridge lookup
      x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
      x86/cache_info: Use ARRAY_SIZE() in amd_l3_attrs()
      x86/reboot: Remove quirk entry for SBC FITPC
      x86, suspend: Correct the restore of CR4, EFER; skip computing EFLAGS.ID
  7. Merge branch 'akpm' (Fixes from Andrew)

    authored
    Merge misc fixes from Andrew Morton:
     "Seven fixes"
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (7 patches)
      lib/dma-debug.c: fix __hash_bucket_find()
      mm: compaction: correct the nr_strict va isolated check for CMA
      firmware/memmap: avoid type conflicts with the generic memmap_init()
      pidns: remove recursion from free_pid_ns()
      drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
      kernel/sys.c: fix stack memory content leak via UNAME26
      linux/coredump.h needs asm/siginfo.h
  8. lib/dma-debug.c: fix __hash_bucket_find()

    Ming Lei authored committed
    If there is only one match, the unique matched entry should be returned.
    
    Without the fix, the upcoming dma debug interfaces ("dma-debug: new
    interfaces to debug dma mapping errors") can't work reliably because
    only device and dma_addr are passed to dma_mapping_error().
    
    Signed-off-by: Ming Lei <ming.lei@canonical.com>
    Reported-by: Wu Fengguang <fengguang.wu@intel.com>
    Cc: Joerg Roedel <joerg.roedel@amd.com>
    Tested-by: Shuah Khan <shuah.khan@hp.com>
    Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
    Cc: Jakub Kicinski <kubakici@wp.pl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. mm: compaction: correct the nr_strict va isolated check for CMA

    Mel Gorman authored committed
    Thierry reported that the "iron out" patch for isolate_freepages_block()
    had problems due to the strict check being too strict with "mm:
    compaction: Iron out isolate_freepages_block() and
    isolate_freepages_range() -fix1".  It's possible that more pages than
    necessary are isolated but the check still fails and I missed that this
    fix was not picked up before RC1.  This same problem has been identified
    in 3.7-RC1 by Tony Prisk and should be addressed by the following patch.
    
    Signed-off-by: Mel Gorman <mgorman@suse.de>
    Tested-by: Tony Prisk <linux@prisktech.co.nz>
    Reported-by: Thierry Reding <thierry.reding@avionic-design.de>
    Acked-by: Rik van Riel <riel@redhat.com>
    Acked-by: Minchan Kim <minchan@kernel.org>
    Cc: Richard Davies <richard@arachsys.com>
    Cc: Shaohua Li <shli@kernel.org>
    Cc: Avi Kivity <avi@redhat.com>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. firmware/memmap: avoid type conflicts with the generic memmap_init()

    Fengguang Wu authored committed
    Fix this build error:
    
      drivers/firmware/memmap.c:240:19: error: conflicting types for 'memmap_init'
      arch/ia64/include/asm/pgtable.h:565:17: note: previous declaration of 'memmap_init' was here
    
    Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
    Cc: Bernhard Walle <bwalle@suse.de>
    Cc: Glauber Costa <glommer@parallels.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @cyrillos

    pidns: remove recursion from free_pid_ns()

    cyrillos authored committed
    free_pid_ns() operates in a recursive fashion:
    
    free_pid_ns(parent)
      put_pid_ns(parent)
        kref_put(&ns->kref, free_pid_ns);
          free_pid_ns
    
    thus if there was a huge nesting of namespaces the userspace may trigger
    avalanche calling of free_pid_ns leading to kernel stack exhausting and a
    panic eventually.
    
    This patch turns the recursion into an iterative loop.
    
    Based on a patch by Andrew Vagin.
    
    [akpm@linux-foundation.org: export put_pid_ns() to modules]
    Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
    Cc: Andrew Vagin <avagin@openvz.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: "Eric W. Biederman" <ebiederm@xmission.com>
    Cc: Pavel Emelyanov <xemul@parallels.com>
    Cc: Greg KH <greg@kroah.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @AxelLin

    drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bl…

    AxelLin authored committed
    …ed_mode_store() error paths
    
    Signed-off-by: Axel Lin <axel.lin@ingics.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @kees

    kernel/sys.c: fix stack memory content leak via UNAME26

    kees authored committed
    Calling uname() with the UNAME26 personality set allows a leak of kernel
    stack contents.  This fixes it by defensively calculating the length of
    copy_to_user() call, making the len argument unsigned, and initializing
    the stack buffer to zero (now technically unneeded, but hey, overkill).
    
    CVE-2012-0957
    
    Reported-by: PaX Team <pageexec@freemail.hu>
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Cc: Andi Kleen <ak@linux.intel.com>
    Cc: PaX Team <pageexec@freemail.hu>
    Cc: Brad Spengler <spender@grsecurity.net>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @richardweinberger

    linux/coredump.h needs asm/siginfo.h

    richardweinberger authored committed
    Commit 5ab1c30 ("coredump: pass siginfo_t* to do_coredump() and
    below, not merely signr") added siginfo_t to linux/coredump.h but forgot
    to include asm/siginfo.h.  This breaks the build for UML/i386.  (And any
    other arch where asm/siginfo.h is not magically preincluded...)
    
      In file included from arch/x86/um/elfcore.c:2:0: include/linux/coredump.h:15:25: error: unknown type name 'siginfo_t'
      make[1]: *** [arch/x86/um/elfcore.o] Error 1
    
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Cc: Denys Vlasenko <vda.linux@googlemail.com>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Amerigo Wang <amwang@redhat.com>
    Cc: "Jonathan M. Foote" <jmfoote@cert.org>
    Cc: Roland McGrath <roland@hack.frob.com>
    Cc: Pedro Alves <palves@redhat.com>
    Cc: Fengguang Wu <fengguang.wu@intel.com>
    Cc: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. remap_file_pages: correctly handle the case of a NULL vm_ops pointer

    authored
    In commit 0b173bc ("mm: kill vma flag VM_CAN_NONLINEAR") we
    replaced the VM_CAN_NONLINEAR test with checking whether the mapping has
    a '->remap_pages()' vm operation, but there is no guarantee that there
    it even has a vm_ops pointer at all.
    
    Add the appropriate test for NULL vm_ops.
    
    Reported-by: Sasha Levin <levinsasha928@gmail.com>
    Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. Merge tag 'xtensa-next-20121018' of git://github.com/czankel/xtensa-l…

    authored
    …inux
    
    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
  17. kbuild: Fix module signature generation

    authored
    Rusty had clearly not actually tested his module signing changes that I
    (trustingly) applied as commit e2a666d ("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: Linus Torvalds <torvalds@linux-foundation.org>
  18. xen: Fix annoying compile-time warning

    authored
    Commit cb6b6df ("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: Linus Torvalds <torvalds@linux-foundation.org>
  19. Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    authored
    …nel/git/groeck/linux-staging
    
    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
  20. Merge tag 'tty-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/gregkh/tty
    
    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
  21. Merge tag 'usb-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…

    authored
    …git/gregkh/usb
    
    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
      ...
  22. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/rkuo/linux-hexagon-kernel
    
    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
  23. Merge tag 'parisc-for-linus' of git://git.kernel.org/pub/scm/linux/ke…

    authored
    …rnel/git/jejb/parisc-2.6
    
    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
  24. MAINTAINERS: Add Rafael's address to ACPI maintainers

    Rafael J. Wysocki authored committed
    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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Acked-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  25. Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux

    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
  26. @benmcollins

    USB: ehci-fsl: Return valid error in ehci_fsl_setup_phy

    benmcollins authored committed
    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 3735ba8 ("powerpc/usb: fix bug of CPU hang
    when missing USB PHY clock"), which missed one return.
    
    Signed-off-by: Ben Collins <ben.c@servergy.com>
    Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.