02 Nov, 2012

1 commit


01 Nov, 2012

4 commits

  • !CONFIG_TRACING both declares and defines (empty) trace_printk.
    The first one is not redundant so it can be removed.

    Link: http://lkml.kernel.org/r/1351172511-18125-1-git-send-email-mhocko@suse.cz

    Signed-off-by: Michal Hocko
    Signed-off-by: Steven Rostedt

    Michal Hocko
     
  • The functions defined in include/trace/syscalls.h are not used directly
    since struct ftrace_event_class was introduced. Remove them from the
    header file and rearrange the ftrace_event_class declarations in
    trace_syscalls.c.

    Link: http://lkml.kernel.org/r/1339112785-21806-2-git-send-email-vnagarnaik@google.com

    Signed-off-by: Vaibhav Nagarnaik
    Signed-off-by: Steven Rostedt

    Vaibhav Nagarnaik
     
  • Remove ftrace_format_syscall() declaration; it is neither defined nor
    used. Also update a comment and formatting.

    Link: http://lkml.kernel.org/r/1339112785-21806-1-git-send-email-vnagarnaik@google.com

    Signed-off-by: David Sharp
    Signed-off-by: Vaibhav Nagarnaik
    Signed-off-by: Steven Rostedt

    David Sharp
     
  • The existing 'overrun' counter is incremented when the ring
    buffer wraps around, with overflow on (the default). We wanted
    a way to count requests lost from the buffer filling up with
    overflow off, too. I decided to add a new counter instead
    of retro-fitting the existing one because it seems like a
    different statistic to count conceptually, and also because
    of how the code was structured.

    Link: http://lkml.kernel.org/r/1310765038-26399-1-git-send-email-slavapestov@google.com

    Signed-off-by: Slava Pestov
    Signed-off-by: Steven Rostedt

    Slava Pestov
     

24 Oct, 2012

3 commits

  • The perf_cpu_notifier() macro invokes smp_processor_id()
    multiple times. Optimize it by using a local variable.

    Signed-off-by: Srivatsa S. Bhat
    Reviewed-by: Paul E. McKenney
    Cc: peterz@infradead.org
    Cc: acme@ghostprotocols.net
    Link: http://lkml.kernel.org/r/20121016075817.3572.76733.stgit@srivatsabhat.in.ibm.com
    Signed-off-by: Ingo Molnar

    Srivatsa S. Bhat
     
  • The CPU_STARTING notifiers are supposed to be run with irqs
    disabled. But the perf_cpu_notifier() macro invokes them without
    doing that. Fix it.

    Signed-off-by: Srivatsa S. Bhat
    Reviewed-by: Paul E. McKenney
    Cc: peterz@infradead.org
    Cc: acme@ghostprotocols.net
    Link: http://lkml.kernel.org/r/20121016075809.3572.47848.stgit@srivatsabhat.in.ibm.com
    Signed-off-by: Ingo Molnar

    Srivatsa S. Bhat
     
  • Pull xen bug-fixes from Konrad Rzeszutek Wilk:
    - Fix mysterious SIGSEGV or SIGKILL in applications due to corrupting
    of the %eip when returning from a signal handler.
    - Fix various ARM compile issues after the merge fallout.
    - Continue on making more of the Xen generic code usable by ARM
    platform.
    - Fix SR-IOV passthrough to mirror multifunction PCI devices.
    - Fix various compile warnings.
    - Remove hypercalls that don't exist anymore.

    * tag 'stable/for-linus-3.7-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: dbgp: Fix warning when CONFIG_PCI is not enabled.
    xen: arm: comment on why 64-bit xen_pfn_t is safe even on 32 bit
    xen: balloon: use correct type for frame_list
    xen/x86: don't corrupt %eip when returning from a signal handler
    xen: arm: make p2m operations NOPs
    xen: balloon: don't include e820.h
    xen: grant: use xen_pfn_t type for frame_list.
    xen: events: pirq_check_eoi_map is X86 specific
    xen: XENMEM_translate_gpfn_list was remove ages ago and is unused.
    xen: sysfs: fix build warning.
    xen: sysfs: include err.h for PTR_ERR etc
    xen: xenbus: quirk uses x86 specific cpuid
    xen PV passthru: assign SR-IOV virtual functions to separate virtual slots
    xen/xenbus: Fix compile warning.
    xen/x86: remove duplicated include from enlighten.c

    Linus Torvalds
     

22 Oct, 2012

1 commit


20 Oct, 2012

