1. 06 8月, 2016 7 次提交
    • L
      Merge tag 'dm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · d268675c
      Linus Torvalds 提交于
      Pull device mapper fixes from Mike Snitzer:
      
       - a stable dm-flakey fix to error read IO during the 'down_interval'
      
       - a DM core suspend fix to establish the SUSPENDED flag before dropping
         the SUSPENDING flag
      
       - a blk-mq request-based DM (dm-mq) dm_stop_queue() fix to properly
         stop the blk-mq hw_queues (and cancel pending requeue work); also
         set/clear QUEUE_FLAG_STOPPED when stopping/starting the dm-mq
         request_queue.
      
       - a DM multipath fix to harden locking of in-core state flags in the
         face of concurrent access while handling path failures under heavy
         IO.
      
       - a few small DM raid fixes to edge cases caught with further testing.
      
      * tag 'dm-4.8-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm raid: fix use of wrong status char during resynchronization
        dm raid: constructor fails on non-zero incompat_features
        dm raid: fix processing of max_recovery_rate constructor flag
        dm: set DMF_SUSPENDED* _before_ clearing DMF_NOFLUSH_SUSPENDING
        dm rq: fix the starting and stopping of blk-mq queues
        dm mpath: add locking to multipath_resume and must_push_back
        dm flakey: error READ bios during the down_interval
      d268675c
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · fff648da
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "Here's the second round of block updates for this merge window.
      
        It's a mix of fixes for changes that went in previously in this round,
        and fixes in general.  This pull request contains:
      
         - Fixes for loop from Christoph
      
         - A bdi vs gendisk lifetime fix from Dan, worth two cookies.
      
         - A blk-mq timeout fix, when on frozen queues.  From Gabriel.
      
         - Writeback fix from Jan, ensuring that __writeback_single_inode()
           does the right thing.
      
         - Fix for bio->bi_rw usage in f2fs from me.
      
         - Error path deadlock fix in blk-mq sysfs registration from me.
      
         - Floppy O_ACCMODE fix from Jiri.
      
         - Fix to the new bio op methods from Mike.
      
           One more followup will be coming here, ensuring that we don't
           propagate the block types outside of block.  That, and a rename of
           bio->bi_rw is coming right after -rc1 is cut.
      
         - Various little fixes"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        mm/block: convert rw_page users to bio op use
        loop: make do_req_filebacked more robust
        loop: don't try to use AIO for discards
        blk-mq: fix deadlock in blk_mq_register_disk() error path
        Include: blkdev: Removed duplicate 'struct request;' declaration.
        Fixup direct bi_rw modifiers
        block: fix bdi vs gendisk lifetime mismatch
        blk-mq: Allow timeouts to run while queue is freezing
        nbd: fix race in ioctl
        block: fix use-after-free in seq file
        f2fs: drop bio->bi_rw manual assignment
        block: add missing group association in bio-cloning functions
        blkcg: kill unused field nr_undestroyed_grps
        writeback: Write dirty times for WB_SYNC_ALL writeback
        floppy: fix open(O_ACCMODE) for ioctl-only open
      fff648da
    • L
      Merge tag 'pnp-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 62e6e9ba
      Linus Torvalds 提交于
      Pull PNP fix from Rafael Wysocki:
       "This fixes build errors due to a missing header file inclusion in
        drivers/pnp/pnpbios/core.c (Randy Dunlap)"
      
      * tag 'pnp-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PNP: pnpbios: add header file to fix build errors
      62e6e9ba
    • L
      Merge tag 'acpi-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0524b422
      Linus Torvalds 提交于
      Pull more ACPI updates from Rafael Wysocki:
       "Two more fixes in ACPI drivers, one in the ACPI EC driver
        (stable-candidate) and one in the ACPI button driver.
      
        Specifics:
      
         - An ACPI EC driver fix from the 4.3 cycle may cause the ACPICA's
           method reentrancy limit to be exceeded for a _Qxx method due to a
           large number of concurrent EC operations, so prevent that from
           happening by moving the EC handling into a separate workqueue with
           a limit on the number of concurrently executed work items (Lv
           Zheng)
      
         - Fix the cleanup code in the ACPI button driver that forgets to
           clear two variables on exit which causes an error to occur on the
           next attmpt to load the driver (Benjamin Tissoires)"
      
      * tag 'acpi-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / EC: Work around method reentrancy limit in ACPICA for _Qxx
        ACPI / button: remove pointer to old lid_sysfs on unbind
      0524b422
    • L
      Merge tag 'pm-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 11d8ec40
      Linus Torvalds 提交于
      Pull more power management updates from Rafael Wysocki:
       "A few more fixes and cleanups in the x86-64 low-level hibernation
        code, PM core, cpufreq (Kconfig and intel_pstate), and the operating
        points framework.
      
        Specifics:
      
         - Prevent the low-level assembly hibernate code on x86-64 from
           referring to __PAGE_OFFSET directly as a symbol which doesn't work
           when the kernel identity mapping base is randomized, in which case
           __PAGE_OFFSET is a variable (Rafael Wysocki).
      
         - Avoid selecting CPU_FREQ_STAT by default as the statistics are not
           required for proper cpufreq operation (Borislav Petkov).
      
         - Add Skylake-X and Broadwell-X IDs to the intel_pstate's list of
           processors where out-of-band (OBB) control of P-states is possible
           and if that is in use, intel_pstate should not attempt to manage
           P-states (Srinivas Pandruvada).
      
         - Drop some unnecessary checks from the wakeup IRQ handling code in
           the PM core (Markus Elfring).
      
         - Reduce the number operating performance point (OPP) lookups in one
           of the OPP framework's helper functions (Jisheng Zhang)"
      
      * tag 'pm-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        x86/power/64: Do not refer to __PAGE_OFFSET from assembly code
        cpufreq: Do not default-yes CPU_FREQ_STAT
        cpufreq: intel_pstate: Add more out-of-band IDs
        PM / OPP: optimize dev_pm_opp_set_rate() performance a bit
        PM-wakeup: Delete unnecessary checks before three function calls
      11d8ec40
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 39fada55
      Linus Torvalds 提交于
      Pull more input updates from Dmitry Torokhov:
       "Two new drivers for touchscreen controllers:
      
         - Silead touchscreen controllers
         - SiS 9200 family touchscreen controllers
      
        and a few driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: silead - remove some dead code
        Input: sis-i2c - select CONFIG_CRC_ITU_T
        Input: add driver for SiS 9200 family I2C touchscreen controllers
        Input: ili210x - fix permissions on "calibrate" attribute
        Input: elan_i2c - properly wake up touchpad on ASUS laptops
        Input: add driver for Silead touchscreens
        Input: elantech - fix debug dump of the current packet
        Input: rotary_encoder - support binary encoding of states
        Input: xpad - power off wireless 360 controllers on suspend
        Input: i8042 - break load dependency between atkbd/psmouse and i8042
        Input: synaptics-rmi4 - do not check for NULL when calling of_node_put()
        Input: cros_ec_keyb - cleanup use of dev
      39fada55
    • L
      Merge tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · f72035fa
      Linus Torvalds 提交于
      Pull more USB updates from Greg KH:
       "Here are a few more straggler patches for USB for 4.8-rc1.
      
        Most of these are for the usb-serial driver tree.  All of those have
        been in linux-next for a long time, but missed my previous pull
        request to you.
      
        The remaining change is to fix up a staging tree build error, due to
        some USB gadget driver changes that went in.  I put it in this tree as
        it was for a USB driver and people are reporting the build error on
        your tree.
      
        All of these have been in linux-next for this week, and longer for the
        usb-serial changes"
      
      * tag 'usb-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        staging: emxx_udc: allow modular build
        USB: serial: use variable for status
        USB: serial: option: add support for Telit LE910 PID 0x1206
        USB: serial: cp210x: use kmemdup
        USB: serial: ti_usb_3410_5052: use functions rather than macros
        USB: serial: ti_usb_3410_5052: remove ti_usb_3410_5052.h
        USB: serial: ti_usb_3410_5052: use __packed
        USB: serial: ti_usb_3410_5052: remove useless comments
      f72035fa
  2. 05 8月, 2016 33 次提交
    • R
      Merge branches 'acpi-ec' and 'acpi-button' · 4dc14b34
      Rafael J. Wysocki 提交于
      * acpi-ec:
        ACPI / EC: Work around method reentrancy limit in ACPICA for _Qxx
      
      * acpi-button:
        ACPI / button: remove pointer to old lid_sysfs on unbind
      4dc14b34
    • L
      Merge tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 6c84239d
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "RTC for 4.8
      
        Cleanups:
         - huge cleanup of rtc-generic and char/genrtc this allowed to cleanup
           rtc-cmos, rtc-sh, rtc-m68k, rtc-powerpc and rtc-parisc
         - move mn10300 to rtc-cmos
      
        Subsystem:
         - fix wakealarms after hibernate
         - multiples fixes for rctest
         - simplify implementations of .read_alarm
      
        New drivers:
         - Maxim MAX6916
      
        Drivers:
         - ds1307: fix weekday
         - m41t80: add wakeup support
         - pcf85063: add support for PCF85063A variant
         - rv8803: extend i2c fix and other fixes
         - s35390a: fix alarm reading, this fixes instant reboot after
           shutdown for QNAP TS-41x
         - s3c: clock fixes"
      
      * tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (65 commits)
        rtc: rv8803: Clear V1F when setting the time
        rtc: rv8803: Stop the clock while setting the time
        rtc: rv8803: Always apply the I²C workaround
        rtc: rv8803: Fix read day of week
        rtc: rv8803: Remove the check for valid time
        rtc: rv8803: Kconfig: Indicate rx8900 support
        rtc: asm9260: remove .owner field for driver
        rtc: at91sam9: Fix missing spin_lock_init()
        rtc: m41t80: add suspend handlers for alarm IRQ
        rtc: m41t80: make it a real error message
        rtc: pcf85063: Add support for the PCF85063A device
        rtc: pcf85063: fix year range
        rtc: hym8563: in .read_alarm set .tm_sec to 0 to signal minute accuracy
        rtc: explicitly set tm_sec = 0 for drivers with minute accurancy
        rtc: s3c: Add s3c_rtc_{enable/disable}_clk in s3c_rtc_setfreq()
        rtc: s3c: Remove unnecessary call to disable already disabled clock
        rtc: abx80x: use devm_add_action_or_reset()
        rtc: m41t80: use devm_add_action_or_reset()
        rtc: fix a typo and reduce three empty lines to one
        rtc: s35390a: improve two comments in .set_alarm
        ...
      6c84239d
    • R
      Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp' · e2b3b80d
      Rafael J. Wysocki 提交于
      * pm-sleep:
        x86/power/64: Do not refer to __PAGE_OFFSET from assembly code
      
      * pm-cpufreq:
        cpufreq: Do not default-yes CPU_FREQ_STAT
        cpufreq: intel_pstate: Add more out-of-band IDs
      
      * pm-core:
        PM-wakeup: Delete unnecessary checks before three function calls
      
      * pm-opp:
        PM / OPP: optimize dev_pm_opp_set_rate() performance a bit
      e2b3b80d
    • L
      Merge tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d4c06c70
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Nothing existing here: as usual a few HD-audio fixes (device fixups, a
        new AMD PCI ID, and a fix for krealloc() usage), in addition to a fix
        in Kconfig for legacy arm drivers"
      
      * tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix headset mic detection problem for two dell machines
        ALSA: hda: Fix krealloc() with __GFP_ZERO usage
        ALSA: hda: add AMD Bonaire AZ PCI ID with proper driver caps
        ALSA: arm: Fix empty menuconfig SND_ARM
        ALSA: hda - On-board speaker fixup on ACER Veriton
        ALSA: hda/realtek - Can't adjust speaker's volume on a Dell AIO
      d4c06c70
    • L
      Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 2cfd716d
      Linus Torvalds 提交于
      Pull more powerpc updates from Michael Ellerman:
       "These were delayed for various reasons, so I let them sit in next a
        bit longer, rather than including them in my first pull request.
      
        Fixes:
         - Fix early access to cpu_spec relocation from Benjamin Herrenschmidt
         - Fix incorrect event codes in power9-event-list from Madhavan Srinivasan
         - Move register_process_table() out of ppc_md from Michael Ellerman
      
        Use jump_label use for [cpu|mmu]_has_feature():
         - Add mmu_early_init_devtree() from Michael Ellerman
         - Move disable_radix handling into mmu_early_init_devtree() from Michael Ellerman
         - Do hash device tree scanning earlier from Michael Ellerman
         - Do radix device tree scanning earlier from Michael Ellerman
         - Do feature patching before MMU init from Michael Ellerman
         - Check features don't change after patching from Michael Ellerman
         - Make MMU_FTR_RADIX a MMU family feature from Aneesh Kumar K.V
         - Convert mmu_has_feature() to returning bool from Michael Ellerman
         - Convert cpu_has_feature() to returning bool from Michael Ellerman
         - Define radix_enabled() in one place & use static inline from Michael Ellerman
         - Add early_[cpu|mmu]_has_feature() from Michael Ellerman
         - Convert early cpu/mmu feature check to use the new helpers from Aneesh Kumar K.V
         - jump_label: Make it possible for arches to invoke jump_label_init() earlier from Kevin Hao
         - Call jump_label_init() in apply_feature_fixups() from Aneesh Kumar K.V
         - Remove mfvtb() from Kevin Hao
         - Move cpu_has_feature() to a separate file from Kevin Hao
         - Add kconfig option to use jump labels for cpu/mmu_has_feature() from Michael Ellerman
         - Add option to use jump label for cpu_has_feature() from Kevin Hao
         - Add option to use jump label for mmu_has_feature() from Kevin Hao
         - Catch usage of cpu/mmu_has_feature() before jump label init from Aneesh Kumar K.V
         - Annotate jump label assembly from Michael Ellerman
      
        TLB flush enhancements from Aneesh Kumar K.V:
         - radix: Implement tlb mmu gather flush efficiently
         - Add helper for finding SLBE LLP encoding
         - Use hugetlb flush functions
         - Drop multiple definition of mm_is_core_local
         - radix: Add tlb flush of THP ptes
         - radix: Rename function and drop unused arg
         - radix/hugetlb: Add helper for finding page size
         - hugetlb: Add flush_hugetlb_tlb_range
         - remove flush_tlb_page_nohash
      
        Add new ptrace regsets from Anshuman Khandual and Simon Guo:
         - elf: Add powerpc specific core note sections
         - Add the function flush_tmregs_to_thread
         - Enable in transaction NT_PRFPREG ptrace requests
         - Enable in transaction NT_PPC_VMX ptrace requests
         - Enable in transaction NT_PPC_VSX ptrace requests
         - Adapt gpr32_get, gpr32_set functions for transaction
         - Enable support for NT_PPC_CGPR
         - Enable support for NT_PPC_CFPR
         - Enable support for NT_PPC_CVMX
         - Enable support for NT_PPC_CVSX
         - Enable support for TM SPR state
         - Enable NT_PPC_TM_CTAR, NT_PPC_TM_CPPR, NT_PPC_TM_CDSCR
         - Enable support for NT_PPPC_TAR, NT_PPC_PPR, NT_PPC_DSCR
         - Enable support for EBB registers
         - Enable support for Performance Monitor registers"
      
      * tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (48 commits)
        powerpc/mm: Move register_process_table() out of ppc_md
        powerpc/perf: Fix incorrect event codes in power9-event-list
        powerpc/32: Fix early access to cpu_spec relocation
        powerpc/ptrace: Enable support for Performance Monitor registers
        powerpc/ptrace: Enable support for EBB registers
        powerpc/ptrace: Enable support for NT_PPPC_TAR, NT_PPC_PPR, NT_PPC_DSCR
        powerpc/ptrace: Enable NT_PPC_TM_CTAR, NT_PPC_TM_CPPR, NT_PPC_TM_CDSCR
        powerpc/ptrace: Enable support for TM SPR state
        powerpc/ptrace: Enable support for NT_PPC_CVSX
        powerpc/ptrace: Enable support for NT_PPC_CVMX
        powerpc/ptrace: Enable support for NT_PPC_CFPR
        powerpc/ptrace: Enable support for NT_PPC_CGPR
        powerpc/ptrace: Adapt gpr32_get, gpr32_set functions for transaction
        powerpc/ptrace: Enable in transaction NT_PPC_VSX ptrace requests
        powerpc/ptrace: Enable in transaction NT_PPC_VMX ptrace requests
        powerpc/ptrace: Enable in transaction NT_PRFPREG ptrace requests
        powerpc/process: Add the function flush_tmregs_to_thread
        elf: Add powerpc specific core note sections
        powerpc/mm: remove flush_tlb_page_nohash
        powerpc/mm/hugetlb: Add flush_hugetlb_tlb_range
        ...
      2cfd716d
    • L
      Merge tag 'metag-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 755b20f4
      Linus Torvalds 提交于
      Pull metag architecture updates from James Hogan:
       "Just a few minor fixes:
      
         - Fix another incorrect inline asm register constraint, which has
           been lying quietly for 5 and a half years before finally causing
           build breakage during this merge window.
      
         - Removal of duplicated KERN_INFO from Joe Perches
      
         - Typo fixes from Andrea Gelmini"
      
      * tag 'metag-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        metag: Fix __cmpxchg_u32 asm constraint for CMP
        metag: Remove duplicate KERN_<LEVEL> prefix
        metag: Fix typos
      755b20f4
    • R
      ACPI / hotplug / PCI: Runtime resume bridges before bus rescans · dd7fd3a8
      Rafael J. Wysocki 提交于
      If a PCI bridge (or PCIe port) that is runtime-suspended gets an ACPI
      hotplug notification, such as a bus check, it has to be resumed before
      re-scanning the devices below it, or those devices will not be
      accessible and will be treated as hot-removed.
      
      Make that happen and let the bridge suspend again after the bus below it
      has been re-scanned.
      
      This is a replacement for commit 16468c78 ("ACPI / hotplug / PCI:
      Runtime resume bridge before rescan") that has been reverted, because it
      introduced a system resume regression (due to missing bridge->pci_dev
      checks that are necessary in case the notification is targeted at the
      host bridge) and it is necessary for the code added by commit
      006d44e4 ("PCI: Add runtime PM support for PCIe ports") to work as
      expected.
      Tested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      dd7fd3a8
    • L
      Merge branch 'akpm' (patches from Andrew) · f8fbd8c4
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "A few late-breaking fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mm/memblock.c: fix NULL dereference error
        MAINTAINERS: update cgroup's document path
        slub: drop bogus inline for fixup_red_left()
        powerpc/fsl_rio: fix a missing error code
        mm: initialise per_cpu_nodestats for all online pgdats at boot
        mm/memblock: fix a typo in a comment
        mm: disable CONFIG_MEMORY_HOTPLUG when KASAN is enabled
      f8fbd8c4
    • L
      Merge tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 84e39eeb
      Linus Torvalds 提交于
      Pull second round of rdma updates from Doug Ledford:
       "This can be split out into just two categories:
      
         - fixes to the RDMA R/W API in regards to SG list length limits
           (about 5 patches)
      
         - fixes/features for the Intel hfi1 driver (everything else)
      
        The hfi1 driver is still being brought to full feature support by
        Intel, and they have a lot of people working on it, so that amounts to
        almost the entirety of this pull request"
      
      * tag 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (84 commits)
        IB/hfi1: Add cache evict LRU list
        IB/hfi1: Fix memory leak during unexpected shutdown
        IB/hfi1: Remove unneeded mm argument in remove function
        IB/hfi1: Consistently call ops->remove outside spinlock
        IB/hfi1: Use evict mmu rb operation
        IB/hfi1: Add evict operation to the mmu rb handler
        IB/hfi1: Fix TID caching actions
        IB/hfi1: Make the cache handler own its rb tree root
        IB/hfi1: Make use of mm consistent
        IB/hfi1: Fix user SDMA racy user request claim
        IB/hfi1: Fix error condition that needs to clean up
        IB/hfi1: Release node on insert failure
        IB/hfi1: Validate SDMA user iovector count
        IB/hfi1: Validate SDMA user request index
        IB/hfi1: Use the same capability state for all shared contexts
        IB/hfi1: Prevent null pointer dereference
        IB/hfi1: Rename TID mmu_rb_* functions
        IB/hfi1: Remove unneeded empty check in hfi1_mmu_rb_unregister()
        IB/hfi1: Restructure hfi1_file_open
        IB/hfi1: Make iovec loop index easy to understand
        ...
      84e39eeb
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 0cda6113
      Linus Torvalds 提交于
      Pull base rdma updates from Doug Ledford:
       "Round one of 4.8 code: while this is mostly normal, there is a new
        driver in here (the driver was hosted outside the kernel for several
        years and is actually a fairly mature and well coded driver).  It
        amounts to 13,000 of the 16,000 lines of added code in here.
      
        Summary:
      
         - Updates/fixes for iw_cxgb4 driver
         - Updates/fixes for mlx5 driver
         - Add flow steering and RSS API
         - Add hardware stats to mlx4 and mlx5 drivers
         - Add firmware version API for RDMA driver use
         - Add the rxe driver (this is a software RoCE driver that makes any
           Ethernet device a RoCE device)
         - Fixes for i40iw driver
         - Support for send only multicast joins in the cma layer
         - Other minor fixes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (72 commits)
        Soft RoCE driver
        IB/core: Support for CMA multicast join flags
        IB/sa: Add cached attribute containing SM information to SA port
        IB/uverbs: Fix race between uverbs_close and remove_one
        IB/mthca: Clean up error unwind flow in mthca_reset()
        IB/mthca: NULL arg to pci_dev_put is OK
        IB/hfi1: NULL arg to sc_return_credits is OK
        IB/mlx4: Add diagnostic hardware counters
        net/mlx4: Query performance and diagnostics counters
        net/mlx4: Add diagnostic counters capability bit
        Use smaller 512 byte messages for portmapper messages
        IB/ipoib: Report SG feature regardless of HW UD CSUM capability
        IB/mlx4: Don't use GFP_ATOMIC for CQ resize struct
        IB/hfi1: Disable by default
        IB/rdmavt: Disable by default
        IB/mlx5: Fix port counter ID association to QP offset
        IB/mlx5: Fix iteration overrun in GSI qps
        i40iw: Add NULL check for puda buffer
        i40iw: Change dup_ack_thresh to u8
        i40iw: Remove unnecessary check for moving CQ head
        ...
      0cda6113
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · fdf1f7ff
      Linus Torvalds 提交于
      Pull SCSI target updates from Nicholas Bellinger:
       "The most notable item is IBM virtual SCSI target driver, that was
        originally ported to target-core back in 2010 by Tomo-san, and has
        been brought forward to v4.x code by Bryant Ly, Michael Cyr and co
        over the last months.
      
        Also included are two ORDERED task related bug-fixes Bryant + Michael
        found along the way using ibmvscsis with AIX guests, plus a few
        miscellaneous target-core + iscsi-target bug-fixes with associated
        stable tags"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: fix spelling mistake: "limitiation" -> "limitation"
        target: Fix residual overflow handling in target_complete_cmd_with_length
        tcm_fc: set and unset FCP_SPPF_TARG_FCN
        iscsi-target: Fix panic when adding second TCP connection to iSCSI session
        ibmvscsis: Initial commit of IBM VSCSI Tgt Driver
        target: Fix ordered task CHECK_CONDITION early exception handling
        target: Fix ordered task target_setup_cmd_from_cdb exception hang
        target: Fix max_unmap_lba_count calc overflow
        target: Fix race between iscsi-target connection shutdown + ABORT_TASK
        target: Fix missing complete during ABORT_TASK + CMD_T_FABRIC_STOP
      fdf1f7ff
    • Z
      mm/memblock.c: fix NULL dereference error · e47608ab
      zijun_hu 提交于
      It causes NULL dereference error and failure to get type_a->regions[0]
      info if parameter type_b of __next_mem_range_rev() == NULL
      
      Fix this by checking before dereferring and initializing idx_b to 0
      
      The approach is tested by dumping all types of region via
      __memblock_dump_all() and __next_mem_range_rev() fixed to UART
      separately the result is okay after checking the logs.
      
      Link: http://lkml.kernel.org/r/57A0320D.6070102@zoho.comSigned-off-by: Nzijun_hu <zijun_hu@htc.com>
      Tested-by: Nzijun_hu <zijun_hu@htc.com>
      Acked-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e47608ab
    • S
      MAINTAINERS: update cgroup's document path · 4b16b0c0
      seokhoon.yoon 提交于
      cgroup's document path is changed to "cgroup-v1".  update it.
      
      Link: http://lkml.kernel.org/r/1470322507-5161-1-git-send-email-iamyooon@gmail.comSigned-off-by: Nseokhoon.yoon <iamyooon@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4b16b0c0
    • G
      slub: drop bogus inline for fixup_red_left() · 117d54df
      Geert Uytterhoeven 提交于
      With m68k-linux-gnu-gcc-4.1:
      
          include/linux/slub_def.h:126: warning: `fixup_red_left' declared inline after being called
          include/linux/slub_def.h:126: warning: previous declaration of `fixup_red_left' was here
      
      Commit c146a2b9 ("mm, kasan: account for object redzone in SLUB's
      nearest_obj()") made fixup_red_left() global, but forgot to remove the
      inline keyword.
      
      Fixes: c146a2b9 ("mm, kasan: account for object redzone in SLUB's nearest_obj()")
      Link: http://lkml.kernel.org/r/1470256262-1586-1-git-send-email-geert@linux-m68k.orgSigned-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Cc: Alexander Potapenko <glider@google.com>
      Acked-by: NDavid Rientjes <rientjes@google.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      117d54df
    • D
      powerpc/fsl_rio: fix a missing error code · 380afa36
      Dan Carpenter 提交于
      We should set the error code here rather than incorrectly returning 0.
      Otherwise static checkers complain.
      
      Link: http://lkml.kernel.org/r/20160804053525.GM775@mwandaSigned-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: Alexandre Bounine <alexandre.bounine@idt.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      380afa36
    • M
      mm: initialise per_cpu_nodestats for all online pgdats at boot · b4911ea2
      Mel Gorman 提交于
      Paul Mackerras and Reza Arbab reported that machines with memoryless
      nodes fail when vmstats are refreshed.  Paul reported an oops as follows
      
        Unable to handle kernel paging request for data at address 0xff7a10000
        Faulting instruction address: 0xc000000000270cd0
        Oops: Kernel access of bad area, sig: 11 [#1]
        SMP NR_CPUS=2048 NUMA PowerNV
        Modules linked in:
        CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.7.0-kvm+ #118
        task: c000000ff0680010 task.stack: c000000ff0704000
        NIP: c000000000270cd0 LR: c000000000270ce8 CTR: 0000000000000000
        REGS: c000000ff0707900 TRAP: 0300   Not tainted  (4.7.0-kvm+)
        MSR: 9000000102009033 <SF,HV,VEC,EE,ME,IR,DR,RI,LE,TM[E]>  CR: 846b6824  XER: 20000000
        CFAR: c000000000008768 DAR: 0000000ff7a10000 DSISR: 42000000 SOFTE: 1
        NIP refresh_zone_stat_thresholds+0x80/0x240
        LR refresh_zone_stat_thresholds+0x98/0x240
        Call Trace:
          refresh_zone_stat_thresholds+0xb8/0x240 (unreliable)
      
      Both supplied potential fixes but one potentially misses checks and
      another had redundant initialisations.  This version initialises
      per_cpu_nodestats on a per-pgdat basis instead of on a per-zone basis.
      
      Link: http://lkml.kernel.org/r/20160804092404.GI2799@techsingularity.netSigned-off-by: NMel Gorman <mgorman@techsingularity.net>
      Reported-by: NPaul Mackerras <paulus@ozlabs.org>
      Reported-by: NReza Arbab <arbab@linux.vnet.ibm.com>
      Tested-by: NReza Arbab <arbab@linux.vnet.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b4911ea2
    • A
    • Z
      mm: disable CONFIG_MEMORY_HOTPLUG when KASAN is enabled · 1e185736
      zhong jiang 提交于
      At present it is obvious that memory online and offline will fail when
      KASAN is enabled.  So add the condition to limit the memory_hotplug when
      KASAN is enabled.
      
      Link: http://lkml.kernel.org/r/1470063651-29519-1-git-send-email-zhongjiang@huawei.comSigned-off-by: Nzhong jiang <zhongjiang@huawei.com>
      Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
      Cc: Alexander Potapenko <glider@google.com>
      Cc: Dmitry Vyukov <dvyukov@google.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1e185736
    • L
      Merge tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux · a71e3604
      Linus Torvalds 提交于
      Pull nfsd updates from Bruce Fields:
       "Highlights:
      
         - Trond made a change to the server's tcp logic that allows a fast
           client to better take advantage of high bandwidth networks, but may
           increase the risk that a single client could starve other clients;
           a new sunrpc.svc_rpc_per_connection_limit parameter should help
           mitigate this in the (hopefully unlikely) event this becomes a
           problem in practice.
      
         - Tom Haynes added a minimal flex-layout pnfs server, which is of no
           use in production for now--don't build it unless you're doing
           client testing or further server development"
      
      * tag 'nfsd-4.8' of git://linux-nfs.org/~bfields/linux: (32 commits)
        nfsd: remove some dead code in nfsd_create_locked()
        nfsd: drop unnecessary MAY_EXEC check from create
        nfsd: clean up bad-type check in nfsd_create_locked
        nfsd: remove unnecessary positive-dentry check
        nfsd: reorganize nfsd_create
        nfsd: check d_can_lookup in fh_verify of directories
        nfsd: remove redundant zero-length check from create
        nfsd: Make creates return EEXIST instead of EACCES
        SUNRPC: Detect immediate closure of accepted sockets
        SUNRPC: accept() may return sockets that are still in SYN_RECV
        nfsd: allow nfsd to advertise multiple layout types
        nfsd: Close race between nfsd4_release_lockowner and nfsd4_lock
        nfsd/blocklayout: Make sure calculate signature/designator length aligned
        xfs: abstract block export operations from nfsd layouts
        SUNRPC: Remove unused callback xpo_adjust_wspace()
        SUNRPC: Change TCP socket space reservation
        SUNRPC: Add a server side per-connection limit
        SUNRPC: Micro optimisation for svc_data_ready
        SUNRPC: Call the default socket callbacks instead of open coding
        SUNRPC: lock the socket while detaching it
        ...
      a71e3604
    • L
      Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · d58b0d98
      Linus Torvalds 提交于
      Pull more btrfs updates from Chris Mason:
       "This is part two of my btrfs pull, which is some cleanups and a batch
        of fixes.
      
        Most of the code here is from Jeff Mahoney, making the pointers we
        pass around internally more consistent and less confusing overall.  I
        noticed a small problem right before I sent this out yesterday, so I
        fixed it up and re-tested overnight"
      
      * 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (40 commits)
        Btrfs: fix __MAX_CSUM_ITEMS
        btrfs: btrfs_abort_transaction, drop root parameter
        btrfs: add btrfs_trans_handle->fs_info pointer
        btrfs: btrfs_relocate_chunk pass extent_root to btrfs_end_transaction
        btrfs: convert nodesize macros to static inlines
        btrfs: introduce BTRFS_MAX_ITEM_SIZE
        btrfs: cleanup, remove prototype for btrfs_find_root_ref
        btrfs: copy_to_sk drop unused root parameter
        btrfs: simpilify btrfs_subvol_inherit_props
        btrfs: tests, use BTRFS_FS_STATE_DUMMY_FS_INFO instead of dummy root
        btrfs: tests, require fs_info for root
        btrfs: tests, move initialization into tests/
        btrfs: btrfs_test_opt and friends should take a btrfs_fs_info
        btrfs: prefix fsid to all trace events
        btrfs: plumb fs_info into btrfs_work
        btrfs: remove obsolete part of comment in statfs
        btrfs: hide test-only member under ifdef
        btrfs: Ratelimit "no csum found" info message
        btrfs: Add ratelimit to btrfs printing
        Btrfs: fix unexpected balance crash due to BUG_ON
        ...
      d58b0d98
    • L
      Merge tag 'upstream-4.8-rc1' of git://git.infradead.org/linux-ubifs · 3a303258
      Linus Torvalds 提交于
      Pull UBI/UBIFS updates from Richard Weinberger:
       "This contains mostly cleanups and minor improvements of UBI and UBIFS"
      
      * tag 'upstream-4.8-rc1' of git://git.infradead.org/linux-ubifs:
        ubi: Use bitmaps in Fastmap self-check code
        ubi: Be more paranoid while seaching for the most recent Fastmap
        ubi: Check whether the Fastmap anchor matches the super block
        ubi: Rework Fastmap attach base code
        ubi: Fix whitespace issue in count_fastmap_pebs()
        ubi: Introduce vol_ignored()
        ubi: Fix scan_fast() comment
        ubifs: switch_gc_head: Remove redondant sync of wbuf
        ubi: Make volume resize power cut aware
        ubi: Fix early logging
        ubi: gluebi: Fix double refcounting
        ubifs: Silence early error messages if MS_SILENT is set
        ubi: Fix race condition between ubi device creation and udev
        ubifs: Update comment for ubifs_errc
        ubi: Only read necessary size when reading the VID header
        ubifs: Make xattr structures static
        ubifs: Silence error output if MS_SILENT is set
      3a303258
    • L
      Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 9e0243db
      Linus Torvalds 提交于
      Pull UML updates from Richard Weinberger:
       "Beside of various fixes this also contains patches to enable features
        such was Kcov, kmemleak and TRACE_IRQFLAGS_SUPPORT on UML"
      
      * 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        hostfs: Freeing an ERR_PTR in hostfs_fill_sb_common()
        um: Support kcov
        um: Enable TRACE_IRQFLAGS_SUPPORT
        um: Use asm-generic/irqflags.h
        um: Fix possible deadlock in sig_handler_common()
        um: Select HAVE_DEBUG_KMEMLEAK
        um: Setup physical memory in setup_arch()
        um: Eliminate null test after alloc_bootmem
      9e0243db
    • L
      Merge branch 'parisc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · b067c904
      Linus Torvalds 提交于
      Pull parisc updates from Helge Deller:
      
       - added an optimized hash implementation for parisc (George Spelvin)
      
       - C99 style cleanups in iomap.c (Amitoj Kaur Chawla)
      
       - added breaks to switch statement in PDC function (noticed by Dan
         Carpenter)
      
      * 'parisc-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Change structure intialisation to C99 style in iomap.c
        parisc: Add break statements to pdc_pat_io_pci_cfg_read()
        parisc: Add <asm/hash.h>
      b067c904
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 8e7106a6
      Linus Torvalds 提交于
      Pull m68knommu updates from Greg Ungerer:
       "This series is all about Nicolas flat format support for MMU systems.
      
        Traditional m68k no-MMU flat format binaries can now be run on m68k
        MMU enabled systems too.  The series includes some nice cleanups of
        the binfmt_flat code and converts it to using proper user space
        accessor functions.
      
        With all this in place you can boot and run a complete no-MMU flat
        format based user space on an MMU enabled system"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: enable binfmt_flat on systems with an MMU
        binfmt_flat: allow compressed flat binary format to work on MMU systems
        binfmt_flat: add MMU-specific support
        binfmt_flat: update libraries' data segment pointer with userspace accessors
        binfmt_flat: use clear_user() rather than memset() to clear .bss
        binfmt_flat: use proper user space accessors with old relocs code
        binfmt_flat: use proper user space accessors with relocs processing code
        binfmt_flat: clean up create_flat_tables() and stack accesses
        binfmt_flat: use generic transfer_args_to_stack()
        elf_fdpic_transfer_args_to_stack(): make it generic
        binfmt_flat: prevent kernel dammage from corrupted executable headers
        binfmt_flat: convert printk invocations to their modern form
        binfmt_flat: assorted cleanups
        m68k: use same start_thread() on MMU and no-MMU
        m68k: fix file path comment
        m68k: fix bFLT executable running on MMU enabled systems
      8e7106a6
    • D
      nfsd: remove some dead code in nfsd_create_locked() · 2b118859
      Dan Carpenter 提交于
      We changed this around in f135af1041f ('nfsd: reorganize nfsd_create')
      so "dchild" can't be an error pointer any more.  Also, dchild can't be
      NULL here (and dput would already handle this even if it was).
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      2b118859
    • J
      nfsd: drop unnecessary MAY_EXEC check from create · fa08139d
      J. Bruce Fields 提交于
      We need an fh_verify to make sure we at least have a dentry, but actual
      permission checks happen later.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      fa08139d
    • J
      nfsd: clean up bad-type check in nfsd_create_locked · 71423274
      J. Bruce Fields 提交于
      Minor cleanup, no change in behavior.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      71423274
    • J
      nfsd: remove unnecessary positive-dentry check · d03d9fe4
      J. Bruce Fields 提交于
      vfs_{create,mkdir,mknod} each begin with a call to may_create(), which
      returns EEXIST if the object already exists.
      
      This check is therefore unnecessary.
      
      (In the NFSv2 case, nfsd_proc_create also has such a check.  Contrary to
      RFC 1094, our code seems to believe that a CREATE of an existing file
      should succeed.  I'm leaving that behavior alone.)
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      d03d9fe4
    • J
      nfsd: reorganize nfsd_create · b44061d0
      J. Bruce Fields 提交于
      There's some odd logic in nfsd_create() that allows it to be called with
      the parent directory either locked or unlocked.  The only already-locked
      caller is NFSv2's nfsd_proc_create().  It's less confusing to split out
      the unlocked case into a separate function which the NFSv2 code can call
      directly.
      
      Also fix some comments while we're here.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      b44061d0
    • J
      nfsd: check d_can_lookup in fh_verify of directories · e75b23f9
      J. Bruce Fields 提交于
      Create and other nfsd ops generally assume we can call lookup_one_len on
      inodes with S_IFDIR set.  Al says that this assumption isn't true in
      general, though it should be for the filesystem objects nfsd sees.
      
      Add a check just to make sure our assumption isn't violated.
      
      Remove a couple checks for i_op->lookup in create code.
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      e75b23f9
    • J
      nfsd: remove redundant zero-length check from create · 12391d07
      J. Bruce Fields 提交于
      lookup_one_len already has this check.
      
      The only effect of this patch is to return access instead of perm in the
      0-length-filename case.  I actually prefer nfserr_perm (or _inval?), but
      I doubt anyone cares.
      
      The isdotent check seems redundant too, but I worry that some client
      might actually care about that strange nfserr_exist error.
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      12391d07
    • O
      nfsd: Make creates return EEXIST instead of EACCES · 7eed34f1
      Oleg Drokin 提交于
      When doing a create (mkdir/mknod) on a name, it's worth
      checking the name exists first before returning EACCES in case
      the directory is not writeable by the user.
      This makes return values on the client more consistent
      regardless of whenever the entry there is cached in the local
      cache or not.
      Another positive side effect is certain programs only expect
      EEXIST in that case even despite POSIX allowing any valid
      error to be returned.
      Signed-off-by: NOleg Drokin <green@linuxhacker.ru>
      Signed-off-by: NJ. Bruce Fields <bfields@redhat.com>
      7eed34f1
    • M
      mm/block: convert rw_page users to bio op use · abf54548
      Mike Christie 提交于
      The rw_page users were not converted to use bio/req ops. As a result
      bdev_write_page is not passing down REQ_OP_WRITE and the IOs will
      be sent down as reads.
      Signed-off-by: NMike Christie <mchristi@redhat.com>
      Fixes: 4e1b2d52 ("block, fs, drivers: remove REQ_OP compat defs and related code")
      
      Modified by me to:
      
      1) Drop op_flags passing into ->rw_page(), as we don't use it.
      2) Make op_is_write() and friends safe to use for !CONFIG_BLOCK
      Signed-off-by: NJens Axboe <axboe@fb.com>
      abf54548