09 Sep, 2014

22 commits

  • RS485 related structure will be defined in user space API
    header.

    Signed-off-by: Yegor Yefremov
    Signed-off-by: Greg Kroah-Hartman

    Yegor Yefremov
     
  • Several architectures (e.g. microblaze, um, and score) have already have
    extern 'setup_memory', so need use 'nozomi_setup_memory' instead of, or
    will cause compiling issue.

    The related error (with allmodconfig for microblaze):

    CC [M] drivers/tty/nozomi.o
    drivers/tty/nozomi.c:526:13: error: conflicting types for 'setup_memory'
    static void setup_memory(struct nozomi *dc)
    ^
    In file included from include/linux/mm.h:51:0,
    from ./arch/microblaze/include/asm/io.h:17,
    from include/linux/io.h:22,
    from include/linux/pci.h:31,
    from drivers/tty/nozomi.c:46:
    ./arch/microblaze/include/asm/pgtable.h:569:6: note: previous declaration of 'setup_memory' was here
    void setup_memory(void);
    ^

    Signed-off-by: Chen Gang
    Acked-by: Jiri Slaby
    Signed-off-by: Greg Kroah-Hartman

    Chen Gang
     
  • There is no need to init .owner field.

    Based on the patch from Peter Griffin
    "mmc: remove .owner field for drivers using module_platform_driver"

    This patch removes the superflous .owner field for drivers which
    use the module_platform_driver API, as this is overriden in
    platform_driver_register anyway."

    Signed-off-by: Michal Simek
    Acked-by: Peter Korsgaard
    Signed-off-by: Greg Kroah-Hartman

    Michal Simek
     
  • There is no need to init .owner field.

    Based on the patch from Peter Griffin
    "mmc: remove .owner field for drivers using module_platform_driver"

    This patch removes the superflous .owner field for drivers which
    use the module_platform_driver API, as this is overriden in
    platform_driver_register anyway."

    Signed-off-by: Michal Simek
    Signed-off-by: Greg Kroah-Hartman

    Michal Simek
     
  • The symbol is defined in drivers/tty/serial/8250/Kconfig as
    "SERIAL_8250", not just "8250".

    Signed-off-by: Daniele Forsi
    Signed-off-by: Greg Kroah-Hartman

    Daniele Forsi
     
  • When the N_TTY line discipline receives data and wakes readers to
    process the input, polling writers are also mistakenly woken. This
    is because, although readers and writers are differentiated by
    different wait queues (tty->read_wait & tty->write_wait), both
    wait queues are polled together. Thus, reader wakeups without poll
    flags still cause poll(POLLOUT) to wakeup.

    For received data, wakeup readers with POLLIN. Preserve the
    unspecific wakeup in n_tty_packet_mode_flush(), as this action
    should flag both POLLIN and POLLOUT.

    Fixes epoll_wait() for edge-triggered EPOLLOUT.

    Signed-off-by: Peter Hurley
    Signed-off-by: Greg Kroah-Hartman

    Peter Hurley
     
  • In case if we're releasing the last tty reference the following
    call sequence is possible

    tty_driver_kref_put
    destruct_tty_driver
    kfree(driver);

    where @driver is used in next module_put call, which leads to

    | [ 285.964007] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
    | [ 285.964007] Workqueue: events release_one_tty
    | [ 285.964007] task: ffff8800cc7ea5f0 ti: ffff8800cb800000 task.ti: ffff8800cb800000
    | [ 285.964007] RIP: 0010:[] [] module_put+0x24/0xf4
    | [ 285.964007] RSP: 0018:ffff8800cb801d48 EFLAGS: 00010213
    | [ 285.964007] RAX: ffff8800cb801fd8 RBX: ffff8800ca3429d0 RCX: ffff8800cb1db400
    | [ 285.964007] RDX: 0000000000000000 RSI: ffffffff817349c1 RDI: 0000000000000001
    | [ 285.964007] RBP: ffff8800cb801d60 R08: ffff8800cd632b40 R09: 0000000000000000
    | [ 285.964007] R10: 00000000ffffffff R11: ffff88011f40a000 R12: 6b6b6b6b6b6b6b6b
    | [ 285.964007] R13: ffff8800ca342520 R14: 0000000000000000 R15: ffff88011f5d8200
    | [ 285.964007] FS: 0000000000000000(0000) GS:ffff88011f400000(0000) knlGS:0000000000000000
    | [ 285.964007] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    | [ 285.964007] CR2: 00007faf5229d090 CR3: 0000000001c0b000 CR4: 00000000000006f0
    | [ 285.964007] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    | [ 285.964007] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    | [ 285.964007] Stack:
    | [ 285.964007] ffff8800ca3429d0 ffff8800ca342a30 ffff8800ca342520 ffff8800cb801d88
    | [ 285.964007] ffffffff8146554a ffff8800cc77cc78 ffff8800ca3429d0 ffff88011f5d3800
    | [ 285.964007] ffff8800cb801e08 ffffffff810683c1 ffffffff810682ff 0000000000000046
    | [ 285.964007] Call Trace:
    | [ 285.964007] [] release_one_tty+0x54/0xa3
    | [ 285.964007] [] process_one_work+0x223/0x404
    | [ 285.964007] [] ? process_one_work+0x161/0x404
    | [ 285.964007] [] worker_thread+0x136/0x205
    | [ 285.964007] [] ? rescuer_thread+0x26a/0x26a
    | [ 285.964007] [] kthread+0xa2/0xaa
    | [ 285.964007] [] ? trace_hardirqs_on_caller+0x16/0x1eb
    | [ 285.964007] [] ? __kthread_parkme+0x65/0x65
    | [ 285.964007] [] ret_from_fork+0x7c/0xb0
    | [ 285.964007] [] ? __kthread_parkme+0x65/0x65
    | [ 285.964007] Code: 09 00 5b 41 5c 5d c3 0f 1f 44 00 00 55 48 85 ff 48 89 e5 41 55 41 54 49 89 fc 53 0f 84 d3 00
    | 00 00 bf 01 00 00 00 e8 d0 a1 fc ff 8b 84 24 50 02 00 00 65 48 ff 40 08 4c 8b 6d 08 0f 1f 44 00

    so simply keep a local reference to the module owner and
    use it later.

    CC: Pavel Emelyanov
    CC: Jiri Slaby
    CC: Greg Kroah-Hartman
    Signed-off-by: Cyrill Gorcunov
    Signed-off-by: Greg Kroah-Hartman

    Cyrill Gorcunov
     
  • Frank reports that after continuing in kgdb the RX stale event
    doesn't occur until after the RX fifo is filled up with exactly
    the amount of characters programmed for the RX watermark (in this
    case it's 48). To read a single character from the uartdm
    hardware we force a stale event so that any characters in the RX
    packing buffer are flushed into the RX fifo immediately instead
    of waiting for a stale timeout or for the fifo to fill. Forcing
    that stale event asserts the stale interrupt but we never clear
    that interrupt via UART_CR_CMD_RESET_STALE_INT in the polling
    functions. So when kgdb continues the stale interrupt is left
    pending in the hardware and we don't timeout with a stale event,
    like we usually would if a user typed one character on the
    console, until the reset stale interrupt and stale event commands
    are sent. Frank could get things working again by running
    handle_rx_dm(). By putting enough characters into the fifo he
    could trigger a watermark interrupt, and thus cause
    handle_rx_dm() to run finally resetting the stale interrupt
    and enabling the stale event so that single characters would
    cause timeouts again.

    The fix is to just do what the interrupt routine was doing all
    along and clear the stale interrupt and enable the event again.
    Doing this also smooths over any differences in the fifo behavior
    between v1.3 and v1.4 hardware allowing us to skip forcing the
    uart into single character mode.

    Reviewed-by: Frank Rowand
    Tested-by: Frank Rowand
    Fixes: f7e54d7ad743 "msm_serial: Add support for poll_{get,put}_char()"
    Signed-off-by: Stephen Boyd
    Signed-off-by: Greg Kroah-Hartman

    Stephen Boyd
     
  • The prefix suggests the number should be printed in hex, so use
    the %x specifier to do that.

    Found by using regex suggested by Joe Perches.

    Signed-off-by: Hans Wennborg
    Signed-off-by: Greg Kroah-Hartman

    Hans Wennborg
     
  • CLPS711X serial driver uses the system wide registers to control the
    modem signals. Now gpio-syscon driver can be used for this purposes.
    mctrl_gpio helpers allow us to create GPIO bindings for any of modem/tty
    control signals that extends the functionality of the driver.
    This patch makes such change.

    This change does not break any current DT bindings, since DT support
    for this platform is not introduced yet.

    Signed-off-by: Alexander Shiyan
    Signed-off-by: Greg Kroah-Hartman

    Alexander Shiyan
     
  • printk replaced with corresponding dev_* .
    fixed two broken user-visible strings used by the corresponding printk.
    the null check for uport->dev and port->dev is removed as dev_* will check for
    null while printing.
    printing of dev_name(uport->dev) and dev_name(port->dev) also removed as those
    are being printed by dev_* .

    Signed-off-by: Sudip Mukherjee
    Signed-off-by: Greg Kroah-Hartman

    Sudip Mukherjee
     
  • Signed-off-by: Matthias Brugger
    Signed-off-by: Greg Kroah-Hartman

    Matthias Brugger
     
  • Make the of_device_id arrays const, as it is handled as const by all OF
    functions.

    Signed-off-by: Tobias Klauser
    Signed-off-by: Greg Kroah-Hartman

    Tobias Klauser
     
  • fixed below checkpatch.pl warning:

    WARNING: void function return statements are not generally useful

    Signed-off-by: Kiran Padwal
    Signed-off-by: Greg Kroah-Hartman

    Kiran Padwal
     
  • fixed below checkpatch.pl warning:

    WARNING: else is not generally useful after a break or return

    Signed-off-by: Kiran Padwal
    Signed-off-by: Greg Kroah-Hartman

    Kiran Padwal
     
  • fixed below checkpatch.pl warning:

    WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...

    WARNING: Prefer [subsystem eg: netdev]_info([subsystem]dev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ...

    Signed-off-by: Kiran Padwal
    Signed-off-by: Greg Kroah-Hartman

    Kiran Padwal
     
  • This patch fixes below checkpatch.pl warning and it remove extra blank lines:

    WARNING: Missing a blank line after declarations

    Signed-off-by: Kiran Padwal
    Signed-off-by: Greg Kroah-Hartman

    Kiran Padwal
     
  • fixed below checkpatch.pl warning:

    WARNING: braces {} are not necessary for any arm of this statement

    Signed-off-by: Kiran Padwal
    Signed-off-by: Greg Kroah-Hartman

    Kiran Padwal
     
  • This patch lets you set the RS485 cappabilites of the device through
    TIOCSRS485 and TIOCGRS485 as defined on Documentation/serial/serial-rs485.txt

    In order to probe the device, the PNP id and the device id is used.

    Signed-off-by: Ricardo Ribalda Delgado
    Signed-off-by: Greg Kroah-Hartman

    Ricardo Ribalda Delgado
     
  • This patch allow the users of the 8250 infrastructure to define a
    handler for RS485 configration.

    If no handler is defined the 8250 driver will work as usual.

    Signed-off-by: Ricardo Ribalda Delgado
    Acked-by: Alan Cox
    --
    v2:Change suggested by Alan "One Thousand Gnomes":
    - Move rs485 structure further down on the uart_8250_port structure

    drivers/tty/serial/8250/8250_core.c | 39 +++++++++++++++++++++++++++++++++++++
    include/linux/serial_8250.h | 3 +++
    2 files changed, 42 insertions(+)
    Signed-off-by: Greg Kroah-Hartman

    Ricardo Ribalda Delgado
     
  • The Digi Neo cards are supported by the jsm driver. Remove support
    for these cards from dgnc.

    Signed-off-by: Bill Pemberton
    Signed-off-by: Greg Kroah-Hartman

    Bill Pemberton
     
  • Add device ids for additional Neo cards. The ids come from the dgnc
    driver.

    Signed-off-by: Bill Pemberton
    Signed-off-by: Greg Kroah-Hartman

    Bill Pemberton
     

01 Sep, 2014

8 commits

  • Linus Torvalds
     
  • Pull Xtensa updates from Chris Zankel:
    "Xtensa improvements for 3.17:
    - support highmem on cores with aliasing data cache. Enable highmem
    on kc705 by default
    - simplify addition of new core variants (no need to modify Kconfig /
    Makefiles)
    - improve robustness of unaligned access handler and its interaction
    with window overflow/underflow exception handlers
    - deprecate atomic and spill registers syscalls
    - clean up Kconfig: remove orphan MATH_EMULATION, sort 'select'
    statements
    - wire up renameat2 syscall.

    Various fixes:
    - fix address checks in dma_{alloc,free}_coherent (runtime BUG)
    - fix access to THREAD_RA/THREAD_SP/THREAD_DS (debug build breakage)
    - fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
    (runtime unrecoverable exception)
    - fix a6 and a7 handling in fast_syscall_xtensa (runtime userspace
    register clobbering)
    - fix kernel/user jump out of fast_unaligned (potential runtime
    unrecoverabl exception)
    - replace termios IOCTL code definitions with constants (userspace
    build breakage)"

    * tag 'xtensa-20140830' of git://github.com/czankel/xtensa-linux: (25 commits)
    xtensa: deprecate fast_xtensa and fast_spill_registers syscalls
    xtensa: don't allow overflow/underflow on unaligned stack
    xtensa: fix a6 and a7 handling in fast_syscall_xtensa
    xtensa: allow single-stepping through unaligned load/store
    xtensa: move invalid unaligned instruction handler closer to its users
    xtensa: make fast_unaligned store restartable
    xtensa: add double exception fixup handler for fast_unaligned
    xtensa: fix kernel/user jump out of fast_unaligned
    xtensa: configure kc705 for highmem
    xtensa: support highmem in aliasing cache flushing code
    xtensa: support aliasing cache in kmap
    xtensa: support aliasing cache in k[un]map_atomic
    xtensa: implement clear_user_highpage and copy_user_highpage
    xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss
    xtensa: allow fixmap and kmap span more than one page table
    xtensa: make fixmap region addressing grow with index
    xtensa: fix access to THREAD_RA/THREAD_SP/THREAD_DS
    xtensa: add renameat2 syscall
    xtensa: fix address checks in dma_{alloc,free}_coherent
    xtensa: replace IOCTL code definitions with constants
    ...

    Linus Torvalds
     
  • unicore32 builds fail with

    arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
    arch/unicore32/kernel/signal.c:257: error: ‘usig’ undeclared (first use in this function)
    arch/unicore32/kernel/signal.c:279: error: ‘usig’ undeclared (first use in this function)
    arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
    arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’
    arch/unicore32/kernel/signal.c: In function ‘do_signal’:
    arch/unicore32/kernel/signal.c:376: error: implicit declaration of function ‘get_signsl’
    make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
    make: *** [arch/unicore32/kernel/signal.o] Error 2

    Bisect points to commit 649671c90eaf ("unicore32: Use get_signal()
    signal_setup_done()").

    This code never even compiled. Reverting the patch does not work, since
    previously used functions no longer exist, so try to fix it up. Compile
    tested only.

    Fixes: 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()")
    Cc: Richard Weinberger
    Signed-off-by: Guenter Roeck
    Signed-off-by: Linus Torvalds

    Guenter Roeck
     
  • Pull ARM fixes from Russell King:
    "Various assorted fixes:

    - a couple of patches from Mark Rutland to resolve an errata with
    Cortex-A15 CPUs.
    - fix cpuidle for the CPU part ID changes in the last merge window
    - add support for a relocation which ARM binutils is generating in
    some circumstances"

    * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
    ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number
    ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex
    ARM: 8128/1: abort: don't clear the exclusive monitors
    ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "Here's the weekly batch of fixes from arm-soc.

    The delta is a largeish negative delta, due to revert of SMP support
    for Broadcom's STB SoC -- it was accidentally merged before some
    issues had been addressed, so they will make a new attempt for 3.18.
    I didn't see a need for a full revert of the whole platform due to
    this, we're keeping the rest enabled.

    The rest is mostly:

    - a handful of DT fixes for i.MX (Hummingboard/Cubox-i in particular)
    - some MTD/NAND fixes for OMAP
    - minor DT fixes for shmobile
    - warning fix for UP builds on vexpress/spc

    There's also a couple of patches that wires up hwmod on TI's DRA7 SoC
    so it can boot. Drivers and the rest had landed for 3.17, and it's
    small and isolated so it made sense to pick up now even if it's not a
    bugfix"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
    vexpress/spc: fix a build warning on array bounds
    ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
    ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants
    MAINTAINERS: catch special Rockchip code locations
    ARM: dts: microsom-ar8035: MDIO pad must be set open drain
    ARM: dts: omap54xx-clocks: Fix the l3 and l4 clock rates
    ARM: brcmstb: revert SMP support
    ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled
    ARM: dts: Enable UART wake-up events for beagleboard
    ARM: dts: Remove twl6030 clk32g "regulator"
    ARM: OMAP2+: omap_device: remove warning that clk alias already exists
    ARM: OMAP: fix %d confusingly prefixed with 0x in format string
    ARM: dts: DRA7: fix interrupt-cells for GPIO
    mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc()
    ARM: dts: omap3430-sdp: Revert to using software ECC for NAND
    ARM: OMAP2+: GPMC: Support Software ECC scheme via DT
    mtd: nand: omap: Revert to using software ECC by default
    ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive
    ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration
    ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR
    ...

    Linus Torvalds
     
  • With ARCH_VEXPRESS_SPC option, kernel build has the following
    warning:

    arch/arm/mach-vexpress/spc.c: In function ‘ve_spc_clk_init’:
    arch/arm/mach-vexpress/spc.c:431:38: warning: array subscript is below array bounds [-Warray-bounds]
    struct ve_spc_opp *opps = info->opps[cluster];
    ^
    since 'cluster' maybe '-1' in UP system. This patch does a active
    checking to fix this issue.

    Signed-off-by: Alex Shi
    Acked-by: Pawel Moll
    Acked-by: Sudeep Holla
    Signed-off-by: Olof Johansson

    Alex Shi
     
  • …scm/linux/kernel/git/pjw/omap-pending into fixes

    Pull "ARM: OMAP2+: DRA72x/DRA74x basic support" from Tony Lindgren:

    Add basic subarchitecture support for the DRA72x and DRA74x. These
    are OMAP2+ derivative SoCs. This should be low-risk to existing OMAP
    platforms.

    Basic build, boot, and PM test logs are available here:

    http://www.pwsan.com/omap/testlogs/hwmod-a-early-v3.17-rc/20140827194314/

    * tag 'for-v3.17-rc/omap-dra72x-d74x-support-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
    ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists
    ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • Pull spi bugfixes from Mark Brown:
    "A smattering of bug fixes for the SPI subsystem, all in driver code
    which has seen active work recently and none of them with any great
    global impact.

    There's also a new ACPI ID for the pxa2xx driver which required no
    code changes and the addition of kerneldoc for some structure fields
    that were missing it and generating warnings during documentation
    builds as a result"

    * tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
    spi: sh-msiof: Fix transmit-only DMA transfers
    spi/rockchip: Avoid accidentally turning off the clock
    spi: dw: fix kernel crash due to NULL pointer dereference
    spi: dw-pci: fix bug when regs left uninitialized
    spi: davinci: fix SPI_NO_CS functionality
    spi/rockchip: fixup incorrect dma direction setting
    spi/pxa2xx: Add ACPI ID for Intel Braswell
    spi: spi-au1550: fix build failure
    spi: rspi: Fix leaking of unused DMA descriptors
    spi: sh-msiof: Fix leaking of unused DMA descriptors
    spi: Add missing kerneldoc bits
    spi/omap-mcspi: Fix the spi task hangs waiting dma_rx

    Linus Torvalds
     

31 Aug, 2014

6 commits


30 Aug, 2014

4 commits

  • Pull x86 fixes from Peter Anvin:
    "One patch to avoid assigning interrupts we don't actually have on
    non-PC platforms, and two patches that addresses bugs in the new
    IOAPIC assignment code"

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, irq, PCI: Keep IRQ assignment for runtime power management
    x86: irq: Fix bug in setting IOAPIC pin attributes
    x86: Fix non-PC platform kernel crash on boot due to NULL dereference

    Linus Torvalds
     
  • Pull ACPI and power management fixes from Rafael Wysocki:

    - Fix for an ACPI regression related to the handling of fixed events
    that caused netlink routines to be (incorrectly) run in interrupt
    context from Lan Tianyu

    - Fix for an ACPI EC driver regression on Acer Aspire V5-573G that
    caused AC/battery plug/unplug and video brightness change
    notifications to be delayed on that machine from Lv Zheng

    - Fix for an ACPI device enumeration regression that caused ACPI driver
    probe to fail for some devices where it succeeded before (Rafael J
    Wysocki)

    - intel_pstate driver fix to prevent it from printing an information
    message for every CPU in the system on every boot from Andi Kleen

    - s5pv210 cpufreq driver fix to remove an __init annotation from a
    routine that in fact can be called at any time after init too from
    Mark Brown

    - New Intel Braswell device ID for the ACPI LPSS (Low-Power Subsystem)
    driver from Alan Cox

    - New Intel Braswell CPU ID for intel_pstate from Mika Westerberg

    * tag 'pm+acpi-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    cpufreq: s5pv210: Remove spurious __init annotation
    cpufreq: intel_pstate: Add CPU ID for Braswell processor
    intel_pstate: Turn per cpu printk into pr_debug
    ACPI / LPSS: Add ACPI IDs for Intel Braswell
    ACPI / EC: Add support to disallow QR_EC to be issued before completing previous QR_EC
    ACPI / EC: Add support to disallow QR_EC to be issued when SCI_EVT isn't set
    ACPI: Run fixed event device notifications in process context
    ACPI / scan: Allow ACPI drivers to bind to PNP device objects

    Linus Torvalds
     
  • Merge patches from Andrew Morton:
    "22 fixes"

    * emailed patches from Andrew Morton : (22 commits)
    kexec: purgatory: add clean-up for purgatory directory
    Documentation/kdump/kdump.txt: add ARM description
    flush_icache_range: export symbol to fix build errors
    tools: selftests: fix build issue with make kselftests target
    ocfs2: quorum: add a log for node not fenced
    ocfs2: o2net: set tcp user timeout to max value
    ocfs2: o2net: don't shutdown connection when idle timeout
    ocfs2: do not write error flag to user structure we cannot copy from/to
    x86/purgatory: use approprate -m64/-32 build flag for arch/x86/purgatory
    drivers/rtc/rtc-s5m.c: re-add support for devices without irq specified
    xattr: fix check for simultaneous glibc header inclusion
    kexec: remove CONFIG_KEXEC dependency on crypto
    kexec: create a new config option CONFIG_KEXEC_FILE for new syscall
    x86,mm: fix pte_special versus pte_numa
    hugetlb_cgroup: use lockdep_assert_held rather than spin_is_locked
    mm/zpool: use prefixed module loading
    zram: fix incorrect stat with failed_reads
    lib: turn CONFIG_STACKTRACE into an actual option.
    mm: actually clear pmd_numa before invalidating
    memblock, memhotplug: fix wrong type in memblock_find_in_range_node().
    ...

    Linus Torvalds
     
  • Without this patch the kexec-purgatory.c and purgatory.ro files are not
    removed after make mrproper.

    Signed-off-by: Michael Welling
    Acked-by: Vivek Goyal
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Thomas Gleixner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Welling