1. 26 Jun, 2015 6 commits
    • Linus Torvalds's avatar
      Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 9390bd0d
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar.
      
      * 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox/bcm2835: Fix mailbox full detection.
        dt: mailbox: Remove 'mbox-names property is discouraged' message from binding
        mailbox: Add ability for clients to request channels by name
        mailbox: Enable BCM2835 mailbox support
        dt/bindings: Add binding for the BCM2835 mailbox driver
        mailbox: Fix up error handling in mbox_request_channel()
        mailbox: Make mbox_chan_ops const
        mailbox: altera: Add dependency on HAS_IOMEM
      9390bd0d
    • Linus Torvalds's avatar
      Merge tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · da996f73
      Linus Torvalds authored
      Pull edac updates from Mauro Carvalho Chehab:
       "Some fixes and additions to the EDAC driver used on modern Intel x86
        CPUs.  It includes support for Broadwell EP/EX platforms and fixes for
        motherboards with more than 2 CPU sockets"
      
      * tag 'edac/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
        sb_edac: support for Broadwell -EP and -EX
        sb_edac: Fix support for systems with two home agents per socket
        sb_edac: Fix a typo and a thinko in address handling for Haswell
        EDAC: Remove arbitrary limit on number of channels
      da996f73
    • Linus Torvalds's avatar
      Merge tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 5b4ca444
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - Lots of improvements at the DVB API DocBook documentation.  Now, the
         frontend and the network APIs are fully in sync with the Kernel and
         looks more like the rest of the media documentation;
      
       - New frontend driver: cx24120
      
       - New driver for a PCI device: cobalt.  This driver is actually not
         sold in the market, but it is a good example of a multi-HDMI input
         device;
      
       - The dt3155 driver were promoted from staging;
      
       - The mantis driver got remote controller support;
      
       - New V4L2 driver for ST bdisp SoC chipsets;
      
       - Make sparse and smatch happier: several bugs were solved by fixing
         the issues reported by those static code analyzers.
      
       - Lots of new device additions, new features, improvements and cleanups
         at the existing drivers.
      
      * tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (553 commits)
        [media] lmedm04: fix the range for relative measurements
        [media] lmedm04: use u32 instead of u64 for relative stats
        [media] omap3isp: remove unused var
        [media] saa7134: fix page size on some archs
        [media] use CONFIG_PM_SLEEP for suspend/resume
        [media] tuner-i2c: be consistent with I2C declaration
        [media] si470x: cleanup define namespace
        [media] bdisp: prevent compiling on random arch
        [media] vb2: Don't WARN when v4l2_buffer.bytesused is 0 for multiplanar buffers
        [media] MAINTAINERS: Add entry for the Renesas VSP1 driver
        [media] videodev2.h: fix copy-and-paste error in V4L2_MAP_XFER_FUNC_DEFAULT
        [media] Revert "[media] vb2: Push mmap_sem down to memops"
        [media] mantis: cleanup a warning
        [media] bdisp-debug: don't try to divide by s64
        [media] cx88: don't declare restart_video_queue if not used
        [media] au0828: move dev->boards atribuition to happen earlier
        [media] lmedm04: implement dvb v5 statistics
        [media] bdisp: remove unused var
        [media] bdisp: remove needless check
        ts2020: fix compilation on i386
        ...
      5b4ca444
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 0db9723c
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "Specifics:
      
         - enhance Thermal Framework with several new capabilities:
      
             * use power estimates
             * compute weights with relative integers instead of percentages
             * allow governors to have private data in thermal zones
             * export thermal zone parameters through sysfs
      
           Thanks to the ARM thermal team (Javi, Punit, KP).
      
         - introduce a new thermal governor: power allocator.  First in kernel
           closed loop PI(D) controller for thermal control.  Thanks to ARM
           thermal team.
      
         - enhance OF thermal to allow thermal zones to have sustainable power
           HW specification.  Thanks to Punit.
      
         - introduce thermal driver for Intel Quark SoC x1000platform.  Thanks
           to Ong, Boon Leong.
      
         - introduce QPNP PMIC temperature alarm driver.  Thanks to Ivan T. I.
      
         - introduce thermal driver for Hisilicon hi6220.  Thanks to
           kongxinwei.
      
         - enhance Exynos thermal driver to handle Exynos5433 TMU.  Thanks to
           Chanwoo C.
      
         - TI thermal driver now has a better implementation for EOCZ bit.
           From Pavel M.
      
         - add id for Skylake processors in int340x processor thermal driver.
      
         - a couple of small fixes and cleanups."
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
        thermal: hisilicon: add new hisilicon thermal sensor driver
        dt-bindings: Document the hi6220 thermal sensor bindings
        thermal: of-thermal: add support for reading coefficients property
        thermal: support slope and offset coefficients
        thermal: power_allocator: round the division when divvying up power
        thermal: exynos: Add the support for Exynos5433 TMU
        thermal: cpu_cooling: Fix power calculation when CPUs are offline
        thermal: cpu_cooling: Remove cpu_dev update on policy CPU update
        thermal: export thermal_zone_parameters to sysfs
        thermal: cpu_cooling: Check memory allocation of power_table
        ti-soc-thermal: request temperature periodically if hw can't do that itself
        ti-soc-thermal: implement eocz bit to make driver useful on omap3
        cleanup ti-soc-thermal
        thermal: remove stale THERMAL_POWER_ACTOR select
        thermal: Default OF created trip points to writable
        thermal: core: Add Kconfig option to enable writable trips
        thermal: x86_pkg_temp: drop const for thermal_zone_parameters
        of: thermal: Introduce sustainable power for a thermal zone
        thermal: add trace events to the power allocator governor
        thermal: introduce the Power Allocator governor
        ...
      0db9723c
    • Linus Torvalds's avatar
      Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 4570a371
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "It was a busy development cycle at this time, as you can see a wide
        range of changes in diffstat.  There are no big changes but many
        refactoring and improvements.  Here we go some highlights:
      
        ALSA core:
         - Procfs codes were cleaned up to use seq_file
         - Procfs can be opt out via Kconfig (only for EXPERT)
         - Two types of jack API were unified finally; now both kctl and input
           jack devs are handled via a single function call.
      
        HD-audio:
         - Continued code restructuring for the future ASoC driver; now HDA
           controller driver is split to a core helper module.
         - Preliminary codes for Skylake audio support in HDA core.
         - Proper i915 gfx power well management for SKL & co
         - Enabled runtime PM as default for Intel HDMI/DP codecs
         - Newer Tegra chip supports
         - More quirks for Dell headsets, Alienware (with CA0132), etc.
         - A couple of DRM ELD helper API functions
      
        ASoC:
         - Support for loading ASoC topology maps from firmware, intended to
           be used to allow self-describing DSP firmware images to be built
           which can map controls added by the DSP to userspace without the
           kernel needing to know about individual DSP firmwares
         - Lots of refactoring to avoid direct access to snd_soc_codec where
           it's not needed supporting future refactoring
         - Big refactoring, cleanup and enhancement for the Wolfson ADSP
           driver
         - Cleanup series for TI TAS2552 and R-CAR drivers
         - Fixes and improvements on RT56xx codecs
         - Support for TI TAS571x power amplifiers
         - Support for Qualcomm APQ8016 and ZTE ZX296702 SoCs
         - Support for x86 systems with RT5650 and Qualcomm Storm
         - Support for Mediatek AFE (Audio Front End) unit
         - Other various small fixes to ASoC codec drivers
      
        Firewire:
         - Enhanced to allow non-blocking streams to use timestamp
           synchronization
         - Improve support for DM1500 and BeBoBv3
      
        Misc:
         - Cleanup of old pci API functions over all PCI sound drivers
         - Fix long-standing regression of the old powermac i2c setup"
      
      * tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (533 commits)
        ALSA: pcm: Fix pcm_class sysfs output
        ALSA: hda-beep: Update authors dead email address
        ASoC: wm_adsp: Move DSP Rate controls into the codec
        ASoC: wm8995: Fix setting sysclk for WM8995_SYSCLK_MCLK2 case
        ALSA: hda: provide default bus io ops extended hdac
        ALSA: hda: add hda link cleanup routine
        ALSA: hda: add hdac_ext stream creation and cleanup routines
        ASoC: rsrc-card: remove unused ret
        ALSA: HDAC: move SND_HDA_PREALLOC_SIZE to core
        ASoC: mediatek: Add machine driver for rt5650 rt5676 codec
        ASoC: mediatek: Add machine driver for MAX98090 codec
        ASoC: mediatek: Add AFE platform driver
        ASoC: rsnd: remove io from rsnd_mod
        ASoC: rsnd: move rsnd_mod_is_working() to rsnd_io_is_working()
        ASoC: rsnd: don't use rsnd_mod_to_io() on snd_kcontrol
        ASoC: rsnd: don't use rsnd_mod_to_io() on rsnd_src_xxx()
        ASoC: rsnd: don't use rsnd_mod_to_io() on rsnd_ssi_xxx()
        ASoC: rsnd: don't use rsnd_mod_to_io() on rsnd_dma_xxx()
        ASoC: rsnd: don't use rsnd_mod_to_io() on rsnd_get_adinr()
        ASoC: rsnd: add common interrupt handler for SSI/SRC/DMA
        ...
      4570a371
    • Linus Torvalds's avatar
      Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · f7b08217
      Linus Torvalds authored
      Pull DMI updates from Jean Delvare:
       "The most important change is the new sysfs interface to the DMI table,
        which will let user-space tools (such as dmidecode) access the table
        without relying on /dev/mem"
      
      * 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        firmware: dmi: struct dmi_header should be packed
        firmware: dmi_scan: Coding style cleanups
        Documentation: ABI: sysfs-firmware-dmi: add -entries suffix to file name
        firmware: dmi_scan: add SBMIOS entry and DMI tables
        firmware: dmi_scan: Trim DMI table length before exporting it
        firmware: dmi_scan: Rename dmi_table to dmi_decode_table
        firmware: dmi: List my quilt tree
        firmware: dmi_scan: Only honor end-of-table for 64-bit tables
      f7b08217
  2. 25 Jun, 2015 34 commits
    • Linus Torvalds's avatar
      Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 64e22b86
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
      
       - a number of libata core changes to better support NCQ TRIM.
      
       - ahci now supports MSI-X in single IRQ mode to support a new
         controller which doesn't implement MSI or INTX.
      
       - ahci now supports edge-triggered IRQ mode to support a new controller
         which for some odd reason did edge-triggered IRQ.
      
       - the usual controller support additions and changes.
      
      * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (27 commits)
        libata: Do not blacklist Micron M500DC
        ata: ahci_mvebu: add suspend/resume support
        ahci, msix: Fix build error for !PCI_MSI
        ahci: Add support for Cavium's ThunderX host controller
        ahci: Add generic MSI-X support for single interrupts to SATA PCI driver
        libata: finally use __initconst in ata_parse_force_one()
        drivers: ata: add support for Ceva sata host controller
        devicetree:bindings: add devicetree bindings for ceva ahci
        ahci: added support for Freescale AHCI sata
        ahci: Store irq number in struct ahci_host_priv
        ahci: Move interrupt enablement code to a separate function
        Doc: libata: Fix spelling typo found in libata.xml
        ata:sata_nv - Change 1 to true for bool type variable.
        ata: add Broadcom AHCI SATA3 driver for STB chips
        Documentation: devicetree: add Broadcom SATA binding
        libata: Fix regression when the NCQ Send and Receive log page is absent
        ata: hpt366: fix constant cast warning
        ata: ahci_xgene: potential NULL dereference in probe
        ata: ahci_xgene: Add AHCI Support for 2nd HW version of APM X-Gene SoC AHCI SATA Host controller.
        libahci: Add support to handle HOST_IRQ_STAT as edge trigger latch.
        ...
      64e22b86
    • Linus Torvalds's avatar
      Merge tag 'dm-4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 6597ac8a
      Linus Torvalds authored
      Pull device mapper updates from Mike Snitzer:
      
       - DM core cleanups:
      
           * blk-mq request-based DM no longer uses any mempools now that
             partial completions are no longer handled as part of cloned
             requests
      
       - DM raid cleanups and support for MD raid0
      
       - DM cache core advances and a new stochastic-multi-queue (smq) cache
         replacement policy
      
           * smq is the new default dm-cache policy
      
       - DM thinp cleanups and much more efficient large discard support
      
       - DM statistics support for request-based DM and nanosecond resolution
         timestamps
      
       - Fixes to DM stripe, DM log-writes, DM raid1 and DM crypt
      
      * tag 'dm-4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: (39 commits)
        dm stats: add support for request-based DM devices
        dm stats: collect and report histogram of IO latencies
        dm stats: support precise timestamps
        dm stats: fix divide by zero if 'number_of_areas' arg is zero
        dm cache: switch the "default" cache replacement policy from mq to smq
        dm space map metadata: fix occasional leak of a metadata block on resize
        dm thin metadata: fix a race when entering fail mode
        dm thin: fail messages with EOPNOTSUPP when pool cannot handle messages
        dm thin: range discard support
        dm thin metadata: add dm_thin_remove_range()
        dm thin metadata: add dm_thin_find_mapped_range()
        dm btree: add dm_btree_remove_leaves()
        dm stats: Use kvfree() in dm_kvfree()
        dm cache: age and write back cache entries even without active IO
        dm cache: prefix all DMERR and DMINFO messages with cache device name
        dm cache: add fail io mode and needs_check flag
        dm cache: wake the worker thread every time we free a migration object
        dm cache: add stochastic-multi-queue (smq) policy
        dm cache: boost promotion of blocks that will be overwritten
        dm cache: defer whole cells
        ...
      6597ac8a
    • Linus Torvalds's avatar
      Merge branch 'for-4.2/writeback' of git://git.kernel.dk/linux-block · e4bc13ad
      Linus Torvalds authored
      Pull cgroup writeback support from Jens Axboe:
       "This is the big pull request for adding cgroup writeback support.
      
        This code has been in development for a long time, and it has been
        simmering in for-next for a good chunk of this cycle too.  This is one
        of those problems that has been talked about for at least half a
        decade, finally there's a solution and code to go with it.
      
        Also see last weeks writeup on LWN:
      
              http://lwn.net/Articles/648292/"
      
      * 'for-4.2/writeback' of git://git.kernel.dk/linux-block: (85 commits)
        writeback, blkio: add documentation for cgroup writeback support
        vfs, writeback: replace FS_CGROUP_WRITEBACK with SB_I_CGROUPWB
        writeback: do foreign inode detection iff cgroup writeback is enabled
        v9fs: fix error handling in v9fs_session_init()
        bdi: fix wrong error return value in cgwb_create()
        buffer: remove unusued 'ret' variable
        writeback: disassociate inodes from dying bdi_writebacks
        writeback: implement foreign cgroup inode bdi_writeback switching
        writeback: add lockdep annotation to inode_to_wb()
        writeback: use unlocked_inode_to_wb transaction in inode_congested()
        writeback: implement unlocked_inode_to_wb transaction and use it for stat updates
        writeback: implement [locked_]inode_to_wb_and_lock_list()
        writeback: implement foreign cgroup inode detection
        writeback: make writeback_control track the inode being written back
        writeback: relocate wb[_try]_get(), wb_put(), inode_{attach|detach}_wb()
        mm: vmscan: disable memcg direct reclaim stalling if cgroup writeback support is in use
        writeback: implement memcg writeback domain based throttling
        writeback: reset wb_domain->dirty_limit[_tstmp] when memcg domain size changes
        writeback: implement memcg wb_domain
        writeback: update wb_over_bg_thresh() to use wb_domain aware operations
        ...
      e4bc13ad
    • Linus Torvalds's avatar
      Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block · ad90fb97
      Linus Torvalds authored
      Pull asm/scatterlist.h removal from Jens Axboe:
       "We don't have any specific arch scatterlist anymore, since parisc
        finally switched over.  Kill the include"
      
      * 'for-4.2/sg' of git://git.kernel.dk/linux-block:
        remove scatterlist.h generation from arch Kbuild files
        remove <asm/scatterlist.h>
      ad90fb97
    • Linus Torvalds's avatar
      Merge branch 'for-4.2/drivers' of git://git.kernel.dk/linux-block · 6a398a3e
      Linus Torvalds authored
      Pull block driver updates from Jens Axboe:
       "This contains:
      
         - a few race fixes for null_blk, from Akinobu Mita.
      
         - a series of fixes for mtip32xx, from Asai Thambi and Selvan Mani at
           Micron.
      
         - NVMe:
              * Fix for missing error return on allocation failure, from Axel
                Lin.
      
              * Code consolidation and cleanups from Christoph.
      
              * Memory barrier addition, syncing queue count and queue
                pointers. From Jon Derrick.
      
              * Various fixes from Keith, an addition to support user
                issue reset from sysfs or ioctl, and automatic namespace
                rescan.
      
              * Fix from Matias, avoiding losing some request flags when
                marking the request failfast.
      
         - small cleanups and sparse fixups for ps3vram.  From Geert
           Uytterhoeven and Geoff Lavand.
      
         - s390/dasd dead code removal, from Jarod Wilson.
      
         - a set of fixes and optimizations for loop, from Ming Lei.
      
         - conversion to blkdev_reread_part() of loop, dasd, ndb.  From Ming
           Lei.
      
         - updates to cciss.  From Tomas Henzl"
      
      * 'for-4.2/drivers' of git://git.kernel.dk/linux-block: (44 commits)
        mtip32xx: Fix accessing freed memory
        block: nvme-scsi: Catch kcalloc failure
        NVMe: Fix IO for extended metadata formats
        nvme: don't overwrite req->cmd_flags on sync cmd
        mtip32xx: increase wait time for hba reset
        mtip32xx: fix minor number
        mtip32xx: remove unnecessary sleep in mtip_ftl_rebuild_poll()
        mtip32xx: fix crash on surprise removal of the drive
        mtip32xx: Abort I/O during secure erase operation
        mtip32xx: fix incorrectly setting MTIP_DDF_SEC_LOCK_BIT
        mtip32xx: remove unused variable 'port->allocated'
        mtip32xx: fix rmmod issue
        MAINTAINERS: Update ps3vram block driver
        block/ps3vram: Remove obsolete reference to MTD
        block/ps3vram: Fix sparse warnings
        NVMe: Automatic namespace rescan
        NVMe: Memory barrier before queue_count is incremented
        NVMe: add sysfs and ioctl controller reset
        null_blk: restart request processing on completion handler
        null_blk: prevent timer handler running on a different CPU where started
        ...
      6a398a3e
    • Linus Torvalds's avatar
      Merge branch 'for-4.2/core' of git://git.kernel.dk/linux-block · bfffa1cc
      Linus Torvalds authored
      Pull core block IO update from Jens Axboe:
       "Nothing really major in here, mostly a collection of smaller
        optimizations and cleanups, mixed with various fixes.  In more detail,
        this contains:
      
         - Addition of policy specific data to blkcg for block cgroups.  From
           Arianna Avanzini.
      
         - Various cleanups around command types from Christoph.
      
         - Cleanup of the suspend block I/O path from Christoph.
      
         - Plugging updates from Shaohua and Jeff Moyer, for blk-mq.
      
         - Eliminating atomic inc/dec of both remaining IO count and reference
           count in a bio.  From me.
      
         - Fixes for SG gap and chunk size support for data-less (discards)
           IO, so we can merge these better.  From me.
      
         - Small restructuring of blk-mq shared tag support, freeing drivers
           from iterating hardware queues.  From Keith Busch.
      
         - A few cfq-iosched tweaks, from Tahsin Erdogan and me.  Makes the
           IOPS mode the default for non-rotational storage"
      
      * 'for-4.2/core' of git://git.kernel.dk/linux-block: (35 commits)
        cfq-iosched: fix other locations where blkcg_to_cfqgd() can return NULL
        cfq-iosched: fix sysfs oops when attempting to read unconfigured weights
        cfq-iosched: move group scheduling functions under ifdef
        cfq-iosched: fix the setting of IOPS mode on SSDs
        blktrace: Add blktrace.c to BLOCK LAYER in MAINTAINERS file
        block, cgroup: implement policy-specific per-blkcg data
        block: Make CFQ default to IOPS mode on SSDs
        block: add blk_set_queue_dying() to blkdev.h
        blk-mq: Shared tag enhancements
        block: don't honor chunk sizes for data-less IO
        block: only honor SG gap prevention for merges that contain data
        block: fix returnvar.cocci warnings
        block, dm: don't copy bios for request clones
        block: remove management of bi_remaining when restoring original bi_end_io
        block: replace trylock with mutex_lock in blkdev_reread_part()
        block: export blkdev_reread_part() and __blkdev_reread_part()
        suspend: simplify block I/O handling
        block: collapse bio bit space
        block: remove unused BIO_RW_BLOCK and BIO_EOF flags
        block: remove BIO_EOPNOTSUPP
        ...
      bfffa1cc
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs · cc8a0a94
      Linus Torvalds authored
      Pull UBI/UBIFS updates from Richard Weinberger:
       "Minor fixes for UBI and UBIFS"
      
      * tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs:
        UBI: Remove unnecessary `\'
        UBI: Use static class and attribute groups
        UBI: add a helper function for updatting on-flash layout volumes
        UBI: Fastmap: Do not add vol if it already exists
        UBI: Init vol->reserved_pebs by assignment
        UBI: Fastmap: Rename variables to make them meaningful
        UBI: Fastmap: Remove unnecessary `\'
        UBI: Fastmap: Use max() to get the larger value
        ubifs: fix to check error code of register_shrinker
        UBI: block: Dynamically allocate minor numbers
      cc8a0a94
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · d857da7b
      Linus Torvalds authored
      Pull ext4 updates from Ted Ts'o:
       "A very large number of cleanups and bug fixes --- in particular for
        the ext4 encryption patches, which is a new feature added in the last
        merge window.  Also fix a number of long-standing xfstest failures.
        (Quota writes failing due to ENOSPC, a race between truncate and
        writepage in data=journalled mode that was causing generic/068 to
        fail, and other corner cases.)
      
        Also add support for FALLOC_FL_INSERT_RANGE, and improve jbd2
        performance eliminating locking when a buffer is modified more than
        once during a transaction (which is very common for allocation
        bitmaps, for example), in which case the state of the journalled
        buffer head doesn't need to change"
      
      [ I renamed "ext4_follow_link()" to "ext4_encrypted_follow_link()" in
        the merge resolution, to make it clear that that function is _only_
        used for encrypted symlinks.  The function doesn't actually work for
        non-encrypted symlinks at all, and they use the generic helpers
                                               - Linus ]
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (52 commits)
        ext4: set lazytime on remount if MS_LAZYTIME is set by mount
        ext4: only call ext4_truncate when size <= isize
        ext4: make online defrag error reporting consistent
        ext4: minor cleanup of ext4_da_reserve_space()
        ext4: don't retry file block mapping on bigalloc fs with non-extent file
        ext4: prevent ext4_quota_write() from failing due to ENOSPC
        ext4: call sync_blockdev() before invalidate_bdev() in put_super()
        jbd2: speedup jbd2_journal_dirty_metadata()
        jbd2: get rid of open coded allocation retry loop
        ext4: improve warning directory handling messages
        jbd2: fix ocfs2 corrupt when updating journal superblock fails
        ext4: mballoc: avoid 20-argument function call
        ext4: wait for existing dio workers in ext4_alloc_file_blocks()
        ext4: recalculate journal credits as inode depth changes
        jbd2: use GFP_NOFS in jbd2_cleanup_journal_tail()
        ext4: use swap() in mext_page_double_lock()
        ext4: use swap() in memswap()
        ext4: fix race between truncate and __ext4_journalled_writepage()
        ext4 crypto: fail the mount if blocksize != pagesize
        ext4: Add support FALLOC_FL_INSERT_RANGE for fallocate
        ...
      d857da7b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 77d43164
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Sparc perf stack traversal fixes from David Ahern"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: perf: Use UREG_FP rather than UREG_I6
        sparc64: perf: Add sanity checking on addresses in user stack
        sparc64: Convert BUG_ON to warning
        sparc: perf: Disable pagefaults while walking userspace stacks
      77d43164
    • Linus Torvalds's avatar
      Merge tag 'for-4.2' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux · 55a7d4b8
      Linus Torvalds authored
      Pull Renesas H8/300 architecture re-introduction from Yoshinori Sato.
      
      We dropped arch/h8300 two years ago as stale and old, this is a new and
      more modern rewritten arch support for the same architecture.
      
      * tag 'for-4.2' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux: (27 commits)
        h8300: fix typo.
        h8300: Always build dtb
        h8300: Remove ARCH_WANT_IPC_PARSE_VERSION
        sh-sci: Get register size from platform device
        clk: h8300: fix error handling in h8s2678_pll_clk_setup()
        h8300: Symbol name fix
        h8300: devicetree source
        h8300: configs
        h8300: IRQ chip driver
        h8300: clocksource
        h8300: clock driver
        h8300: Build scripts
        h8300: library functions
        h8300: Memory management
        h8300: miscellaneous functions
        h8300: process helpers
        h8300: compressed image support
        h8300: Low level entry
        h8300: kernel startup
        h8300: Interrupt and exceptions
        ...
      55a7d4b8
    • David S. Miller's avatar
      Merge branch 'sparc-perf-stack' · f01cae4e
      David S. Miller authored
      David Ahern says:
      
      ====================
      sparc64: perf fixes for userspace stacks
      
      Coming back to the perf userspace callchain problem. As a reminder there are
      a series of problems trying to use perf to collect callchains with scheduling
      tracepoints, e.g., perf sched record -g -- <cmd>.
      
      The first patch disables pagefaults while walking the user stack. As discussed
      a couple of months ago this is the right fix, but I was puzzled as to why
      processes were terminating with sigbus (and sometimes sigsegv). I believe the
      root of this problem is bad addresses trying to walk the frames using frame
      pointers. The bad addresses lead to faults that get handled by do_sparc64_fault
      and it aborts the task though I am still puzzled as to why it gets past this
      check in do_sparc64_fault:
      
              if (in_atomic() || !mm)
                      goto intr_or_no_mm;
      
      pagefault_disable bumps the preempt_count which should make in_atomic return != 0
      (building kernels with preemption set to voluntar, CONFIG_PREEMPT_VOLUNTARY=y).
      
      While this set does not fully solve the problem it does prevent a number of
      pain points with the current code, most notably able to lock up the system.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f01cae4e
    • David Ahern's avatar
      sparc64: perf: Use UREG_FP rather than UREG_I6 · 2d89cd86
      David Ahern authored
      perf walks userspace callchains by following frame pointers. Use the
      UREG_FP macro to make it clearer that the %fp is being used.
      Signed-off-by: default avatarDavid Ahern <david.ahern@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2d89cd86
    • David Ahern's avatar
      sparc64: perf: Add sanity checking on addresses in user stack · b69fb769
      David Ahern authored
      Processes are getting killed (sigbus or segv) while walking userspace
      callchains when using perf. In some instances I have seen ufp = 0x7ff
      which does not seem like a proper stack address.
      
      This patch adds a function to run validity checks against the address
      before attempting the copy_from_user. The checks are copied from the
      x86 version as a start point with the addition of a 4-byte alignment
      check.
      Signed-off-by: default avatarDavid Ahern <david.ahern@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b69fb769
    • David Ahern's avatar
      sparc64: Convert BUG_ON to warning · 2bf7c3ef
      David Ahern authored
      Pagefault handling has a BUG_ON path that panics the system. Convert it to
      a warning instead. There is no need to bring down the system for this kind
      of failure.
      
      The following was hit while running:
          perf sched record -g -- make -j 16
      
      [3609412.782801] kernel BUG at /opt/dahern/linux.git/arch/sparc/mm/fault_64.c:416!
      [3609412.782833]               \|/ ____ \|/
      [3609412.782833]               "@'/ .. \`@"
      [3609412.782833]               /_| \__/ |_\
      [3609412.782833]                  \__U_/
      [3609412.782870] cat(4516): Kernel bad sw trap 5 [#1]
      [3609412.782889] CPU: 0 PID: 4516 Comm: cat Tainted: G            E   4.1.0-rc8+ #6
      [3609412.782909] task: fff8000126e31f80 ti: fff8000110d90000 task.ti: fff8000110d90000
      [3609412.782931] TSTATE: 0000004411001603 TPC: 000000000096b164 TNPC: 000000000096b168 Y: 0000004e    Tainted: G            E
      [3609412.782964] TPC: <do_sparc64_fault+0x5e4/0x6a0>
      [3609412.782979] g0: 000000000096abe0 g1: 0000000000d314c4 g2: 0000000000000000 g3: 0000000000000001
      [3609412.783009] g4: fff8000126e31f80 g5: fff80001302d2000 g6: fff8000110d90000 g7: 00000000000000ff
      [3609412.783045] o0: 0000000000aff6a8 o1: 00000000000001a0 o2: 0000000000000001 o3: 0000000000000054
      [3609412.783080] o4: fff8000100026820 o5: 0000000000000001 sp: fff8000110d935f1 ret_pc: 000000000096b15c
      [3609412.783117] RPC: <do_sparc64_fault+0x5dc/0x6a0>
      [3609412.783137] l0: 000007feff996000 l1: 0000000000030001 l2: 0000000000000004 l3: fff8000127bd0120
      [3609412.783174] l4: 0000000000000054 l5: fff8000127bd0188 l6: 0000000000000000 l7: fff8000110d9dba8
      [3609412.783210] i0: fff8000110d93f60 i1: fff8000110ca5530 i2: 000000000000003f i3: 0000000000000054
      [3609412.783244] i4: fff800010000081a i5: fff8000100000398 i6: fff8000110d936a1 i7: 0000000000407c6c
      [3609412.783286] I7: <sparc64_realfault_common+0x10/0x20>
      [3609412.783308] Call Trace:
      [3609412.783329]  [0000000000407c6c] sparc64_realfault_common+0x10/0x20
      [3609412.783353] Disabling lock debugging due to kernel taint
      [3609412.783379] Caller[0000000000407c6c]: sparc64_realfault_common+0x10/0x20
      [3609412.783449] Caller[fff80001002283e4]: 0xfff80001002283e4
      [3609412.783471] Instruction DUMP: 921021a0  7feaff91  901222a8 <91d02005> 82086100  02f87f7b  808a2873  81cfe008  01000000
      [3609412.783542] Kernel panic - not syncing: Fatal exception
      [3609412.784605] Press Stop-A (L1-A) to return to the boot prom
      [3609412.784615] ---[ end Kernel panic - not syncing: Fatal exception
      
      With this patch rather than a panic I occasionally get something like this:
          perf sched record -g -m 1024  -- make -j N
      
      where N is based on number of cpus (128 to 1024 for a T7-4 and 8 for an 8 cpu
      VM on a T5-2).
      
      WARNING: CPU: 211 PID: 52565 at /opt/dahern/linux.git/arch/sparc/mm/fault_64.c:417 do_sparc64_fault+0x340/0x70c()
      address (7feffcd6000) != regs->tpc (fff80001004873c0)
      Modules linked in: ipt_REJECT nf_reject_ipv4 nf_conntrack_ipv4 nf_defrag_ipv4 iptable_filter ip_tables ip6t_REJECT nf_reject_ipv6 xt_tcpudp nf_conntrack_ipv6 nf_defrag_ipv6 xt_state nf_conntrack ip6table_filter ip6_tables x_tables ipv6 cdc_ether usbnet mii ixgbe mdio igb i2c_algo_bit i2c_core ptp crc32c_sparc64 camellia_sparc64 des_sparc64 des_generic md5_sparc64 sha512_sparc64 sha1_sparc64 uio_pdrv_genirq uio usb_storage mpt3sas scsi_transport_sas raid_class aes_sparc64 sunvnet sunvdc sha256_sparc64(E) sha256_generic(E)
      CPU: 211 PID: 52565 Comm: ld Tainted: G        W   E   4.1.0-rc8+ #19
      Call Trace:
       [000000000045ce30] warn_slowpath_common+0x7c/0xa0
       [000000000045ceec] warn_slowpath_fmt+0x30/0x40
       [000000000098ad64] do_sparc64_fault+0x340/0x70c
       [0000000000407c2c] sparc64_realfault_common+0x10/0x20
      ---[ end trace 62ee02065a01a049 ]---
      ld[52565]: segfault at fff80001004873c0 ip fff80001004873c0 (rpc fff8000100158868) sp 000007feffcd70e1 error 30002 in libc-2.12.so[fff8000100410000+184000]
      
      The segfault is horrible, but better than a system panic.
      
      An 8-cpu VM on a T5-2 also showed the above traces from time to time,
      so it is a general problem and not specific to the T7 or baremetal.
      Signed-off-by: default avatarDavid Ahern <david.ahern@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2bf7c3ef
    • David Ahern's avatar
      sparc: perf: Disable pagefaults while walking userspace stacks · c17af4dd
      David Ahern authored
      Page faults generated walking userspace stacks can call schedule to switch
      out the task. When collecting callchains for scheduler tracepoints this
      causes a deadlock as the tracepoints can be hit with the runqueue lock held:
      
      [ 8138.159054] WARNING: CPU: 758 PID: 12488 at /opt/dahern/linux.git/arch/sparc/kernel/nmi.c:80 perfctr_irq+0x1f8/0x2b4()
      
      [ 8138.203152] Watchdog detected hard LOCKUP on cpu 758
      
      [ 8138.410969] CPU: 758 PID: 12488 Comm: perf Not tainted 4.0.0-rc6+ #6
      [ 8138.437146] Call Trace:
      [ 8138.447193]  [000000000045cdd4] warn_slowpath_common+0x7c/0xa0
      [ 8138.471238]  [000000000045ce90] warn_slowpath_fmt+0x30/0x40
      [ 8138.494189]  [0000000000983e38] perfctr_irq+0x1f8/0x2b4
      [ 8138.515716]  [00000000004209f4] tl0_irq15+0x14/0x20
      [ 8138.535791]  [00000000009839ec] _raw_spin_trylock_bh+0x68/0x108
      [ 8138.560180]  [0000000000980018] __schedule+0xcc/0x710
      [ 8138.580981]  [00000000009806dc] preempt_schedule_common+0x10/0x3c
      [ 8138.606082]  [000000000098077c] _cond_resched+0x34/0x44
      [ 8138.627603]  [0000000000565990] kmem_cache_alloc_node+0x24/0x1a0
      [ 8138.652345]  [0000000000450b60] tsb_grow+0xac/0x488
      [ 8138.672429]  [0000000000985040] do_sparc64_fault+0x4dc/0x6e4
      [ 8138.695736]  [0000000000407c2c] sparc64_realfault_common+0x10/0x20
      [ 8138.721202]  [00000000006f2e24] NG4copy_from_user+0xa4/0x3c0
      [ 8138.744510]  [000000000044f900] perf_callchain_user+0x5c/0x6c
      [ 8138.768182]  [0000000000517b5c] perf_callchain+0x16c/0x19c
      [ 8138.790774]  [0000000000515f84] perf_prepare_sample+0x68/0x218
      [ 8138.814801] ---[ end trace 42ca6294b1ff7573 ]---
      
      As with PowerPC (b59a1bfc, "powerpc/perf: Disable pagefaults during
      callchain stack read") disable pagefaults while walking userspace stacks.
      Signed-off-by: default avatarDavid Ahern <david.ahern@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c17af4dd
    • Jean Delvare's avatar
      firmware: dmi: struct dmi_header should be packed · 9ea650c8
      Jean Delvare authored
      Apparently the compiler does fine without it, but it feels safer and
      clearer to add the missing attribute.
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      9ea650c8
    • Jean Delvare's avatar
      firmware: dmi_scan: Coding style cleanups · d1d8704c
      Jean Delvare authored
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      d1d8704c
    • Ivan Khoronzhuk's avatar
      Documentation: ABI: sysfs-firmware-dmi: add -entries suffix to file name · 863ef5ba
      Ivan Khoronzhuk authored
      The dmi-sysfs module adds DMI table structures entries under
      /sys/firmware/dmi/entries only, so rename documentation file to
      sysfs-firmware-dmi-entries as more appropriate. Without renaming it's
      confusing to differ this from sysfs-firmware-dmi-tables that adds raw
      DMI table and actually adds "dmi" kobject.
      Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@globallogic.com>
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      863ef5ba
    • Ivan Khoronzhuk's avatar
      firmware: dmi_scan: add SBMIOS entry and DMI tables · d7f96f97
      Ivan Khoronzhuk authored
      Some utils, like dmidecode and smbios, need to access SMBIOS entry
      table area in order to get information like SMBIOS version, size, etc.
      Currently it's done via /dev/mem. But for situation when /dev/mem
      usage is disabled, the utils have to use dmi sysfs instead, which
      doesn't represent SMBIOS entry and adds code/delay redundancy when direct
      access for table is needed.
      
      So this patch creates dmi/tables and adds SMBIOS entry point to allow
      utils in question to work correctly without /dev/mem. Also patch adds
      raw dmi table to simplify dmi table processing in user space, as
      proposed by Jean Delvare.
      Tested-by: default avatarRoy Franz <roy.franz@linaro.org>
      Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@globallogic.com>
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      d7f96f97
    • Jean Delvare's avatar
      firmware: dmi_scan: Trim DMI table length before exporting it · 6e0ad59e
      Jean Delvare authored
      The SMBIOS v3 entry points specify a maximum length for the DMI table,
      not the exact length. Thus there may be garbage after the end-of-table
      marker, which we don't want to export to user-space. Adjust dmi_len
      when we find the end-of-table marker, so that only the actual table
      payload is exported.
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      Cc: Ivan Khoronzhuk <ivan.khoronzhuk@globallogic.com>
      6e0ad59e
    • Ivan Khoronzhuk's avatar
      firmware: dmi_scan: Rename dmi_table to dmi_decode_table · eb4c5ea5
      Ivan Khoronzhuk authored
      The "dmi_table" function looks like data instance, but it does DMI
      table decode. This patch renames it to "dmi_decode_table" name as
      more appropriate. That allows us to use "dmi_table" name for correct
      purposes.
      Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@globallogic.com>
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      eb4c5ea5
    • Jean Delvare's avatar
      firmware: dmi: List my quilt tree · d4aeef93
      Jean Delvare authored
      I'll be maintaining the pending patches to the dmi_scan and dmi-id
      drivers as a quilt tree.
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      d4aeef93
    • Jean Delvare's avatar
      firmware: dmi_scan: Only honor end-of-table for 64-bit tables · 17cd5bd5
      Jean Delvare authored
      A 32-bit entry point to a DMI table says how many structures the table
      contains. The SMBIOS specification explicitly says that end-of-table
      markers should be ignored if they are not actually at the end of the
      DMI table. So only honor the end-of-table marker for tables accessed
      through 64-bit entry points, as they do not specify a structure count.
      
      Fixes: fc430262 ("dmi: add support for SMBIOS 3.0 64-bit entry point")
      Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
      Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Cc: Leif Lindholm <leif.lindholm@linaro.org>
      Cc: Matt Fleming <matt.fleming@intel.com>
      17cd5bd5
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · aefbef10
      Linus Torvalds authored
      Merge first patchbomb from Andrew Morton:
      
       - a few misc things
      
       - ocfs2 udpates
      
       - kernel/watchdog.c feature work (took ages to get right)
      
       - most of MM.  A few tricky bits are held up and probably won't make 4.2.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (91 commits)
        mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc()
        mm, thp: respect MPOL_PREFERRED policy with non-local node
        tmpfs: truncate prealloc blocks past i_size
        mm/memory hotplug: print the last vmemmap region at the end of hot add memory
        mm/mmap.c: optimization of do_mmap_pgoff function
        mm: kmemleak: optimise kmemleak_lock acquiring during kmemleak_scan
        mm: kmemleak: avoid deadlock on the kmemleak object insertion error path
        mm: kmemleak: do not acquire scan_mutex in kmemleak_do_cleanup()
        mm: kmemleak: fix delete_object_*() race when called on the same memory block
        mm: kmemleak: allow safe memory scanning during kmemleak disabling
        memcg: convert mem_cgroup->under_oom from atomic_t to int
        memcg: remove unused mem_cgroup->oom_wakeups
        frontswap: allow multiple backends
        x86, mirror: x86 enabling - find mirrored memory ranges
        mm/memblock: allocate boot time data structures from mirrored memory
        mm/memblock: add extra "flags" to memblock to allow selection of memory based on attribute
        mm: do not ignore mapping_gfp_mask in page cache allocation paths
        mm/cma.c: fix typos in comments
        mm/oom_kill.c: print points as unsigned int
        mm/hugetlb: handle races in alloc_huge_page and hugetlb_reserve_pages
        ...
      aefbef10
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 266da6f1
      Linus Torvalds authored
      Pull pstore updates from Tony Luck:
       "Miscellaneous pstore improvements"
      
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ramoops: make it possible to change mem_type param.
        pstore/ram: verify ramoops header before saving record
        fs/pstore: Optimization function ramoops_init_przs
        fs/pstore: update the backend parameter in pstore module
        pstore: do not use message compression without lock
      266da6f1
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · cfcc0ad4
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "New features:
         - per-file encryption (e.g., ext4)
         - FALLOC_FL_ZERO_RANGE
         - FALLOC_FL_COLLAPSE_RANGE
         - RENAME_WHITEOUT
      
        Major enhancement/fixes:
         - recovery broken superblocks
         - enhance f2fs_trim_fs with a discard_map
         - fix a race condition on dentry block allocation
         - fix a deadlock during summary operation
         - fix a missing fiemap result
      
        .. and many minor bug fixes and clean-ups were done"
      
      * tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (83 commits)
        f2fs: do not trim preallocated blocks when truncating after i_size
        f2fs crypto: add alloc_bounce_page
        f2fs crypto: fix to handle errors likewise ext4
        f2fs: drop the volatile_write flag only
        f2fs: skip committing valid superblock
        f2fs: setting discard option in parse_options()
        f2fs: fix to return exact trimmed size
        f2fs: support FALLOC_FL_INSERT_RANGE
        f2fs: hide common code in f2fs_replace_block
        f2fs: disable the discard option when device doesn't support
        f2fs crypto: remove alloc_page for bounce_page
        f2fs: fix a deadlock for summary page lock vs. sentry_lock
        f2fs crypto: clean up error handling in f2fs_fname_setup_filename
        f2fs crypto: avoid f2fs_inherit_context for symlink
        f2fs crypto: do not set encryption policy for non-directory by ioctl
        f2fs crypto: allow setting encryption policy once
        f2fs crypto: check context consistent for rename2
        f2fs: avoid duplicated code by reusing f2fs_read_end_io
        f2fs crypto: use per-inode tfm structure
        f2fs: recovering broken superblock during mount
        ...
      cfcc0ad4
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · a7296b49
      Linus Torvalds authored
      Pull UDF fixes and cleanups from Jan Kara:
       "The contains some small fixes and improvements in error handling for
        UDF.
      
        Bundled is also one ext3 coding style fix and a fix in quota
        documentation"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: fix udf_load_pvoldesc()
        udf: remove double err declaration in udf_file_write_iter()
        UDF: support NFSv2 export
        fs: ext3: super: fixed a space coding style issue
        quota: Update documentation
        udf: Return error from udf_find_entry()
        udf: Make udf_get_filename() return error instead of 0 length file name
        udf: bug on exotic flag in udf_get_filename()
        udf: improve error management in udf_CS0toNLS()
        udf: improve error management in udf_CS0toUTF8()
        udf: unicode: update function name in comments
        udf: remove unnecessary test in udf_build_ustr_exact()
        udf: Return -ENOMEM when allocation fails in udf_get_filename()
      a7296b49
    • Linus Torvalds's avatar
      Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6 · 1e467e68
      Linus Torvalds authored
      Pull documentation updates from Jonathan Corbet:
       "The main thing here is Ingo's big subdirectory documenting feature
        support for each architecture.  Beyond that, it's the usual pile of
        fixes, tweaks, and small additions"
      
      * tag 'docs-for-linus' of git://git.lwn.net/linux-2.6: (79 commits)
        doc:md: fix typo in md.txt.
        Documentation/mic/mpssd: don't build x86 userspace when cross compiling
        Documentation/prctl: don't build tsc tests when cross compiling
        Documentation/vDSO: don't build tests when cross compiling
        Doc:ABI/testing: Fix typo in sysfs-bus-fcoe
        Doc: Docbook: Change wikipedia's URL from http to https in scsi.tmpl
        Doc: Change wikipedia's URL from http to https
        Documentation/kernel-parameters: add missing pciserial to the earlyprintk
        Doc:pps: Fix typo in pps.txt
        kbuild : Fix documentation of INSTALL_HDR_PATH
        Documentation: filesystems: updated struct file_operations documentation in vfs.txt
        kbuild: edit explanation of clean-files variable
        Doc: ja_JP: Fix typo in HOWTO
        Move freefall program from Documentation/ to tools/
        Documentation: ARM: EXYNOS: Describe boot loaders interface
        Doc:nfc: Fix typo in nfc-hci.txt
        vfs: Minor documentation fix
        Doc: networking: txtimestamp: fix printf format warning
        Documentation, intel_pstate: Improve legacy mode internal governors description
        Documentation: extend use case for EXPORT_SYMBOL_GPL()
        ...
      1e467e68
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 14738e03
      Linus Torvalds authored
      Pull input subsystem updates from Dmitry Torokhov:
       "Thanks to Samuel Thibault input device (keyboard) LEDs are no longer
        hardwired within the input core but use LED subsystem and so allow use
        of different triggers; Hans de Goede did a large update for the ALPS
        touchpad driver; we have new TI drv2665 haptics driver and DA9063
        OnKey driver, and host of other drivers got various fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
        Input: pixcir_i2c_ts - fix receive error
        MAINTAINERS: remove non existent input mt git tree
        Input: improve usage of gpiod API
        tty/vt/keyboard: define LED triggers for VT keyboard lock states
        tty/vt/keyboard: define LED triggers for VT LED states
        Input: export LEDs as class devices in sysfs
        Input: cyttsp4 - use swap() in cyttsp4_get_touch()
        Input: goodix - do not explicitly set evbits in input device
        Input: goodix - export id and version read from device
        Input: goodix - fix variable length array warning
        Input: goodix - fix alignment issues
        Input: add OnKey driver for DA9063 MFD part
        Input: elan_i2c - add product IDs FW names
        Input: elan_i2c - add support for multi IC type and iap format
        Input: focaltech - report finger width to userspace
        tty: remove platform_sysrq_reset_seq
        Input: synaptics_i2c - use proper boolean values
        Input: psmouse - use true instead of 1 for boolean values
        Input: cyapa - fix a few typos in comments
        Input: stmpe-ts - enforce device tree only mode
        ...
      14738e03
    • Linus Torvalds's avatar
      Merge tag 'edac_for_4.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 45471cd9
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
      
       - New APM X-Gene SoC EDAC driver (Loc Ho)
      
       - AMD error injection module improvements (Aravind Gopalakrishnan)
      
       - Altera Arria 10 support (Thor Thayer)
      
       - misc fixes and cleanups all over the place
      
      * tag 'edac_for_4.2_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (28 commits)
        EDAC: Update Documentation/edac.txt
        EDAC: Fix typos in Documentation/edac.txt
        EDAC, mce_amd_inj: Set MISCV on injection
        EDAC, mce_amd_inj: Move bit preparations before the injection
        EDAC, mce_amd_inj: Cleanup and simplify README
        EDAC, altera: Do not allow suspend when EDAC is enabled
        EDAC, mce_amd_inj: Make inj_type static
        arm: socfpga: dts: Add Arria10 SDRAM EDAC DTS support
        EDAC, altera: Add Arria10 EDAC support
        EDAC, altera: Refactor for Altera CycloneV SoC
        EDAC, altera: Generalize driver to use DT Memory size
        EDAC, mce_amd_inj: Add README file
        EDAC, mce_amd_inj: Add individual permissions field to dfs_node
        EDAC, mce_amd_inj: Modify flags attribute to use string arguments
        EDAC, mce_amd_inj: Read out number of MCE banks from the hardware
        EDAC, mce_amd_inj: Use MCE_INJECT_GET macro for bank node too
        EDAC, xgene: Fix cpuid abuse
        EDAC, mpc85xx: Extend error address to 64 bit
        EDAC, mpc8xxx: Adapt for FSL SoC
        EDAC, edac_stub: Drop arch-specific include
        ...
      45471cd9
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 93a4b1b9
      Linus Torvalds authored
      Pull pin control updates from Linus Walleij:
       "Here is the bulk of pin control changes for the v4.2 series: Quite a
        lot of new SoC subdrivers and two new main drivers this time, apart
        from that business as usual.
      
        Details:
      
        Core functionality:
         - Enable exclusive pin ownership: it is possible to flag a pin
           controller so that GPIO and other functions cannot use a single pin
           simultaneously.
      
        New drivers:
         - NXP LPC18xx System Control Unit pin controller
         - Imagination Pistachio SoC pin controller
      
        New subdrivers:
         - Freescale i.MX7d SoC
         - Intel Sunrisepoint-H PCH
         - Renesas PFC R8A7793
         - Renesas PFC R8A7794
         - Mediatek MT6397, MT8127
         - SiRF Atlas 7
         - Allwinner A33
         - Qualcomm MSM8660
         - Marvell Armada 395
         - Rockchip RK3368
      
        Cleanups:
         - A big cleanup of the Marvell MVEBU driver rectifying it to
           correspond to reality
         - Drop platform device probing from the SH PFC driver, we are now a
           DT only shop for SuperH
         - Drop obsolte multi-platform check for SH PFC
         - Various janitorial: constification, grammar etc
      
        Improvements:
         - The AT91 GPIO portions now supports the set_multiple() feature
         - Split out SPI pins on the Xilinx Zynq
         - Support DTs without specific function nodes in the i.MX driver"
      
      * tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (99 commits)
        pinctrl: rockchip: add support for the rk3368
        pinctrl: rockchip: generalize perpin driver-strength setting
        pinctrl: sh-pfc: r8a7794: add SDHI pin groups
        pinctrl: sh-pfc: r8a7794: add MMCIF pin groups
        pinctrl: sh-pfc: add R8A7794 PFC support
        pinctrl: make pinctrl_register() return proper error code
        pinctrl: mvebu: armada-39x: add support for Armada 395 variant
        pinctrl: mvebu: armada-39x: add missing SATA functions
        pinctrl: mvebu: armada-39x: add missing PCIe functions
        pinctrl: mvebu: armada-38x: add ptp functions
        pinctrl: mvebu: armada-38x: add ua1 functions
        pinctrl: mvebu: armada-38x: add nand functions
        pinctrl: mvebu: armada-38x: add sata functions
        pinctrl: mvebu: armada-xp: add dram functions
        pinctrl: mvebu: armada-xp: add nand rb function
        pinctrl: mvebu: armada-xp: add spi1 function
        pinctrl: mvebu: armada-39x: normalize ref clock naming
        pinctrl: mvebu: armada-xp: rename spi to spi0
        pinctrl: mvebu: armada-370: align spi1 clock pin naming
        pinctrl: mvebu: armada-370: align VDD cpu-pd pin naming with datasheet
        ...
      93a4b1b9
    • Linus Torvalds's avatar
      Merge tag 'backlight-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · d59b92f9
      Linus Torvalds authored
      Pull backlight updates from Lee Jones:
       "Changes to existing drivers:
      
         - supply MODULE_DEVICE_TABLE() to ensure probing
         - constify struct; da9052_bl
         - enable compile test; lcd_l4f00242t03, lcd_lms283fg05, backlight_gpio
         - suspend/resume bugfix; lp855x_bl
         - devm_gpiod_get_optional() API fixup; pwm_bl
         - error handling fixup; backlight"
      
      * tag 'backlight-for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        backlight: Change the return type of backlight_update_status() to int
        backlight: pwm_bl: Simplify usage of devm_gpiod_get_optional
        backlight: lp855x: Don't clear level on suspend/blank
        backlight: Allow compile test of GPIO consumers if !GPIOLIB
        video: backlight: da9052: Constify platform_device_id
        gpio-backlight: Discover driver during boot time
      d59b92f9
    • Larry Finger's avatar
      mm: kmemleak_alloc_percpu() should follow the gfp from per_alloc() · 8a8c35fa
      Larry Finger authored
      Beginning at commit d52d3997 ("ipv6: Create percpu rt6_info"), the
      following INFO splat is logged:
      
        ===============================
        [ INFO: suspicious RCU usage. ]
        4.1.0-rc7-next-20150612 #1 Not tainted
        -------------------------------
        kernel/sched/core.c:7318 Illegal context switch in RCU-bh read-side critical section!
        other info that might help us debug this:
        rcu_scheduler_active = 1, debug_locks = 0
         3 locks held by systemd/1:
         #0:  (rtnl_mutex){+.+.+.}, at: [<ffffffff815f0c8f>] rtnetlink_rcv+0x1f/0x40
         #1:  (rcu_read_lock_bh){......}, at: [<ffffffff816a34e2>] ipv6_add_addr+0x62/0x540
         #2:  (addrconf_hash_lock){+...+.}, at: [<ffffffff816a3604>] ipv6_add_addr+0x184/0x540
        stack backtrace:
        CPU: 0 PID: 1 Comm: systemd Not tainted 4.1.0-rc7-next-20150612 #1
        Hardware name: TOSHIBA TECRA A50-A/TECRA A50-A, BIOS Version 4.20   04/17/2014
        Call Trace:
          dump_stack+0x4c/0x6e
          lockdep_rcu_suspicious+0xe7/0x120
          ___might_sleep+0x1d5/0x1f0
          __might_sleep+0x4d/0x90
          kmem_cache_alloc+0x47/0x250
          create_object+0x39/0x2e0
          kmemleak_alloc_percpu+0x61/0xe0
          pcpu_alloc+0x370/0x630
      
      Additional backtrace lines are truncated.  In addition, the above splat
      is followed by several "BUG: sleeping function called from invalid
      context at mm/slub.c:1268" outputs.  As suggested by Martin KaFai Lau,
      these are the clue to the fix.  Routine kmemleak_alloc_percpu() always
      uses GFP_KERNEL for its allocations, whereas it should follow the gfp
      from its callers.
      Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Reviewed-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
      Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
      Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
      Cc: Martin KaFai Lau <kafai@fb.com>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Christoph Lameter <cl@linux-foundation.org>
      Cc: <stable@vger.kernel.org>	[3.18+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8a8c35fa
    • Vlastimil Babka's avatar
      mm, thp: respect MPOL_PREFERRED policy with non-local node · 0867a57c
      Vlastimil Babka authored
      Since commit 077fcf11 ("mm/thp: allocate transparent hugepages on
      local node"), we handle THP allocations on page fault in a special way -
      for non-interleave memory policies, the allocation is only attempted on
      the node local to the current CPU, if the policy's nodemask allows the
      node.
      
      This is motivated by the assumption that THP benefits cannot offset the
      cost of remote accesses, so it's better to fallback to base pages on the
      local node (which might still be available, while huge pages are not due
      to fragmentation) than to allocate huge pages on a remote node.
      
      The nodemask check prevents us from violating e.g.  MPOL_BIND policies
      where the local node is not among the allowed nodes.  However, the
      current implementation can still give surprising results for the
      MPOL_PREFERRED policy when the preferred node is different than the
      current CPU's local node.
      
      In such case we should honor the preferred node and not use the local
      node, which is what this patch does.  If hugepage allocation on the
      preferred node fails, we fall back to base pages and don't try other
      nodes, with the same motivation as is done for the local node hugepage
      allocations.  The patch also moves the MPOL_INTERLEAVE check around to
      simplify the hugepage specific test.
      
      The difference can be demonstrated using in-tree transhuge-stress test
      on the following 2-node machine where half memory on one node was
      occupied to show the difference.
      
      > numactl --hardware
      available: 2 nodes (0-1)
      node 0 cpus: 0 1 2 3 4 5 6 7 8 9 10 11 24 25 26 27 28 29 30 31 32 33 34 35
      node 0 size: 7878 MB
      node 0 free: 3623 MB
      node 1 cpus: 12 13 14 15 16 17 18 19 20 21 22 23 36 37 38 39 40 41 42 43 44 45 46 47
      node 1 size: 8045 MB
      node 1 free: 7818 MB
      node distances:
      node   0   1
        0:  10  21
        1:  21  10
      
      Before the patch:
      > numactl -p0 -C0 ./transhuge-stress
      transhuge-stress: 2.197 s/loop, 0.276 ms/page,   7249.168 MiB/s 7962 succeed,    0 failed, 1786 different pages
      
      > numactl -p0 -C12 ./transhuge-stress
      transhuge-stress: 2.962 s/loop, 0.372 ms/page,   5376.172 MiB/s 7962 succeed,    0 failed, 3873 different pages
      
      Number of successful THP allocations corresponds to free memory on node 0 in
      the first case and node 1 in the second case, i.e. -p parameter is ignored and
      cpu binding "wins".
      
      After the patch:
      > numactl -p0 -C0 ./transhuge-stress
      transhuge-stress: 2.183 s/loop, 0.274 ms/page,   7295.516 MiB/s 7962 succeed,    0 failed, 1760 different pages
      
      > numactl -p0 -C12 ./transhuge-stress
      transhuge-stress: 2.878 s/loop, 0.361 ms/page,   5533.638 MiB/s 7962 succeed,    0 failed, 1750 different pages
      
      > numactl -p1 -C0 ./transhuge-stress
      transhuge-stress: 4.628 s/loop, 0.581 ms/page,   3440.893 MiB/s 7962 succeed,    0 failed, 3918 different pages
      
      The -p parameter is respected regardless of cpu binding.
      
      > numactl -C0 ./transhuge-stress
      transhuge-stress: 2.202 s/loop, 0.277 ms/page,   7230.003 MiB/s 7962 succeed,    0 failed, 1750 different pages
      
      > numactl -C12 ./transhuge-stress
      transhuge-stress: 3.020 s/loop, 0.379 ms/page,   5273.324 MiB/s 7962 succeed,    0 failed, 3916 different pages
      
      Without -p parameter, hugepage restriction to CPU-local node works as before.
      
      Fixes: 077fcf11 ("mm/thp: allocate transparent hugepages on local node")
      Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Michal Hocko <mhocko@suse.cz>
      Cc: <stable@vger.kernel.org>	[4.0+]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0867a57c