1. 05 Aug, 2014 20 commits
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 161d2e0a
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "Notable changes:
      
         - Heiko Schocher provided a driver for TI TMP103.
         - Kamil Debski provided a driver for pwm-controlled fans.
         - Neelesh Gupta provided a driver for power, fan rpm, voltage and
           temperature reporting on powerpc/powernv systems.
         - Scott Kanowitz provided a driver supporting Lattice's POWR1220
           power manager IC.
         - Richard Zhu provided a pmbus front-end driver for TPS40422.
         - Frans Klaver added support for TMP112 to the lm75 driver.
         - Johannes Pointner added support for EPCOS B57330V2103 to the
           ntc_thermistor driver.
         - Guenter Roeck added support for TMP441 and TMP442 to the tmp421
           driver.
         - Axel Lin converted several drivers to the new hwmon API (36 of
           them, if I counted correctly), and cleaned up many of the drivers
           along the way.
      
        There are also a number of patches fixing bugs discovered while
        testing Axel's changes"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (88 commits)
        hwmon: (g762) Use of_property_read_u32 at appropriate place
        hwmon: (sis5595) Prevent overflow problem when writing large limits
        hwmon: (gpio-fan) Prevent overflow problem when writing large limits
        hwmon: (ibmpowernv) Use of_property_read_u32 at appropriate place
        hwmon: (lm85) Convert to devm_hwmon_device_register_with_groups
        hwmon: (lm85) Avoid forward declaration
        hwmon: (lm78) Convert to devm_hwmon_device_register_with_groups
        hwmon: (max6697) Use of_property_read_bool at appropriate places
        hwmon: (pwm-fan) Make SENSORS_PWM_FAN depend on OF
        hwmon: (pwm-fan) Remove duplicate dev_set_drvdata call
        hwmon: (nct6775) Remove num_attr_groups from struct nct6775_data
        hwmon: (nct6775) Update module description and Kconfig for NCT6106D and NCT6791D
        hwmon: (adt7411) Convert to devm_hwmon_device_register_with_groups
        hwmon: (g762) Convert to hwmon_device_register_with_groups
        hwmon: (emc2103) Convert to devm_hwmon_device_register_with_groups
        hwmon: (smsc47m1) Avoid forward declaration
        hwmon: (smsc47m192) Convert to devm_hwmon_device_register_with_groups
        hwmon: (smsc47m192) Avoid forward declaration
        hwmon: (max1668) Make max1668_addr_list array const
        hwmon: (max6639) Make normal_i2c array const
        ...
      161d2e0a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · c489d98c
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Included in this update:
      
         - perf updates from Will Deacon:
      
           The main changes are callchain stability fixes from Jean Pihet and
           event mapping and PMU name rework from Mark Rutland
      
           The latter is preparatory work for enabling some code re-use with
           arm64 in the future.
      
         - updates for nommu from Uwe Kleine-König:
      
           Two different fixes for the same problem making some ARM nommu
           configurations not boot since 3.6-rc1.  The problem is that
           user_addr_max returned the biggest available RAM address which
           makes some copy_from_user variants fail to read from XIP memory.
      
         - deprecate legacy OMAP DMA API, in preparation for it's removal.
      
           The popular drivers have been converted over, leaving a very small
           number of rarely used drivers, which hopefully can be converted
           during the next cycle with a bit more visibility (and hopefully
           people popping out of the woodwork to help test)
      
         - more tweaks for BE systems, particularly with the kernel image
           format.  In connection with this, I've cleaned up the way we
           generate the linker script for the decompressor.
      
         - removal of hard-coded assumptions of the kernel stack size, making
           everywhere depend on the value of THREAD_SIZE_ORDER.
      
         - MCPM updates from Nicolas Pitre.
      
         - Make it easier for proper CPU part number checks (which should
           always include the vendor field).
      
         - Assembly code optimisation - use the "bx" instruction when
           returning from a function on ARMv6+ rather than "mov pc, reg".
      
         - Save the last kernel misaligned fault location and report it via
           the procfs alignment file.
      
         - Clean up the way we create the initial stack frame, which is a
           repeated pattern in several different locations.
      
         - Support for 8-byte get_user(), needed for some DRM implementations.
      
         - mcs locking from Will Deacon.
      
         - Save and restore a few more Cortex-A9 registers (for errata
           workarounds)
      
         - Fix various aspects of the SWP emulation, and the ELF hwcap for the
           SWP instruction.
      
         - Update LPAE logic for pte_write and pmd_write to make it more
           correct.
      
         - Support for Broadcom Brahma15 CPU cores.
      
         - ARM assembly crypto updates from Ard Biesheuvel"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (53 commits)
        ARM: add comments to the early page table remap code
        ARM: 8122/1: smp_scu: enable SCU standby support
        ARM: 8121/1: smp_scu: use macro for SCU enable bit
        ARM: 8120/1: crypto: sha512: add ARM NEON implementation
        ARM: 8119/1: crypto: sha1: add ARM NEON implementation
        ARM: 8118/1: crypto: sha1/make use of common SHA-1 structures
        ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from <mach/memory.h>
        ARM: 8111/1: Enable erratum 798181 for Broadcom Brahma-B15
        ARM: 8110/1: do CPU-specific init for Broadcom Brahma15 cores
        ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE
        ARM: 8108/1: mm: Introduce {pte,pmd}_isset and {pte,pmd}_isclear
        ARM: hwcap: disable HWCAP_SWP if the CPU advertises it has exclusives
        ARM: SWP emulation: only initialise on ARMv7 CPUs
        ARM: SWP emulation: always enable when SMP is enabled
        ARM: 8103/1: save/restore Cortex-A9 CP15 registers on suspend/resume
        ARM: 8098/1: mcs lock: implement wfe-based polling for MCS locking
        ARM: 8091/2: add get_user() support for 8 byte types
        ARM: 8097/1: unistd.h: relocate comments back to place
        ARM: 8096/1: Describe required sort order for textofs-y (TEXT_OFFSET)
        ARM: 8090/1: add revision info for PL310 errata 588369 and 727915
        ...
      c489d98c
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · f67d251a
      Linus Torvalds authored
      Pull m68knommu fixes from Greg Ungerer:
       "Just a couple of small fixes.  Fix definition of page_to_phys() and
        remove unecesary prototype of kobjsize()"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: Remove unnecessary prototype for kobjsize()
        m68knommu: Correct page_to_phys when PAGE_OFFSET is non-zero.
      f67d251a
    • Russell King's avatar
      Merge branch 'devel-stable' into for-next · f15bdfe4
      Russell King authored
      Conflicts:
      	arch/arm/kernel/perf_event_cpu.c
      f15bdfe4
    • Russell King's avatar
      c89c3a6a
    • Russell King's avatar
      Merge branches 'fixes' and 'misc' into for-next · 71095615
      Russell King authored
      Conflicts:
      	arch/arm/kernel/iwmmxt.S
      	arch/arm/mm/cache-l2x0.c
      	arch/arm/mm/mmu.c
      71095615
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 8e099d1e
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "Bug fixes and clean ups for the 3.17 merge window"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct
        ext4: fix COLLAPSE RANGE test for bigalloc file systems
        ext4: check inline directory before converting
        ext4: fix incorrect locking in move_extent_per_page
        ext4: use correct depth value
        ext4: add i_data_sem sanity check
        ext4: fix wrong size computation in ext4_mb_normalize_request()
        ext4: make ext4_has_inline_data() as a inline function
        ext4: remove readpage() check in ext4_mmap_file()
        ext4: fix punch hole on files with indirect mapping
        ext4: remove metadata reservation checks
        ext4: rearrange initialization to fix EXT4FS_DEBUG
      8e099d1e
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · b54ecfb7
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This series includes patches to:
         - add nobarrier mount option
         - support tmpfile and rename2
         - enhance the fdatasync behavior
         - fix the error path
         - fix the recovery routine
         - refactor a part of the checkpoint procedure
         - reduce some lock contentions"
      
      * tag 'for-f2fs-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (40 commits)
        f2fs: use for_each_set_bit to simplify the code
        f2fs: add f2fs_balance_fs for expand_inode_data
        f2fs: invalidate xattr node page when evict inode
        f2fs: avoid skipping recover_inline_xattr after recover_inline_data
        f2fs: add tracepoint for f2fs_direct_IO
        f2fs: reduce competition among node page writes
        f2fs: fix coding style
        f2fs: remove redundant lines in allocate_data_block
        f2fs: add tracepoint for f2fs_issue_flush
        f2fs: avoid retrying wrong recovery routine when error was occurred
        f2fs: test before set/clear bits
        f2fs: fix wrong condition for unlikely
        f2fs: enable in-place-update for fdatasync
        f2fs: skip unnecessary data writes during fsync
        f2fs: add info of appended or updated data writes
        f2fs: use radix_tree for ino management
        f2fs: add infra for ino management
        f2fs: punch the core function for inode management
        f2fs: add nobarrier mount option
        f2fs: fix to put root inode in error path of fill_super
        ...
      b54ecfb7
    • Linus Torvalds's avatar
      Merge tag 'usb-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · ae9b475e
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here is the big USB driver update for 3.17-rc1.
      
        Loads of gadget driver changes in here, including some big file
        movements to make things easier to manage over time.  There's also the
        usual xhci and uas driver updates, and a handful of other changes in
        here.  The changelog has the full details.
      
        All of these have been in linux-next for a while"
      
      * tag 'usb-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (211 commits)
        USB: devio: fix issue with log flooding
        uas: Log a warning when we cannot use uas because the hcd lacks streams
        uas: Only complain about missing sg if all other checks succeed
        xhci: Add missing checks for xhci_alloc_command failure
        xhci: Rename Asrock P67 pci product-id to EJ168
        xhci: Blacklist using streams on the Etron EJ168 controller
        uas: Limit qdepth to 32 when connected over usb-2
        uwb/whci: use correct structure type name in sizeof
        usb-core bInterval quirk
        USB: serial: ftdi_sio: Add support for new Xsens devices
        USB: serial: ftdi_sio: Annotate the current Xsens PID assignments
        usb: chipidea: debug: fix sparse non static symbol warnings
        usb: ci_hdrc_imx doc: fsl,usbphy is required
        usb: ci_hdrc_imx: Return -EINVAL for missing USB PHY
        usb: core: allow zero packet flag for interrupt urbs
        usb: lvstest: Fix sparse warnings generated by kbuild test bot
        USB: core: hcd-pci: free IRQ before disabling PCI device when shutting down
        phy: miphy365x: Represent each PHY channel as a DT subnode
        phy: miphy365x: Provide support for the MiPHY356x Generic PHY
        phy: miphy365x: Add Device Tree bindings for the MiPHY365x
        ...
      ae9b475e
    • Linus Torvalds's avatar
      Merge tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 79eb238c
      Linus Torvalds authored
      Pull tty / serial driver update from Greg KH:
       "Here's the big tty / serial driver update for 3.17-rc1.
      
        Nothing major, just a number of fixes and new features for different
        serial drivers, and some more tty core fixes and documentation of the
        tty locks.
      
        All of these have been in linux-next for a while"
      
      * tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (82 commits)
        tty/n_gsm.c: fix a memory leak in gsmld_open
        pch_uart: don't hardcode PCI slot to get DMA device
        tty: n_gsm, use setup_timer
        Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"
        serial: sc16is7xx: Correct initialization of s->clk
        serial: 8250_dw: Add support for deferred probing
        serial: 8250_dw: Add optional reset control support
        serial: st-asc: Fix overflow in baudrate calculation
        serial: st-asc: Don't call BUG in asc_console_setup()
        tty: serial: msm: Make of_device_id array const
        tty/n_gsm.c: get gsm->num after gsm_activate_mux
        serial/core: Fix too big allocation for attribute member
        drivers/tty/serial: use correct type for dma_map/unmap
        serial: altera_jtaguart: Fix putchar function passed to uart_console_write()
        serial/uart/8250: Add tunable RX interrupt trigger I/F of FIFO buffers
        Serial: allow port drivers to have a default attribute group
        tty: kgdb_nmi: Automatically manage tty enable
        serial: altera_jtaguart: Adpot uart_console_write()
        serial: samsung: improve code clarity by defining a variable
        serial: samsung: correct the case and default order in switch
        ...
      79eb238c
    • Linus Torvalds's avatar
      Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 53ee9833
      Linus Torvalds authored
      Pull staging driver updates from Greg KH:
       "Here's the big pull request for the staging driver tree for 3.17-rc1.
      
        Lots of things in here, over 2000 patches, but the best part is this:
         1480 files changed, 39070 insertions(+), 254659 deletions(-)
      
        Thanks to the great work of Kristina Martšenko, 14 different staging
        drivers have been removed from the tree as they were obsolete and no
        one was willing to work on cleaning them up.  Other than the driver
        removals, loads of cleanups are in here (comedi, lustre, etc.) as well
        as the usual IIO driver updates and additions.
      
        All of this has been in the linux-next tree for a while"
      
      * tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits)
        staging: comedi: addi_apci_1564: remove diagnostic interrupt support code
        staging: comedi: addi_apci_1564: add subdevice to check diagnostic status
        staging: wlan-ng: coding style problem fix
        staging: wlan-ng: fixing coding style problems
        staging: comedi: ii_pci20kc: request and ioremap memory
        staging: lustre: bitwise vs logical typo
        staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h
        staging: dgnc: rephrase comment
        staging: comedi: ni_tio: remove some dead code
        staging: rtl8723au: Fix static symbol sparse warning
        staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc'
        staging: rtl8723au: Do not duplicate kernel provided USB macros
        staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown
        staging: rtl8723au: Remove two never set variables
        staging: rtl8723au: RSSI_test is never set
        staging:r8190: coding style: Fixed checkpatch reported Error
        staging:r8180: coding style: Fixed too long lines
        staging:r8180: coding style: Fixed commenting style
        staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer
        staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer
        ...
      53ee9833
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.17-rc1' of... · 29b88e23
      Linus Torvalds authored
      Merge tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core updates from Greg KH:
       "Here's the big driver-core pull request for 3.17-rc1.
      
        Largest thing in here is the dma-buf rework and fence code, that
        touched many different subsystems so it was agreed it should go
        through this tree to handle merge issues.  There's also some firmware
        loading updates, as well as tests added, and a few other tiny changes,
        the changelog has the details.
      
        All have been in linux-next for a long time"
      
      * tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (32 commits)
        ARM: imx: Remove references to platform_bus in mxc code
        firmware loader: Fix _request_firmware_load() return val for fw load abort
        platform: Remove most references to platform_bus device
        test: add firmware_class loader test
        doc: fix minor typos in firmware_class README
        staging: android: Cleanup style issues
        Documentation: devres: Sort managed interfaces
        Documentation: devres: Add devm_kmalloc() et al
        fs: debugfs: remove trailing whitespace
        kernfs: kernel-doc warning fix
        debugfs: Fix corrupted loop in debugfs_remove_recursive
        stable_kernel_rules: Add pointer to netdev-FAQ for network patches
        driver core: platform: add device binding path 'driver_override'
        driver core/platform: remove unused implicit padding in platform_object
        firmware loader: inform direct failure when udev loader is disabled
        firmware: replace ALIGN(PAGE_SIZE) by PAGE_ALIGN
        firmware: read firmware size using i_size_read()
        firmware loader: allow disabling of udev as firmware loader
        reservation: add suppport for read-only access using rcu
        reservation: update api and add some helpers
        ...
      
      Conflicts:
      	drivers/base/platform.c
      29b88e23
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 2521129a
      Linus Torvalds authored
      Pull char / misc driver patches from Greg KH:
       "Here's the big driver misc / char pull request for 3.17-rc1.
      
        Lots of things in here, the thunderbolt support for Apple laptops,
        some other new drivers, testing fixes, and other good things.  All
        have been in linux-next for a long time"
      
      * tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (119 commits)
        misc: bh1780: Introduce the use of devm_kzalloc
        Lattice ECP3 FPGA: Correct endianness
        drivers/misc/ti-st: Load firmware from ti-connectivity directory.
        dt-bindings: extcon: Add support for SM5502 MUIC device
        extcon: sm5502: Change internal hardware switch according to cable type
        extcon: sm5502: Detect cable state after completing platform booting
        extcon: sm5502: Add support new SM5502 extcon device driver
        extcon: arizona: Get MICVDD against extcon device
        extcon: Remove unnecessary OOM messages
        misc: vexpress: Fix sparse non static symbol warnings
        mei: drop unused hw dependent fw status functions
        misc: bh1770glc: Use managed functions
        pcmcia: remove DEFINE_PCI_DEVICE_TABLE usage
        misc: remove DEFINE_PCI_DEVICE_TABLE usage
        ipack: Replace DEFINE_PCI_DEVICE_TABLE macro use
        drivers/char/dsp56k.c: drop check for negativity of unsigned parameter
        mei: fix return value on disconnect timeout
        mei: don't schedule suspend in pm idle
        mei: start disconnect request timer consistently
        mei: reset client connection state on timeout
        ...
      2521129a
    • Linus Torvalds's avatar
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98a96f20
      Linus Torvalds authored
      Pull x86 vdso updates from Ingo Molnar:
       "Further simplifications and improvements to the VDSO code, by Andy
        Lutomirski"
      
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64/vsyscall: Fix warn_bad_vsyscall log output
        x86/vdso: Set VM_MAYREAD for the vvar vma
        x86, vdso: Get rid of the fake section mechanism
        x86, vdso: Move the vvar area before the vdso text
      98a96f20
    • Linus Torvalds's avatar
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5637a2a3
      Linus Torvalds authored
      Pull x86 UV TLB update from Ingo Molnar:
       "UV TLB shootdown logic updates for version of the UV architecture"
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/uv: Update the UV3 TLB shootdown logic
      5637a2a3
    • Linus Torvalds's avatar
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d782cebd
      Linus Torvalds authored
      Pull RAS updates from Ingo Molnar:
       "The main changes in this cycle are:
      
         - RAS tracing/events infrastructure, by Gong Chen.
      
         - Various generalizations of the APEI code to make it available to
           non-x86 architectures, by Tomasz Nowicki"
      
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ras: Fix build warnings in <linux/aer.h>
        acpi, apei, ghes: Factor out ioremap virtual memory for IRQ and NMI context.
        acpi, apei, ghes: Make NMI error notification to be GHES architecture extension.
        apei, mce: Factor out APEI architecture specific MCE calls.
        RAS, extlog: Adjust init flow
        trace, eMCA: Add a knob to adjust where to save event log
        trace, RAS: Add eMCA trace event interface
        RAS, debugfs: Add debugfs interface for RAS subsystem
        CPER: Adjust code flow of some functions
        x86, MCE: Robustify mcheck_init_device
        trace, AER: Move trace into unified interface
        trace, RAS: Add basic RAS trace event
        x86, MCE: Kill CPU_POST_DEAD
      d782cebd
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8556d44f
      Linus Torvalds authored
      Pull x86 platform updates from Ingo Molnar:
       "The main changes in this cycle are:
      
         - Intel SOC driver updates, by Aubrey Li.
      
         - TS5500 platform updates, by Vivien Didelot"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/pmc_atom: Silence shift wrapping warnings in pmc_sleep_tmr_show()
        x86/pmc_atom: Expose PMC device state and platform sleep state
        x86/pmc_atom: Eisable a few S0ix wake up events for S0ix residency
        x86/platform: New Intel Atom SOC power management controller driver
        x86/platform/ts5500: Add support for TS-5400 boards
        x86/platform/ts5500: Add a 'name' sysfs attribute
        x86/platform/ts5500: Use the DEVICE_ATTR_RO() macro
      8556d44f
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ce474796
      Linus Torvalds authored
      Pull x86 mm changes from Ingo Molnar:
       "The main change in this cycle is the rework of the TLB range flushing
        code, to simplify, fix and consolidate the code.  By Dave Hansen"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Set TLB flush tunable to sane value (33)
        x86/mm: New tunable for single vs full TLB flush
        x86/mm: Add tracepoints for TLB flushes
        x86/mm: Unify remote INVLPG code
        x86/mm: Fix missed global TLB flush stat
        x86/mm: Rip out complicated, out-of-date, buggy TLB flushing
        x86/mm: Clean up the TLB flushing code
        x86/smep: Be more informative when signalling an SMEP fault
      ce474796
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 76f09aa4
      Linus Torvalds authored
      Pull EFI changes from Ingo Molnar:
       "Main changes in this cycle are:
      
         - arm64 efi stub fixes, preservation of FP/SIMD registers across
           firmware calls, and conversion of the EFI stub code into a static
           library - Ard Biesheuvel
      
         - Xen EFI support - Daniel Kiper
      
         - Support for autoloading the efivars driver - Lee, Chun-Yi
      
         - Use the PE/COFF headers in the x86 EFI boot stub to request that
           the stub be loaded with CONFIG_PHYSICAL_ALIGN alignment - Michael
           Brown
      
         - Consolidate all the x86 EFI quirks into one file - Saurabh Tangri
      
         - Additional error logging in x86 EFI boot stub - Ulf Winkelvos
      
         - Support loading initrd above 4G in EFI boot stub - Yinghai Lu
      
         - EFI reboot patches for ACPI hardware reduced platforms"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits)
        efi/arm64: Handle missing virtual mapping for UEFI System Table
        arch/x86/xen: Silence compiler warnings
        xen: Silence compiler warnings
        x86/efi: Request desired alignment via the PE/COFF headers
        x86/efi: Add better error logging to EFI boot stub
        efi: Autoload efivars
        efi: Update stale locking comment for struct efivars
        arch/x86: Remove efi_set_rtc_mmss()
        arch/x86: Replace plain strings with constants
        xen: Put EFI machinery in place
        xen: Define EFI related stuff
        arch/x86: Remove redundant set_bit(EFI_MEMMAP) call
        arch/x86: Remove redundant set_bit(EFI_SYSTEM_TABLES) call
        efi: Introduce EFI_PARAVIRT flag
        arch/x86: Do not access EFI memory map if it is not available
        efi: Use early_mem*() instead of early_io*()
        arch/ia64: Define early_memunmap()
        x86/reboot: Add EFI reboot quirk for ACPI Hardware Reduced flag
        efi/reboot: Allow powering off machines using EFI
        efi/reboot: Add generic wrapper around EfiResetSystem()
        ...
      76f09aa4
    • Linus Torvalds's avatar
      Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e9c9eeca
      Linus Torvalds authored
      Pull x86 cpufeature updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Continued cleanups of CPU bugs mis-marked as 'missing features', by
           Borislav Petkov.
      
         - Detect the xsaves/xrstors feature and releated cleanup, by Fenghua
           Yu"
      
      * 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, cpu: Kill cpu_has_mp
        x86, amd: Cleanup init_amd
        x86/cpufeature: Add bug flags to /proc/cpuinfo
        x86, cpufeature: Convert more "features" to bugs
        x86/xsaves: Detect xsaves/xrstors feature
        x86/cpufeature.h: Reformat x86 feature macros
      e9c9eeca
  2. 04 Aug, 2014 20 commits
    • Linus Torvalds's avatar
      Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and... · 19d402c1
      Linus Torvalds authored
      Merge branches 'x86-build-for-linus', 'x86-cleanups-for-linus' and 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull x86 build/cleanup/debug updates from Ingo Molnar:
       "Robustify the build process with a quirk to avoid GCC reordering
        related bugs.
      
        Two code cleanups.
      
        Simplify entry_64.S CFI annotations, by Jan Beulich"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, build: Change code16gcc.h from a C header to an assembly header
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Simplify __HAVE_ARCH_CMPXCHG tests
        x86/tsc: Get rid of custom DIV_ROUND() macro
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/debug: Drop several unnecessary CFI annotations
      19d402c1
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 98959948
      Linus Torvalds authored
      Pull scheduler updates from Ingo Molnar:
      
       - Move the nohz kick code out of the scheduler tick to a dedicated IPI,
         from Frederic Weisbecker.
      
        This necessiated quite some background infrastructure rework,
        including:
      
         * Clean up some irq-work internals
         * Implement remote irq-work
         * Implement nohz kick on top of remote irq-work
         * Move full dynticks timer enqueue notification to new kick
         * Move multi-task notification to new kick
         * Remove unecessary barriers on multi-task notification
      
       - Remove proliferation of wait_on_bit() action functions and allow
         wait_on_bit_action() functions to support a timeout.  (Neil Brown)
      
       - Another round of sched/numa improvements, cleanups and fixes.  (Rik
         van Riel)
      
       - Implement fast idling of CPUs when the system is partially loaded,
         for better scalability.  (Tim Chen)
      
       - Restructure and fix the CPU hotplug handling code that may leave
         cfs_rq and rt_rq's throttled when tasks are migrated away from a dead
         cpu.  (Kirill Tkhai)
      
       - Robustify the sched topology setup code.  (Peterz Zijlstra)
      
       - Improve sched_feat() handling wrt.  static_keys (Jason Baron)
      
       - Misc fixes.
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (37 commits)
        sched/fair: Fix 'make xmldocs' warning caused by missing description
        sched: Use macro for magic number of -1 for setparam
        sched: Robustify topology setup
        sched: Fix sched_setparam() policy == -1 logic
        sched: Allow wait_on_bit_action() functions to support a timeout
        sched: Remove proliferation of wait_on_bit() action functions
        sched/numa: Revert "Use effective_load() to balance NUMA loads"
        sched: Fix static_key race with sched_feat()
        sched: Remove extra static_key*() function indirection
        sched/rt: Fix replenish_dl_entity() comments to match the current upstream code
        sched: Transform resched_task() into resched_curr()
        sched/deadline: Kill task_struct->pi_top_task
        sched: Rework check_for_tasks()
        sched/rt: Enqueue just unthrottled rt_rq back on the stack in __disable_runtime()
        sched/fair: Disable runtime_enabled on dying rq
        sched/numa: Change scan period code to match intent
        sched/numa: Rework best node setting in task_numa_migrate()
        sched/numa: Examine a task move when examining a task swap
        sched/numa: Simplify task_numa_compare()
        sched/numa: Use effective_load() to balance NUMA loads
        ...
      98959948
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ef35ad26
      Linus Torvalds authored
      Pull perf changes from Ingo Molnar:
       "Kernel side changes:
      
         - Consolidate the PMU interrupt-disabled code amongst architectures
           (Vince Weaver)
      
         - misc fixes
      
        Tooling changes (new features, user visible changes):
      
         - Add support for pagefault tracing in 'trace', please see multiple
           examples in the changeset messages (Stanislav Fomichev).
      
         - Add pagefault statistics in 'trace' (Stanislav Fomichev)
      
         - Add header for columns in 'top' and 'report' TUI browsers (Jiri
           Olsa)
      
         - Add pagefault statistics in 'trace' (Stanislav Fomichev)
      
         - Add IO mode into timechart command (Stanislav Fomichev)
      
         - Fallback to syscalls:* when raw_syscalls:* is not available in the
           perl and python perf scripts.  (Daniel Bristot de Oliveira)
      
         - Add --repeat global option to 'perf bench' to be used in benchmarks
           such as the existing 'futex' one, that was modified to use it
           instead of a local option.  (Davidlohr Bueso)
      
         - Fix fd -> pathname resolution in 'trace', be it using /proc or a
           vfs_getname probe point.  (Arnaldo Carvalho de Melo)
      
         - Add suggestion of how to set perf_event_paranoid sysctl, to help
           non-root users trying tools like 'trace' to get a working
           environment.  (Arnaldo Carvalho de Melo)
      
         - Updates from trace-cmd for traceevent plugin_kvm plus args cleanup
           (Steven Rostedt, Jan Kiszka)
      
         - Support S/390 in 'perf kvm stat' (Alexander Yarygin)
      
        Tooling infrastructure changes:
      
         - Allow reserving a row for header purposes in the hists browser
           (Arnaldo Carvalho de Melo)
      
         - Various fixes and prep work related to supporting Intel PT (Adrian
           Hunter)
      
         - Introduce multiple debug variables control (Jiri Olsa)
      
         - Add callchain and additional sample information for python scripts
           (Joseph Schuchart)
      
         - More prep work to support Intel PT: (Adrian Hunter)
           - Polishing 'script' BTS output
           - 'inject' can specify --kallsym
           - VDSO is per machine, not a global var
           - Expose data addr lookup functions previously private to 'script'
           - Large mmap fixes in events processing
      
         - Include standard stringify macros in power pc code (Sukadev
           Bhattiprolu)
      
        Tooling cleanups:
      
         - Convert open coded equivalents to asprintf() (Andy Shevchenko)
      
         - Remove needless reassignments in 'trace' (Arnaldo Carvalho de Melo)
      
         - Cache the is_exit syscall test in 'trace) (Arnaldo Carvalho de
           Melo)
      
         - No need to reimplement err() in 'perf bench sched-messaging', drop
           barf().  (Davidlohr Bueso).
      
         - Remove ev_name argument from perf_evsel__hists_browse, can be
           obtained from the other parameters.  (Jiri Olsa)
      
        Tooling fixes:
      
         - Fix memory leak in the 'sched-messaging' perf bench test.
           (Davidlohr Bueso)
      
         - The -o and -n 'perf bench mem' options are mutually exclusive, emit
           error when both are specified.  (Davidlohr Bueso)
      
         - Fix scrollbar refresh row index in the ui browser, problem exposed
           now that headers will be added and will be allowed to be switched
           on/off.  (Jiri Olsa)
      
         - Handle the num array type in python properly (Sebastian Andrzej
           Siewior)
      
         - Fix wrong condition for allocation failure (Jiri Olsa)
      
         - Adjust callchain based on DWARF debug info on powerpc (Sukadev
           Bhattiprolu)
      
         - Fix a risk for doing free on uninitialized pointer in traceevent
           lib (Rickard Strandqvist)
      
         - Update attr test with PERF_FLAG_FD_CLOEXEC flag (Jiri Olsa)
      
         - Enable close-on-exec flag on perf file descriptor (Yann Droneaud)
      
         - Fix build on gcc 4.4.7 (Arnaldo Carvalho de Melo)
      
         - Event ordering fixes (Jiri Olsa)"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (123 commits)
        Revert "perf tools: Fix jump label always changing during tracing"
        perf tools: Fix perf usage string leftover
        perf: Check permission only for parent tracepoint event
        perf record: Store PERF_RECORD_FINISHED_ROUND only for nonempty rounds
        perf record: Always force PERF_RECORD_FINISHED_ROUND event
        perf inject: Add --kallsyms parameter
        perf tools: Expose 'addr' functions so they can be reused
        perf session: Fix accounting of ordered samples queue
        perf powerpc: Include util/util.h and remove stringify macros
        perf tools: Fix build on gcc 4.4.7
        perf tools: Add thread parameter to vdso__dso_findnew()
        perf tools: Add dso__type()
        perf tools: Separate the VDSO map name from the VDSO dso name
        perf tools: Add vdso__new()
        perf machine: Fix the lifetime of the VDSO temporary file
        perf tools: Group VDSO global variables into a structure
        perf session: Add ability to skip 4GiB or more
        perf session: Add ability to 'skip' a non-piped event stream
        perf tools: Pass machine to vdso__dso_findnew()
        perf tools: Add dso__data_size()
        ...
      ef35ad26
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8efb90cf
      Linus Torvalds authored
      Pull locking updates from Ingo Molnar:
       "The main changes in this cycle are:
      
         - big rtmutex and futex cleanup and robustification from Thomas
           Gleixner
         - mutex optimizations and refinements from Jason Low
         - arch_mutex_cpu_relax() removal and related cleanups
         - smaller lockdep tweaks"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
        arch, locking: Ciao arch_mutex_cpu_relax()
        locking/lockdep: Only ask for /proc/lock_stat output when available
        locking/mutexes: Optimize mutex trylock slowpath
        locking/mutexes: Try to acquire mutex only if it is unlocked
        locking/mutexes: Delete the MUTEX_SHOW_NO_WAITER macro
        locking/mutexes: Correct documentation on mutex optimistic spinning
        rtmutex: Make the rtmutex tester depend on BROKEN
        futex: Simplify futex_lock_pi_atomic() and make it more robust
        futex: Split out the first waiter attachment from lookup_pi_state()
        futex: Split out the waiter check from lookup_pi_state()
        futex: Use futex_top_waiter() in lookup_pi_state()
        futex: Make unlock_pi more robust
        rtmutex: Avoid pointless requeueing in the deadlock detection chain walk
        rtmutex: Cleanup deadlock detector debug logic
        rtmutex: Confine deadlock logic to futex
        rtmutex: Simplify remove_waiter()
        rtmutex: Document pi chain walk
        rtmutex: Clarify the boost/deboost part
        rtmutex: No need to keep task ref for lock owner check
        rtmutex: Simplify and document try_to_take_rtmutex()
        ...
      8efb90cf
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5bda4f63
      Linus Torvalds authored
      Pull RCU changes from Ingo Molar:
       "The main changes:
      
         - torture-test updates
         - callback-offloading changes
         - maintainership changes
         - update RCU documentation
         - miscellaneous fixes"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
        rcu: Allow for NULL tick_nohz_full_mask when nohz_full= missing
        rcu: Fix a sparse warning in rcu_report_unblock_qs_rnp()
        rcu: Fix a sparse warning in rcu_initiate_boost()
        rcu: Fix __rcu_reclaim() to use true/false for bool
        rcu: Remove CONFIG_PROVE_RCU_DELAY
        rcu: Use __this_cpu_read() instead of per_cpu_ptr()
        rcu: Don't use NMIs to dump other CPUs' stacks
        rcu: Bind grace-period kthreads to non-NO_HZ_FULL CPUs
        rcu: Simplify priority boosting by putting rt_mutex in rcu_node
        rcu: Check both root and current rcu_node when setting up future grace period
        rcu: Allow post-unlock reference for rt_mutex
        rcu: Loosen __call_rcu()'s rcu_head alignment constraint
        rcu: Eliminate read-modify-write ACCESS_ONCE() calls
        rcu: Remove redundant ACCESS_ONCE() from tick_do_timer_cpu
        rcu: Make rcu node arrays static const char * const
        signal: Explain local_irq_save() call
        rcu: Handle obsolete references to TINY_PREEMPT_RCU
        rcu: Document deadlock-avoidance information for rcu_read_unlock()
        scripts: Teach get_maintainer.pl about the new "R:" tag
        rcu: Update rcu torture maintainership filename patterns
        ...
      5bda4f63
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · a45c657f
      Linus Torvalds authored
      Pull m68k changes from Geert Uytterhoeven:
       "Extremely non-spectacular changes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/sun3: Remove define statement no longer needed
        zorro: Use ARRAY_SIZE
      a45c657f
    • Chao Yu's avatar
      f2fs: use for_each_set_bit to simplify the code · b65ee148
      Chao Yu authored
      This patch uses for_each_set_bit to simplify some codes in f2fs.
      Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
      b65ee148
    • Chao Yu's avatar
      f2fs: add f2fs_balance_fs for expand_inode_data · 497a0930
      Chao Yu authored
      This patch adds f2fs_balance_fs in expand_inode_data to avoid allocation failure
      with segment.
      Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
      497a0930
    • Chao Yu's avatar
      f2fs: invalidate xattr node page when evict inode · 002a41ca
      Chao Yu authored
      When inode is evicted, all the page cache belong to this inode should be
      released including the xattr node page. But previously we didn't do this, this
      patch fixed this issue.
      
      v2:
       o reposition invalidate_mapping_pages() to the right place suggested by
      Jaegeuk Kim.
      Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
      002a41ca
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 489f50be
      Linus Torvalds authored
      Pull ia64 cleanups from Tony Luck:
       "Miscellaneous ia64 specific cleanup"
      
      * tag 'please-pull-misc-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        [IA64] sn: Do not needlessly convert between pointers and integers
        [IA64] sn: Fix zeroing of PDAs
      489f50be
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 5167d09f
      Linus Torvalds authored
      Pull arm64 updates from Will Deacon:
       "Once again, Catalin's off on holiday and I'm looking after the arm64
        tree.  Please can you pull the following arm64 updates for 3.17?
      
        Note that this branch also includes the new GICv3 driver (merged via a
        stable tag from Jason's irqchip tree), since there is a fix for older
        binutils on top.
      
        Changes include:
         - context tracking support (NO_HZ_FULL) which narrowly missed 3.16
         - vDSO layout rework following Andy's work on x86
         - TEXT_OFFSET fuzzing for bootloader testing
         - /proc/cpuinfo tidy-up
         - preliminary work to support 48-bit virtual addresses, but this is
           currently disabled until KVM has been ported to use it (the patches
           do, however, bring some nice clean-up)
         - boot-time CPU sanity checks (especially useful on heterogenous
           systems)
         - support for syscall auditing
         - support for CC_STACKPROTECTOR
         - defconfig updates"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (55 commits)
        arm64: add newline to I-cache policy string
        Revert "arm64: dmi: Add SMBIOS/DMI support"
        arm64: fpsimd: fix a typo in fpsimd_save_partial_state ENDPROC
        arm64: don't call break hooks for BRK exceptions from EL0
        arm64: defconfig: enable devtmpfs mount option
        arm64: vdso: fix build error when switching from LE to BE
        arm64: defconfig: add virtio support for running as a kvm guest
        arm64: gicv3: Allow GICv3 compilation with older binutils
        arm64: fix soft lockup due to large tlb flush range
        arm64/crypto: fix makefile rule for aes-glue-%.o
        arm64: Do not invoke audit_syscall_* functions if !CONFIG_AUDIT_SYSCALL
        arm64: Fix barriers used for page table modifications
        arm64: Add support for 48-bit VA space with 64KB page configuration
        arm64: asm/pgtable.h pmd/pud definitions clean-up
        arm64: Determine the vmalloc/vmemmap space at build time based on VA_BITS
        arm64: Clean up the initial page table creation in head.S
        arm64: Remove asm/pgtable-*level-types.h files
        arm64: Remove asm/pgtable-*level-hwdef.h files
        arm64: Convert bool ARM64_x_LEVELS to int ARM64_PGTABLE_LEVELS
        arm64: mm: Implement 4 levels of translation tables
        ...
      5167d09f
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 8533ce72
      Linus Torvalds authored
      Pull KVM changes from Paolo Bonzini:
       "These are the x86, MIPS and s390 changes; PPC and ARM will come in a
        few days.
      
        MIPS and s390 have little going on this release; just bugfixes, some
        small, some larger.
      
        The highlights for x86 are nested VMX improvements (Jan Kiszka),
        optimizations for old processor (up to Nehalem, by me and Bandan Das),
        and a lot of x86 emulator bugfixes (Nadav Amit).
      
        Stephen Rothwell reported a trivial conflict with the tracing branch"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (104 commits)
        x86/kvm: Resolve shadow warnings in macro expansion
        KVM: s390: rework broken SIGP STOP interrupt handling
        KVM: x86: always exit on EOIs for interrupts listed in the IOAPIC redir table
        KVM: vmx: remove duplicate vmx_mpx_supported() prototype
        KVM: s390: Fix memory leak on busy SIGP stop
        x86/kvm: Resolve shadow warning from min macro
        kvm: Resolve missing-field-initializers warnings
        Replace NR_VMX_MSR with its definition
        KVM: x86: Assertions to check no overrun in MSR lists
        KVM: x86: set rflags.rf during fault injection
        KVM: x86: Setting rflags.rf during rep-string emulation
        KVM: x86: DR6/7.RTM cannot be written
        KVM: nVMX: clean up nested_release_vmcs12 and code around it
        KVM: nVMX: fix lifetime issues for vmcs02
        KVM: x86: Defining missing x86 vectors
        KVM: x86: emulator injects #DB when RFLAGS.RF is set
        KVM: x86: Cleanup of rflags.rf cleaning
        KVM: x86: Clear rflags.rf on emulated instructions
        KVM: x86: popf emulation should not change RF
        KVM: x86: Clearing rflags.rf upon skipped emulated instruction
        ...
      8533ce72
    • Linus Torvalds's avatar
      Merge tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · c9b88e95
      Linus Torvalds authored
      Pull tracing filter cleanups from Steven Rostedt:
       "Oleg Nesterov did several clean ups with the tracing filter code.  As
        he found some small bugs that went into 3.16, and these changes were
        based on that, I had to apply his changes to a separate branch than my
        main development branch.
      
        This was based on work that was already pulled into 3.16, and is a
        separate pull request to keep from having local merges in my pull
        request"
      
      * tag 'trace-3.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Kill "filter_string" arg of replace_preds()
        tracing: Change apply_subsystem_event_filter() paths to check file->system == dir
        tracing: Kill ftrace_event_call->files
        tracing/uprobes: Kill the dead TRACE_EVENT_FL_USE_CALL_FILTER logic
        tracing: Kill call_filter_disable()
        tracing: Kill destroy_call_preds()
        tracing: Kill destroy_preds() and destroy_file_preds()
      c9b88e95
    • Linus Torvalds's avatar
      Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · b8c0aa46
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "This pull request has a lot of work done.  The main thing is the
        changes to the ftrace function callback infrastructure.  It's
        introducing a way to allow different functions to call directly
        different trampolines instead of all calling the same "mcount" one.
      
        The only user of this for now is the function graph tracer, which
        always had a different trampoline, but the function tracer trampoline
        was called and did basically nothing, and then the function graph
        tracer trampoline was called.  The difference now, is that the
        function graph tracer trampoline can be called directly if a function
        is only being traced by the function graph trampoline.  If function
        tracing is also happening on the same function, the old way is still
        done.
      
        The accounting for this takes up more memory when function graph
        tracing is activated, as it needs to keep track of which functions it
        uses.  I have a new way that wont take as much memory, but it's not
        ready yet for this merge window, and will have to wait for the next
        one.
      
        Another big change was the removal of the ftrace_start/stop() calls
        that were used by the suspend/resume code that stopped function
        tracing when entering into suspend and resume paths.  The stop of
        ftrace was done because there was some function that would crash the
        system if one called smp_processor_id()! The stop/start was a big
        hammer to solve the issue at the time, which was when ftrace was first
        introduced into Linux.  Now ftrace has better infrastructure to debug
        such issues, and I found the problem function and labeled it with
        "notrace" and function tracing can now safely be activated all the way
        down into the guts of suspend and resume
      
        Other changes include clean ups of uprobe code, clean up of the
        trace_seq() code, and other various small fixes and clean ups to
        ftrace and tracing"
      
      * tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (57 commits)
        ftrace: Add warning if tramp hash does not match nr_trampolines
        ftrace: Fix trampoline hash update check on rec->flags
        ring-buffer: Use rb_page_size() instead of open coded head_page size
        ftrace: Rename ftrace_ops field from trampolines to nr_trampolines
        tracing: Convert local function_graph functions to static
        ftrace: Do not copy old hash when resetting
        tracing: let user specify tracing_thresh after selecting function_graph
        ring-buffer: Always run per-cpu ring buffer resize with schedule_work_on()
        tracing: Remove function_trace_stop and HAVE_FUNCTION_TRACE_MCOUNT_TEST
        s390/ftrace: remove check of obsolete variable function_trace_stop
        arm64, ftrace: Remove check of obsolete variable function_trace_stop
        Blackfin: ftrace: Remove check of obsolete variable function_trace_stop
        metag: ftrace: Remove check of obsolete variable function_trace_stop
        microblaze: ftrace: Remove check of obsolete variable function_trace_stop
        MIPS: ftrace: Remove check of obsolete variable function_trace_stop
        parisc: ftrace: Remove check of obsolete variable function_trace_stop
        sh: ftrace: Remove check of obsolete variable function_trace_stop
        sparc64,ftrace: Remove check of obsolete variable function_trace_stop
        tile: ftrace: Remove check of obsolete variable function_trace_stop
        ftrace: x86: Remove check of obsolete variable function_trace_stop
        ...
      b8c0aa46
    • Linus Torvalds's avatar
      Merge tag 'ktest-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · c7ed326f
      Linus Torvalds authored
      Pull config-bisect changes from Steven Rostedt:
       "The big change here is the rewrite of config-bisect.  The old way
        never worked properly as it assumed the bad config was a subset of the
        good config, and just found the config that would break the build.
      
        The new way does a diff of the bad config verses the good config and
        makes the similar until it finds that one config works and the other
        does not and reports the config that makes that difference.  The two
        configs do not need to be related.  It is much more useful now:
      
      * tag 'ktest-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Update documentation on config_bisect
        ktest: Add the config bisect manual back
        ktest: Remove unused functions
        ktest: Put back in the CONFIG_BISECT_CHECK
        ktest: Rewrite the config-bisect to actually work
        ktest: Some cleanup for improving readability
        ktest: add 2nd parameter of run_command() to set the redirect target file
      c7ed326f
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus-3.17' of git://git.linaro.org/people/mike.turquette/linux · e4ca4308
      Linus Torvalds authored
      Pull clock framework updates from Mike Turquette:
       "The clock framework changes for 3.17 are mostly additions of new clock
        drivers and fixes/enhancements to existing clock drivers.  There are
        also some non-critical fixes and improvements to the framework core.
      
        Changes to the clock framework core include:
         - improvements to printks on errors
         - flattening the previously hierarchal structure of per-clock entries
           in debugfs
         - allow per-clock debugfs entries that are specific to a particular
           clock driver
         - configure initial clock parent and/or initial clock rate from
           Device Tree
         - several feature enhancements to the composite clock type
         - misc fixes
      
        New clock drivers added include:
         - TI Palmas PMIC
         - Allwinner A23 SoC
         - Qualcomm APQ8084 and IPQ8064 SoCs
         - Rockchip rk3188, rk3066 and rk3288 SoCs
         - STMicroelectronics STiH407 SoC
         - Cirrus Logic CLPS711X SoC
      
        Many fixes, feature enhancements and further clock tree support for
        existing clock drivers also were merged, such as Samsung's "ARMCLK
        down" power saving feature for their Exynos4 & Exynos5 SoCs"
      
      * tag 'clk-for-linus-3.17' of git://git.linaro.org/people/mike.turquette/linux: (86 commits)
        clk: Add missing of_clk_set_defaults export
        clk: checking wrong variable in __set_clk_parents()
        clk: Propagate any error return from debug_init()
        clk: clps711x: Add DT bindings documentation
        clk: Add CLPS711X clk driver
        clk: st: Use round to closest divider flag
        clk: st: Update frequency tables for fs660c32 and fs432c65
        clk: st: STiH407: Support for clockgenA9
        clk: st: STiH407: Support for clockgenD0/D2/D3
        clk: st: STiH407: Support for clockgenC0
        clk: st: Add quadfs reset handling
        clk: st: Add polarity bit indication
        clk: st: STiH407: Support for clockgenA0
        clk: st: STiH407: Support for A9 MUX Clocks
        clk: st: STiH407: Support for Flexgen Clocks
        clk: st: Adds Flexgen clock binding
        clk: st: Remove uncessary (void *) cast
        clk: st: use static const for clkgen_pll_data tables
        clk: st: use static const for stm_fs tables
        clk: st: Update ST clock binding documentation
        ...
      e4ca4308
    • Axel Lin's avatar
      hwmon: (g762) Use of_property_read_u32 at appropriate place · fce9626c
      Axel Lin authored
      Simplify the code a bit and also improve readability.
      Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      fce9626c
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · e17acfdc
      Linus Torvalds authored
      Pull libata changes from Tejun Heo:
       "Except for a few, all the changes are for ahci platform drivers for
        the arm devices.  Nothing too interesting or dangerous.  There's one
        merge from libata/for-3.16-fixes to pull in dependent changes"
      
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (23 commits)
        ata: libahci: Silence compiler warning on 64-bit
        Documentation: bindings: document the sub-nodes AHCI bindings
        ata: ahci_platform: add a generic AHCI compatible
        ata: libahci: allow to use multiple PHYs
        ata: libahci_platform: move port_map parameters into the AHCI structure
        ahci: imx: add missing clk_disable_unprepare() on error in imx_sata_enable()
        ahci_xgene: Use correct OOB tunning parameters for APM X-Gene SoC AHCI SATA Host controller driver.
        ahci_xgene: Fix the watermark threshold for the APM X-Gene SATA host controller driver.
        ahci: st: Make of_device_id array const
        sata_sil24: Identify which card suffered IRQ status error
        ahci: st: Provide DT bindings for ST's SATA implementation
        ata: Add support for the Tegra124 SATA controller
        ata: ahci_platform: Increase AHCI_MAX_CLKS to 4
        of: Add NVIDIA Tegra SATA controller binding
        dt-bindings: ata: document ability to disable spread-spectrum clock
        ata: ahci_imx: add disable for spread-spectrum
        dt-bindings: ata: add ahci_imx electrical properties
        ata: ahci_imx: allow hardware parameters to be specified in DT
        dt-bindings: ata: create bindings for imx sata controller
        ata: pata_samsung_cf: removes s5pc100 related ata codes
        ...
      e17acfdc
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 47dfe403
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "Mostly changes to get the v2 interface ready.  The core features are
        mostly ready now and I think it's reasonable to expect to drop the
        devel mask in one or two devel cycles at least for a subset of
        controllers.
      
         - cgroup added a controller dependency mechanism so that block cgroup
           can depend on memory cgroup.  This will be used to finally support
           IO provisioning on the writeback traffic, which is currently being
           implemented.
      
         - The v2 interface now uses a separate table so that the interface
           files for the new interface are explicitly declared in one place.
           Each controller will explicitly review and add the files for the
           new interface.
      
         - cpuset is getting ready for the hierarchical behavior which is in
           the similar style with other controllers so that an ancestor's
           configuration change doesn't change the descendants' configurations
           irreversibly and processes aren't silently migrated when a CPU or
           node goes down.
      
        All the changes are to the new interface and no behavior changed for
        the multiple hierarchies"
      
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (29 commits)
        cpuset: fix the WARN_ON() in update_nodemasks_hier()
        cgroup: initialize cgrp_dfl_root_inhibit_ss_mask from !->dfl_files test
        cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup core
        cgroup: distinguish the default and legacy hierarchies when handling cftypes
        cgroup: replace cgroup_add_cftypes() with cgroup_add_legacy_cftypes()
        cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes
        cgroup: split cgroup_base_files[] into cgroup_{dfl|legacy}_base_files[]
        cpuset: export effective masks to userspace
        cpuset: allow writing offlined masks to cpuset.cpus/mems
        cpuset: enable onlined cpu/node in effective masks
        cpuset: refactor cpuset_hotplug_update_tasks()
        cpuset: make cs->{cpus, mems}_allowed as user-configured masks
        cpuset: apply cs->effective_{cpus,mems}
        cpuset: initialize top_cpuset's configured masks at mount
        cpuset: use effective cpumask to build sched domains
        cpuset: inherit ancestor's masks if effective_{cpus, mems} becomes empty
        cpuset: update cs->effective_{cpus, mems} when config changes
        cpuset: update cpuset->effective_{cpus,mems} at hotplug
        cpuset: add cs->effective_cpus and cs->effective_mems
        cgroup: clean up sane_behavior handling
        ...
      47dfe403
    • Linus Torvalds's avatar
      Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · f2a84170
      Linus Torvalds authored
      Pull percpu updates from Tejun Heo:
      
       - Major reorganization of percpu header files which I think makes
         things a lot more readable and logical than before.
      
       - percpu-refcount is updated so that it requires explicit destruction
         and can be reinitialized if necessary.  This was pulled into the
         block tree to replace the custom percpu refcnting implemented in
         blk-mq.
      
       - In the process, percpu and percpu-refcount got cleaned up a bit
      
      * 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (21 commits)
        percpu-refcount: implement percpu_ref_reinit() and percpu_ref_is_zero()
        percpu-refcount: require percpu_ref to be exited explicitly
        percpu-refcount: use unsigned long for pcpu_count pointer
        percpu-refcount: add helpers for ->percpu_count accesses
        percpu-refcount: one bit is enough for REF_STATUS
        percpu-refcount, aio: use percpu_ref_cancel_init() in ioctx_alloc()
        workqueue: stronger test in process_one_work()
        workqueue: clear POOL_DISASSOCIATED in rebind_workers()
        percpu: Use ALIGN macro instead of hand coding alignment calculation
        percpu: invoke __verify_pcpu_ptr() from the generic part of accessors and operations
        percpu: preffity percpu header files
        percpu: use raw_cpu_*() to define __this_cpu_*()
        percpu: reorder macros in percpu header files
        percpu: move {raw|this}_cpu_*() definitions to include/linux/percpu-defs.h
        percpu: move generic {raw|this}_cpu_*_N() definitions to include/asm-generic/percpu.h
        percpu: only allow sized arch overrides for {raw|this}_cpu_*() ops
        percpu: reorganize include/linux/percpu-defs.h
        percpu: move accessors from include/linux/percpu.h to percpu-defs.h
        percpu: include/asm-generic/percpu.h should contain only arch-overridable parts
        percpu: introduce arch_raw_cpu_ptr()
        ...
      f2a84170