8 commits

  • Merge misc fixes from Andrew Morton:
    "Seven fixes"

    * emailed patches from Andrew Morton : (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

    Linus Torvalds
     
  • 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
    Cc: Andrew Vagin
    Cc: Oleg Nesterov
    Cc: "Eric W. Biederman"
    Cc: Pavel Emelyanov
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Cyrill Gorcunov
     
  • Commit 5ab1c309b344 ("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
    Cc: Denys Vlasenko
    Cc: Oleg Nesterov
    Cc: Amerigo Wang
    Cc: "Jonathan M. Foote"
    Cc: Roland McGrath
    Cc: Pedro Alves
    Cc: Fengguang Wu
    Cc: Stephen Rothwell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Richard Weinberger
     
  • * commit 'v3.7-rc1': (10892 commits)
    Linux 3.7-rc1
    x86, boot: Explicitly include autoconf.h for hostprogs
    perf: Fix UAPI fallout
    ARM: config: make sure that platforms are ordered by option string
    ARM: config: sort select statements alphanumerically
    UAPI: (Scripted) Disintegrate include/linux/byteorder
    UAPI: (Scripted) Disintegrate include/linux
    UAPI: Unexport linux/blk_types.h
    UAPI: Unexport part of linux/ppp-comp.h
    perf: Handle new rbtree implementation
    procfs: don't need a PATH_MAX allocation to hold a string representation of an int
    vfs: embed struct filename inside of names_cache allocation if possible
    audit: make audit_inode take struct filename
    vfs: make path_openat take a struct filename pointer
    vfs: turn do_path_lookup into wrapper around struct filename variant
    audit: allow audit code to satisfy getname requests from its names_list
    vfs: define struct filename and have getname() return it
    btrfs: Fix compilation with user namespace support enabled
    userns: Fix posix_acl_file_xattr_userns gid conversion
    userns: Properly print bluetooth socket uids
    ...

    Konrad Rzeszutek Wilk
     
  • This correctly sizes it as 64 bit on ARM but leaves it as unsigned
    long on x86 (therefore no intended change on x86).

    The long and ulong guest handles are now unused (and a bit dangerous)
    so remove them.

    Acked-by: Stefano Stabellini
    Signed-off-by: Ian Campbell
    Signed-off-by: Konrad Rzeszutek Wilk

    Ian Campbell
     
  • Signed-off-by: Ian Campbell
    Signed-off-by: Konrad Rzeszutek Wilk

    Ian Campbell
     
  • 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 "

    * 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
    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

    Linus Torvalds
     
  • 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 "

    * 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
    ...

    Linus Torvalds
     

19 Oct, 2012

2 commits

  • 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

    Linus Torvalds
     
  • 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

    Linus Torvalds
     

18 Oct, 2012

5 commits

  • …linux-headers into tty-linus

    UAPI Disintegration 2012-10-09

    Greg Kroah-Hartman
     
  • drivers/of/irq.c:195:57: warning: restricted __be32 degrades to integer
    drivers/of/irq.c:196:51: warning: restricted __be32 degrades to integer
    drivers/of/irq.c:199:57: warning: restricted __be32 degrades to integer
    drivers/of/irq.c:201:58: warning: restricted __be32 degrades to integer
    drivers/of/irq.c:470:37: warning: incorrect type in assignment (different modifiers)
    drivers/of/irq.c:470:37: expected int ( *[usertype] irq_init_cb )( ... )
    drivers/of/irq.c:470:37: got void const *const data
    drivers/of/irq.c:96:5: error: symbol 'of_irq_map_raw' redeclared with different type (originally declared at include/linux/of_irq.h:61) - incompatible argument 2 (different base types)

    drivers/of/of_pci_irq.c:91:40: warning: incorrect type in argument 2 (different base types)
    drivers/of/of_pci_irq.c:91:40: expected unsigned int const [usertype] *intspec
    drivers/of/of_pci_irq.c:91:40: got restricted __be32 *
    drivers/of/of_pci_irq.c:91:53: warning: incorrect type in argument 4 (different base types)
    drivers/of/of_pci_irq.c:91:53: expected unsigned int const [usertype] *addr
    drivers/of/of_pci_irq.c:91:53: got restricted __be32 *

    Signed-off-by: Kim Phillips
    Signed-off-by: Rob Herring

    Kim Phillips
     
  • drivers/of/address.c:66:29: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:66:29: expected restricted __be32 const [usertype] *cell
    drivers/of/address.c:66:29: got unsigned int [usertype] *addr
    drivers/of/address.c:87:32: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:87:32: expected restricted __be32 const [usertype] *cell
    drivers/of/address.c:87:32: got unsigned int [usertype] *addr
    drivers/of/address.c:91:30: warning: incorrect type in assignment (different base types)
    drivers/of/address.c:91:30: expected unsigned int [unsigned] [usertype]
    drivers/of/address.c:91:30: got restricted __be32 [usertype]
    drivers/of/address.c:92:22: warning: incorrect type in assignment (different base types)
    drivers/of/address.c:92:22: expected unsigned int [unsigned] [usertype]
    drivers/of/address.c:92:22: got restricted __be32 [usertype]
    drivers/of/address.c:147:35: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:147:35: expected restricted __be32 const [usertype] *addr
    drivers/of/address.c:147:35: got unsigned int [usertype] *addr
    drivers/of/address.c:157:34: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:157:34: expected restricted __be32 const [usertype] *cell
    drivers/of/address.c:157:34: got unsigned int [usertype] *
    drivers/of/address.c:256:29: warning: restricted __be32 degrades to integer
    drivers/of/address.c:256:36: warning: restricted __be32 degrades to integer
    drivers/of/address.c:262:34: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:262:34: expected restricted __be32 const [usertype] *cell
    drivers/of/address.c:262:34: got unsigned int [usertype] *
    drivers/of/address.c:372:41: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:372:41: expected restricted __be32 const [usertype] *cell
    drivers/of/address.c:372:41: got unsigned int [usertype] *addr
    drivers/of/address.c:395:53: warning: incorrect type in argument 2 (different base types)
    drivers/of/address.c:395:53: expected restricted __be32 const [usertype] *addr
    drivers/of/address.c:395:53: got unsigned int [usertype] *addr
    drivers/of/address.c:443:50: warning: incorrect type in argument 2 (different base types)
    drivers/of/address.c:443:50: expected restricted __be32 const [usertype] *addr
    drivers/of/address.c:443:50: got unsigned int *
    drivers/of/address.c:455:49: warning: incorrect type in argument 1 (different base types)
    drivers/of/address.c:455:49: expected restricted __be32 const [usertype] *cell
    drivers/of/address.c:455:49: got unsigned int *
    drivers/of/address.c:480:60: warning: incorrect type in argument 2 (different base types)
    drivers/of/address.c:480:60: expected restricted __be32 const [usertype] *addr
    drivers/of/address.c:480:60: got unsigned int *
    drivers/of/address.c:412:5: warning: symbol '__of_translate_address' was not declared. Should it be static?
    drivers/of/address.c:520:14: error: symbol 'of_get_address' redeclared with different type (originally declared at include/linux/of_address.h:22) - different base types

    Signed-off-by: Kim Phillips
    Signed-off-by: Rob Herring

    Kim Phillips
     
  • Fixes build error on s3c6400_defconfig, introduced by commit
    06455bbcab76e5f5225de5f38ab948d37a1c3587, "dt/s3c64xx/spi: Use
    of_get_child_by_name to get a named child".

    drivers/spi/spi-s3c64xx.c: In function 's3c64xx_get_slave_ctrldata':
    drivers/spi/spi-s3c64xx.c:838:2: error: implicit declaration of function
    'of_get_child_by_name' [-Werror=implicit-function-declaration]

    Signed-off-by: Olof Johansson
    Signed-off-by: Rob Herring

    Olof Johansson
     
  • There are no users of this macro anymore in the kernel tree, so finally
    delete it.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

17 Oct, 2012

9 commits

  • Signed-off-by: David Howells
    Acked-by: Arnd Bergmann
    Acked-by: Thomas Gleixner
    Acked-by: Michael Kerrisk
    Acked-by: Paul E. McKenney
    Acked-by: Dave Jones
    Signed-off-by: Mauro Carvalho Chehab

    David Howells
     
  • Make uapi/asm-generic/kvm_para.h non-empty by addition of a comment to stop
    the patch program from deleting it when it creates it.

    Then delete empty arch-specific uapi/asm/kvm_para.h files and tell the Kbuild
    files to use the generic instead.

    Should this perhaps instead be a #warning or #error that the facility is
    unsupported on this arch?

    Signed-off-by: David Howells
    cc: Arnd Bergmann
    cc: Avi Kivity
    cc: Marcelo Tosatti
    cc: kvm@vger.kernel.org

    David Howells
     
  • Remove non-UAPI Kbuild files that have become empty as a result of UAPI
    disintegration. They used to have only header-y lines in them and those have
    now moved to the Kbuild files in the corresponding uapi/ directories.

    Possibly these should not be removed but rather have a comment inserted to say
    they are intentionally left blank. This would make it easier to add generated
    header lines in future without having to restore the infrastructure.

    Note that at this point not all the UAPI disintegration parts have been merged,
    so it is likely that more empty Kbuild files will turn up.

    It is probably necessary to make the files non-empty to prevent the patch
    program from automatically deleting them when it reduces them to nothing.

    Signed-off-by: David Howells

    David Howells
     
  • Remove empty conditionals from include/linux/Kbuild as the contents, with new
    conditionals, have moved to include/uapi/linux/Kbuild.

    Signed-off-by: David Howells

    David Howells
     
  • uapi/linux/irqnr.h was emitted by the UAPI disintegration script as an empty
    file because the parent linux/irqnr.h had no UAPI stuff in it, despite being
    marked with "header-y".

    Unfortunately, the patch program deletes the empty file when applying a kernel
    patch.

    It's not clear why this file is part of the UAPI at all. Looking in:

    /usr/include/linux/irqnr.h

    there's nothing there but a header reinclusion guard and a comment.

    So just stick a comment in there as a placeholder.

    Without this, if the kernel is fabricated from, say, a tarball and a patch, you
    can get this error when building x86_64 or usermode Linux (and probably
    others):

    include/linux/irqnr.h:4:30: fatal error: uapi/linux/irqnr.h: No such file or directory

    Reported-by: Randy Dunlap
    Reported-by: Alessandro Suardi
    Signed-off-by: David Howells
    cc: Randy Dunlap
    cc: Alessandro Suardi

    David Howells
     
  • Merge emailed FRV fixes from David Howells.

    * frv:
    FRV: Fix linux/elf-fdpic.h
    FRV: Fix const sections change
    FRV: Fix incorrect symbol in copy_thread()
    FRV: Fix VLIW packing constraint violation in entry.S

    Linus Torvalds
     
  • It seems I accidentally switched the guard on linux/elf-fdpic.h from #ifdef
    __KERNEL__ to #ifndef __KERNEL__ when attempting to expand the guarded region
    to cover the elf_fdpic_params struct when doing the UAPI split - with the
    result that the struct became unavailable to kernel code.

    Move incorrectly guarded bits back to the kernelspace header.

    Whilst we're at it, the __KERNEL__ guards can be deleted as they're no longer
    necessary.

    Reported-by: Fengguang Wu
    Reported-by: Lars-Peter Clausen
    Signed-off-by: David Howells
    cc: Fengguang Wu
    cc: Lars-Peter Clausen
    cc: uclinux-dev@uclinux.org
    Signed-off-by: Linus Torvalds

    David Howells
     
  • Had not been used for more than a decade and half; it used
    to be a part of (in-kernel) ->select() API and it has been pining
    for fjords since 2.1.23pre1. This is an ex-parrot...

    Signed-off-by: Al Viro

    Al Viro
     
  • There are some bits of linux/fs.h which are only used within the kernel and
    shouldn't be in the UAPI. Move these from uapi/linux/fs.h into linux/fs.h.

    Signed-off-by: David Howells
    Signed-off-by: Al Viro

    David Howells
     

15 Oct, 2012

4 commits

  • This syncs up the tty-linus branch to the latest in Linus's tree to get all of
    the UAPI stuff needed for the next set of patches to merge.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • Sync up to a known-good point in Linus's tree to build on.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • Pull MIPS update from Ralf Baechle:
    "Cleanups and fixes for breakage that occured earlier during this merge
    phase. Also a few patches that didn't make the first pull request.
    Of those is the Alchemy work that merges code for many of the SOCs and
    evaluation boards thus among other code shrinkage, reduces the number
    of MIPS defconfigs by 5."

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (22 commits)
    MIPS: SNI: Switch RM400 serial to SCCNXP driver
    MIPS: Remove unused empty_bad_pmd_table[] declaration.
    MIPS: MT: Remove kspd.
    MIPS: Malta: Fix section mismatch.
    MIPS: asm-offset.c: Delete unused irq_cpustat_t struct offsets.
    MIPS: Alchemy: Merge PB1100/1500 support into DB1000 code.
    MIPS: Alchemy: merge PB1550 support into DB1550 code
    MIPS: Alchemy: Single kernel for DB1200/1300/1550
    MIPS: Optimize TLB refill for RI/XI configurations.
    MIPS: proc: Cleanup printing of ASEs.
    MIPS: Hardwire detection of DSP ASE Rev 2 for systems, as required.
    MIPS: Add detection of DSP ASE Revision 2.
    MIPS: Optimize pgd_init and pmd_init
    MIPS: perf: Add perf functionality for BMIPS5000
    MIPS: perf: Split the Kconfig option CONFIG_MIPS_MT_SMP
    MIPS: perf: Remove unnecessary #ifdef
    MIPS: perf: Add cpu feature bit for PCI (performance counter interrupt)
    MIPS: perf: Change the "mips_perf_event" table unsupported indicator.
    MIPS: Align swapper_pg_dir to 64K for better TLB Refill code.
    vmlinux.lds.h: Allow architectures to add sections to the front of .bss
    ...

    Linus Torvalds
     
  • Pull module signing support from Rusty Russell:
    "module signing is the highlight, but it's an all-over David Howells frenzy..."

    Hmm "Magrathea: Glacier signing key". Somebody has been reading too much HHGTTG.

    * 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (37 commits)
    X.509: Fix indefinite length element skip error handling
    X.509: Convert some printk calls to pr_devel
    asymmetric keys: fix printk format warning
    MODSIGN: Fix 32-bit overflow in X.509 certificate validity date checking
    MODSIGN: Make mrproper should remove generated files.
    MODSIGN: Use utf8 strings in signer's name in autogenerated X.509 certs
    MODSIGN: Use the same digest for the autogen key sig as for the module sig
    MODSIGN: Sign modules during the build process
    MODSIGN: Provide a script for generating a key ID from an X.509 cert
    MODSIGN: Implement module signature checking
    MODSIGN: Provide module signing public keys to the kernel
    MODSIGN: Automatically generate module signing keys if missing
    MODSIGN: Provide Kconfig options
    MODSIGN: Provide gitignore and make clean rules for extra files
    MODSIGN: Add FIPS policy
    module: signature checking hook
    X.509: Add a crypto key parser for binary (DER) X.509 certificates
    MPILIB: Provide a function to read raw data into an MPI
    X.509: Add an ASN.1 decoder
    X.509: Add simple ASN.1 grammar compiler
    ...

    Linus Torvalds
     

14 Oct, 2012

3 commits

  • …linux-headers into usb-linus

    UAPI Disintegration 2012-10-09

    Greg Kroah-Hartman
     
  • Pull UAPI disintegration for include/linux/{,byteorder/}*.h from David Howells:
    "The patches contained herein do the following:

    (1) Remove kernel-only stuff in linux/ppp-comp.h from the UAPI. I checked
    this with Paul Mackerras before I created the patch and he suggested some
    extra bits to unexport.

    (2) Remove linux/blk_types.h entirely from the UAPI as none of it is userspace
    applicable, and remove from the UAPI that part of linux/fs.h that was the
    reason for linux/blk_types.h being exported in the first place. I
    discussed this with Jens Axboe before creating the patch.

    (3) The big patch of the series to disintegrate include/linux/*.h as a unit.
    This could be split up, though there would be collisions in moving stuff
    between the two Kbuild files when the parts are merged as that file is
    sorted alphabetically rather than being grouped by subsystem.

    Of this set of headers, 17 files have changed in the UAPI exported region
    since the 4th and only 8 since the 9th so there isn't much change in this
    area - as one might expect.

    It should be pretty obvious and straightforward if it does come to fixing
    up: stuff in __KERNEL__ guards stays where it is and stuff outside moves
    to the same file in the include/uapi/linux/ directory.

    If a new file appears then things get a bit more complicated as the
    "headers +=" line has to move to include/uapi/linux/Kbuild. Only one new
    file has appeared since the 9th and I judge this type of event relatively
    unlikely.

    (4) A patch to disintegrate include/linux/byteorder/*.h as a unit.

    Signed-off-by: David Howells "

    * tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells/linux-headers:
    UAPI: (Scripted) Disintegrate include/linux/byteorder
    UAPI: (Scripted) Disintegrate include/linux
    UAPI: Unexport linux/blk_types.h
    UAPI: Unexport part of linux/ppp-comp.h

    Linus Torvalds
     
  • Pull spi UAPI disintegration from David Howells:
    "This is to complete part of the Userspace API (UAPI) disintegration
    for which the preparatory patches were pulled recently. After these
    patches, userspace headers will be segregated into:

    include/uapi/linux/.../foo.h

    for the userspace interface stuff, and:

    include/linux/.../foo.h

    for the strictly kernel internal stuff.

    Signed-off-by: David Howells
    Acked-by: Grant Likely "

    * tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
    UAPI: (Scripted) Disintegrate include/linux/spi

    Linus Torvalds