1. 16 12月, 2016 17 次提交
    • L
      Merge tag 'arc-4.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · d25b6af9
      Linus Torvalds 提交于
      Pull ARC updates from Vineet Gupta:
       "These are mostly timer/clocksource driver updates which were
        Reviewed/Acked by Daniel but had to be merged via ARC tree due to
        dependencies.
      
        I will follow up with another pull request with actual ARC changes
        early next week !
      
        Summary:
      
         - Moving ARC timer driver into drivers/clocksource
      
         - EZChip timer driver updates [Noam]
      
         - ARC AXS103 and HAPS platform updates [Alexey]"
      
      * tag 'arc-4.10-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: axs10x: really enable ARC PGU
        ARC: rename Zebu platform support to HAPS
        clocksource: nps: avoid maybe-uninitialized warning
        clocksource: Add clockevent support to NPS400 driver
        clocksource: update "fn" at CLOCKSOURCE_OF_DECLARE() of nps400 timer
        soc: Support for NPS HW scheduling
        clocksource: import ARC timer driver
        ARC: breakout timer include code into separate header ...
        ARC: move mcip.h into include/soc and adjust the includes
        ARC: breakout aux handling into a separate header
        ARC: time: move time_init() out of the driver
        ARC: timer: gfrc, rtc: build under same option (64-bit timers)
        ARC: timer: gfrc, rtc: Read BCR to detect whether hardware exists ...
        ARC: timer: gfrc, rtc: deuglify big endian code
      d25b6af9
    • L
      Merge tag 'trace-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 179a7ba6
      Linus Torvalds 提交于
      Pull tracing updates from Steven Rostedt:
       "This release has a few updates:
      
         - STM can hook into the function tracer
         - Function filtering now supports more advance glob matching
         - Ftrace selftests updates and added tests
         - Softirq tag in traces now show only softirqs
         - ARM nop added to non traced locations at compile time
         - New trace_marker_raw file that allows for binary input
         - Optimizations to the ring buffer
         - Removal of kmap in trace_marker
         - Wakeup and irqsoff tracers now adhere to the set_graph_notrace file
         - Other various fixes and clean ups"
      
      * tag 'trace-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (42 commits)
        selftests: ftrace: Shift down default message verbosity
        kprobes/trace: Fix kprobe selftest for newer gcc
        tracing/kprobes: Add a helper method to return number of probe hits
        tracing/rb: Init the CPU mask on allocation
        tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results
        tracing/fgraph: Have wakeup and irqsoff tracers ignore graph functions too
        fgraph: Handle a case where a tracer ignores set_graph_notrace
        tracing: Replace kmap with copy_from_user() in trace_marker writing
        ftrace/x86_32: Set ftrace_stub to weak to prevent gcc from using short jumps to it
        tracing: Allow benchmark to be enabled at early_initcall()
        tracing: Have system enable return error if one of the events fail
        tracing: Do not start benchmark on boot up
        tracing: Have the reg function allow to fail
        ring-buffer: Force rb_end_commit() and rb_set_commit_to_write() inline
        ring-buffer: Froce rb_update_write_stamp() to be inlined
        ring-buffer: Force inline of hotpath helper functions
        tracing: Make __buffer_unlock_commit() always_inline
        tracing: Make tracepoint_printk a static_key
        ring-buffer: Always inline rb_event_data()
        ring-buffer: Make rb_reserve_next_event() always inlined
        ...
      179a7ba6
    • L
      Merge tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux · 5e176d69
      Linus Torvalds 提交于
      Pull orangefs updates from Mike Marshall:
       "Two small fixes sent in by other developers:
      
         - axe some dead code (Christophe Jaillet)
      
         - fix memory leak (Colin Ian King, found by Coverity)"
      
      * tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
        orangefs: Axe some dead code
        orangefs: fix memory leak of string 'new' on exit path
      5e176d69
    • L
      Merge tag 'upstream-4.10-rc1' of git://git.infradead.org/linux-ubifs · 39d2c3b9
      Linus Torvalds 提交于
      Pull ubifs updates from Richard Weinberger:
      
       - file encryption for UBIFS using the fscrypt framework
      
       - a fix to honor the dirty_writeback_interval sysctl
      
       - removal of dead code
      
      * tag 'upstream-4.10-rc1' of git://git.infradead.org/linux-ubifs: (30 commits)
        ubifs: Initialize fstr_real_len
        ubifs: Use fscrypt ioctl() helpers
        ubifs: Use FS_CFLG_OWN_PAGES
        ubifs: Raise write version to 5
        ubifs: Implement UBIFS_FLG_ENCRYPTION
        ubifs: Implement UBIFS_FLG_DOUBLE_HASH
        ubifs: Use a random number for cookies
        ubifs: Add full hash lookup support
        ubifs: Rename tnc_read_node_nm
        ubifs: Add support for encrypted symlinks
        ubifs: Implement encrypted filenames
        ubifs: Make r5 hash binary string aware
        ubifs: Relax checks in ubifs_validate_entry()
        ubifs: Implement encrypt/decrypt for all IO
        ubifs: Constify struct inode pointer in ubifs_crypt_is_encrypted()
        ubifs: Introduce new data node field, compr_size
        ubifs: Enforce crypto policy in mmap
        ubifs: Massage assert in ubifs_xattr_set() wrt. fscrypto
        ubifs: Preload crypto context in ->lookup()
        ubifs: Enforce crypto policy in ->link and ->rename
        ...
      39d2c3b9
    • L
      Merge tag 'platform-drivers-x86-v4.10-1' of... · e18bf801
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v4.10-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver updates from Darrent Hart:
       "Introduce one new driver for Mellanox platforms. Add support for
        various new models to existing drivers via quirks, hotkeys, etc.
        Significant updates to intel_pmc_core in support of Kabylake and
        Sunrise Point PCH power management debug. Some cleanup and refactoring
        across various drivers.
      
        Detailed summary:
      
        dell-laptop:
         - Use brightness_set_blocking for kbd_led_level_set
      
        thinkpad_acpi:
         - Initialize local in_tablet_mode and type
         - Fix old style declaration GCC warning
         - Adding new hotkey ID for Lenovo thinkpad
         - Add support for X1 Yoga (2016) Tablet Mode
         - Move tablet detection into separate function
      
        asus-nb-wmi:
         - Add X45U quirk
         - Make use of dmi->ident
      
        asus-wmi:
         - Set specified XUSB2PR value for X550LB
      
        intel_mid_thermal:
         - Fix suspend handlers unused warning
      
        intel-vbtn:
         - Switch to use devm_input_allocate_device
      
        dell-wmi:
         - Add events created by Dell Rugged 2-in-1s
         - Adjust wifi catcher to emit KEY_WLAN
      
        intel_pmc_core:
         - Add KBL CPUID support
         - Add LTR IGNORE debug feature
         - Add MPHY PLL clock gating status
         - ModPhy core lanes pg status
         - Add PCH IP Power Gating Status
         - Fix PWRMBASE mask and mmio reg len
      
        acer-wmi:
         - Only supports AMW0_GUID1 on acer family
      
        mlx-platform:
         - Introduce support for Mellanox hotplug driver
      
        platform/x86:
         - Use ACPI_FAILURE at appropriate places"
      
      * tag 'platform-drivers-x86-v4.10-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (22 commits)
        platform/x86: thinkpad_acpi: Initialize local in_tablet_mode and type
        platform/x86: dell-laptop: Use brightness_set_blocking for kbd_led_level_set
        platform/x86: thinkpad_acpi: Fix old style declaration GCC warning
        platform/x86: thinkpad_acpi: Adding new hotkey ID for Lenovo thinkpad
        platform/x86: thinkpad_acpi: Add support for X1 Yoga (2016) Tablet Mode
        platform/x86: thinkpad_acpi: Move tablet detection into separate function
        platform/x86: asus-nb-wmi.c: Add X45U quirk
        platform/x86: asus-nb-wmi: Make use of dmi->ident
        platform/x86: asus-wmi: Set specified XUSB2PR value for X550LB
        platform/x86: intel_mid_thermal: Fix suspend handlers unused warning
        platform/x86: intel-vbtn: Switch to use devm_input_allocate_device
        platform/x86: Use ACPI_FAILURE at appropriate places
        platform/x86: dell-wmi: Add events created by Dell Rugged 2-in-1s
        platform/x86: dell-wmi: Adjust wifi catcher to emit KEY_WLAN
        platform/x86: intel_pmc_core: Add KBL CPUID support
        platform/x86: intel_pmc_core: Add LTR IGNORE debug feature
        platform/x86: intel_pmc_core: Add MPHY PLL clock gating status
        platform/x86: intel_pmc_core: ModPhy core lanes pg status
        platform/x86: intel_pmc_core: Add PCH IP Power Gating Status
        platform/x86: intel_pmc_core: Fix PWRMBASE mask and mmio reg len
        ...
      e18bf801
    • L
      Merge branch 'i2c/for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 8600b697
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
      
       - the first series of making i2c_device_id optional instead of
         mandatory (in favor of alternatives like of_device_id).
      
         This involves adding a new probe callback (probe_new) which removes
         some peculiarities I2C had for a long time now. The new probe is
         matching the other subsystems now and the old one will be removed
         once all users are converted. It is expected to take a while but
         there is ongoing interest in that.
      
       - SMBus Host Notify introduced 4.9 got refactored. They are now using
         interrupts instead of the alert callback which solves multiple
         issues.
      
       - new drivers for iMX LowPower I2C, Mellanox CPLD and its I2C mux
      
       - significant refactoring for bcm2835 driver
      
       - the usual set of driver updates and improvements
      
      * 'i2c/for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (46 commits)
        i2c: fsl-lpi2c: read lpi2c fifo size in probe()
        i2c: octeon: thunderx: Remove double-check after interrupt
        i2c: octeon: thunderx: TWSI software reset in recovery
        i2c: cadence: Allow Cadence I2C to be selected for Cadence Xtensa CPUs
        i2c: sh_mobile: Add per-Generation fallback bindings
        i2c: rcar: Add per-Generation fallback bindings
        i2c: imx-lpi2c: add low power i2c bus driver
        dt-bindings: i2c: imx-lpi2c: add devicetree bindings
        i2c: designware-pcidrv: Add 10bit address feature to medfield/merrifield
        i2c: pxa: Add support for the I2C units found in Armada 3700
        i2c: pxa: Add definition of fast and high speed modes via the regs layout
        dt-bindings: i2c: pxa: Update the documentation for the Armada 3700
        i2c: qup: support SMBus block read
        i2c: qup: add ACPI support
        i2c: designware: Consolidate default functionality bits
        i2c: i2c-mux-gpio: update mux with gpiod_set_array_value_cansleep
        i2c: mux: pca954x: Add ACPI support for pca954x
        i2c: use an IRQ to report Host Notify events, not alert
        i2c: i801: remove SMBNTFDDAT reads as they always seem to return 0
        i2c: i801: use the BIT() macro for FEATURES_* also
        ...
      8600b697
    • L
      Merge tag 'pci-v4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 0ab7b12c
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes:
      
         - add support for PCI on ARM64 boxes with ACPI. We already had this
           for theoretical spec-compliant hardware; now we're adding quirks
           for the actual hardware (Cavium, HiSilicon, Qualcomm, X-Gene)
      
         - add runtime PM support for hotplug ports
      
         - enable runtime suspend for Intel UHCI that uses platform-specific
           wakeup signaling
      
         - add yet another host bridge registration interface. We hope this is
           extensible enough to subsume the others
      
         - expose device revision in sysfs for DRM
      
         - to avoid device conflicts, make sure any VF BAR updates are done
           before enabling the VF
      
         - avoid unnecessary link retrains for ASPM
      
         - allow INTx masking on Mellanox devices that support it
      
         - allow access to non-standard VPD for Chelsio devices
      
         - update Broadcom iProc support for PAXB v2, PAXC v2, inbound DMA,
           etc
      
         - update Rockchip support for max-link-speed
      
         - add NVIDIA Tegra210 support
      
         - add Layerscape LS1046a support
      
         - update R-Car compatibility strings
      
         - add Qualcomm MSM8996 support
      
         - remove some uninformative bootup messages"
      
      * tag 'pci-v4.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (115 commits)
        PCI: Enable access to non-standard VPD for Chelsio devices (cxgb3)
        PCI: Expand "VPD access disabled" quirk message
        PCI: pciehp: Remove loading message
        PCI: hotplug: Remove hotplug core message
        PCI: Remove service driver load/unload messages
        PCI/AER: Log AER IRQ when claiming Root Port
        PCI/AER: Log errors with PCI device, not PCIe service device
        PCI/AER: Remove unused version macros
        PCI/PME: Log PME IRQ when claiming Root Port
        PCI/PME: Drop unused support for PMEs from Root Complex Event Collectors
        PCI: Move config space size macros to pci_regs.h
        x86/platform/intel-mid: Constify mid_pci_platform_pm
        PCI/ASPM: Don't retrain link if ASPM not possible
        PCI: iproc: Skip check for legacy IRQ on PAXC buses
        PCI: pciehp: Leave power indicator on when enabling already-enabled slot
        PCI: pciehp: Prioritize data-link event over presence detect
        PCI: rcar: Add gen3 fallback compatibility string for pcie-rcar
        PCI: rcar: Use gen2 fallback compatibility last
        PCI: rcar-gen2: Use gen2 fallback compatibility last
        PCI: rockchip: Move the deassert of pm/aclk/pclk after phy_init()
        ..
      0ab7b12c
    • D
      platform/x86: thinkpad_acpi: Initialize local in_tablet_mode and type · cb2bf251
      Darren Hart 提交于
      linux-next reported in_tablet_mode and type may be used uninitialized
      after:
      
      b3180028 ("platform/x86: thinkpad_acpi: Move tablet detection into separate function")
      
      This turns out to be a false positive as the pr_info call cannot be
      reached if tp_features.hotkey_tablet (global scope) is 0, and
      in_tablet_mode and type are assigned in both places
      tp_features.hotkey_tablet is assigned.
      
      Regardless, to make it explicit and avoid further reports, initialize
      in_tablet_mode to 0 and type to NULL.
      Signed-off-by: NDarren Hart <dvhart@linux.intel.com>
      Acked-by: NHenrique de Moraes Holschuh <hmh@hmh.eng.br>
      Cc: Lyude <lyude@redhat.com>
      cb2bf251
    • L
      Merge tag 'iommu-updates-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · a9a16a6d
      Linus Torvalds 提交于
      Pull IOMMU updates from Joerg Roedel:
       "These changes include:
      
         - support for the ACPI IORT table on ARM systems and patches to make
           the ARM-SMMU driver make use of it
      
         - conversion of the Exynos IOMMU driver to device dependency links
           and implementation of runtime pm support based on that conversion
      
         - update the Mediatek IOMMU driver to use the new struct
           device->iommu_fwspec member
      
         - implementation of dma_map/unmap_resource in the generic ARM
           dma-iommu layer
      
         - a number of smaller fixes and improvements all over the place"
      
      * tag 'iommu-updates-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (44 commits)
        ACPI/IORT: Make dma masks set-up IORT specific
        iommu/amd: Missing error code in amd_iommu_init_device()
        iommu/s390: Drop duplicate header pci.h
        ACPI/IORT: Introduce iort_iommu_configure
        ACPI/IORT: Add single mapping function
        ACPI/IORT: Replace rid map type with type mask
        iommu/arm-smmu: Add IORT configuration
        iommu/arm-smmu: Split probe functions into DT/generic portions
        iommu/arm-smmu-v3: Add IORT configuration
        iommu/arm-smmu-v3: Split probe functions into DT/generic portions
        ACPI/IORT: Add support for ARM SMMU platform devices creation
        ACPI/IORT: Add node match function
        ACPI: Implement acpi_dma_configure
        iommu/arm-smmu-v3: Convert struct device of_node to fwnode usage
        iommu/arm-smmu: Convert struct device of_node to fwnode usage
        iommu: Make of_iommu_set/get_ops() DT agnostic
        ACPI/IORT: Add support for IOMMU fwnode registration
        ACPI/IORT: Introduce linker section for IORT entries probing
        ACPI: Add FWNODE_ACPI_STATIC fwnode type
        iommu/arm-smmu: Set SMTNMB_TLBEN in ACR to enable caching of bypass entries
        ...
      a9a16a6d
    • L
      rdma: fix buggy code that the compiler warns about · d3ea5478
      Linus Torvalds 提交于
      Get rid of this warning:
      
        drivers/infiniband/sw/rdmavt/cq.c: In function ‘rvt_cq_exit’:
        drivers/infiniband/sw/rdmavt/cq.c:542:2: warning: ‘worker’ may be used uninitialized in this function [-Wmaybe-uninitialized]
          kthread_destroy_worker(worker);
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      by fixing the function to actually work.
      
      Fixes: 6efaf10f ("IB/rdmavt: Avoid queuing work into a destroyed cq kthread worker")
      Cc: Petr Mladek <pmladek@suse.com>
      Cc: Doug Ledford <dledford@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d3ea5478
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 4d5b57e0
      Linus Torvalds 提交于
      Pull rdma updates from Doug Ledford:
       "This is the complete update for the rdma stack for this release cycle.
      
        Most of it is typical driver and core updates, but there is the
        entirely new VMWare pvrdma driver. You may have noticed that there
        were changes in DaveM's pull request to the bnxt Ethernet driver to
        support a RoCE RDMA driver. The bnxt_re driver was tentatively set to
        be pulled in this release cycle, but it simply wasn't ready in time
        and was dropped (a few review comments still to address, and some
        multi-arch build issues like prefetch() not working across all
        arches).
      
        Summary:
      
         - shared mlx5 updates with net stack (will drop out on merge if
           Dave's tree has already been merged)
      
         - driver updates: cxgb4, hfi1, hns-roce, i40iw, mlx4, mlx5, qedr, rxe
      
         - debug cleanups
      
         - new connection rejection helpers
      
         - SRP updates
      
         - various misc fixes
      
         - new paravirt driver from vmware"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (210 commits)
        IB: Add vmw_pvrdma driver
        IB/mlx4: fix improper return value
        IB/ocrdma: fix bad initialization
        infiniband: nes: return value of skb_linearize should be handled
        MAINTAINERS: Update Intel RDMA RNIC driver maintainers
        MAINTAINERS: Remove Mitesh Ahuja from emulex maintainers
        IB/core: fix unmap_sg argument
        qede: fix general protection fault may occur on probe
        IB/mthca: Replace pci_pool_alloc by pci_pool_zalloc
        mlx5, calc_sq_size(): Make a debug message more informative
        mlx5: Remove a set-but-not-used variable
        mlx5: Use { } instead of { 0 } to init struct
        IB/srp: Make writing the add_target sysfs attr interruptible
        IB/srp: Make mapping failures easier to debug
        IB/srp: Make login failures easier to debug
        IB/srp: Introduce a local variable in srp_add_one()
        IB/srp: Fix CONFIG_DYNAMIC_DEBUG=n build
        IB/multicast: Check ib_find_pkey() return value
        IPoIB: Avoid reading an uninitialized member variable
        IB/mad: Fix an array index check
        ...
      4d5b57e0
    • L
      Merge tag 'devicetree-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 6df8b74b
      Linus Torvalds 提交于
      Pull DeviceTree updates from Rob Herring:
      
       - add various vendor prefixes.
      
       - fix NUMA node handling when "numa=off" is passed on kernel command
         line.
      
       - coding style Clean-up of overlay handling code.
      
       - DocBook fixes in DT platform driver code
      
       - Altera SoCFPGA binding addtions for freeze bridge, arria10 FPGA
         manager and FPGA bridges.
      
       - a couple of printk message fixes.
      
      * tag 'devicetree-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (33 commits)
        dt: pwm: bcm2835: fix typo in clocks property name
        devicetree: add vendor prefix for National Instruments
        Revert "of: base: add support to get machine model name"
        of: Fix issue where code would fall through to error case.
        drivers/of: fix missing pr_cont()s in of_print_phandle_args
        devicetree: bindings: Add vendor prefix for Oki
        devicetree: bindings: Add vendor prefix for Andes Technology Corporation
        dt-bindings: add MYIR Tech hardware vendor prefix
        add bindings document for altera freeze bridge
        ARM: socfpga: add bindings doc for arria10 fpga manager
        ARM: socfpga: add bindings document for fpga bridge drivers
        of: base: add support to get machine model name
        of/platform: clarify of_find_device_by_node refcounting
        of/platform: fix of_platform_device_destroy comment
        of: Remove unused variable overlay_symbols
        of: Move setting of pointer to beside test for non-null
        of: Add back an error message, restructured
        of: Update comments to reflect changes and increase clarity
        of: Remove redundant size check
        of: Update structure of code to be clearer, also remove BUG_ON()
        ...
      6df8b74b
    • L
      Merge tag 'pwm/for-4.10-rc1' of... · 57d64e6f
      Linus Torvalds 提交于
      Merge tag 'pwm/for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "This is a very tiny pull request, with just a new driver for HiSilicon
        BVT SoCs and a cleanup for the Amlogic Meson driver.
      
        There are other patches on the list, but my timing was really bad this
        time and I ended up not having the time to look at them in enough
        detail to be comfortable merging them"
      
      * tag 'pwm/for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
        pwm: Add PWM driver for HiSilicon BVT SOCs
        pwm: meson: Remove unneeded platform MODULE_ALIAS
      57d64e6f
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 19c75bcb
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This fixes the following issues:
      
         - a crash regression in the new skcipher walker
      
         - incorrect return value in public_key_verify_signature
      
         - fix for in-place signing in the sign-file utility"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: skcipher - fix crash in virtual walk
        sign-file: Fix inplace signing when src and dst names are both specified
        crypto: asymmetric_keys - set error code on failure
      19c75bcb
    • D
      afs, rxrpc: Update the MAINTAINERS file · ee84595a
      David Howells 提交于
      Update the MAINTAINERS file for AFS and AF_RXRPC to include a website
      pointer.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ee84595a
    • M
      redo: radix tree test suite: fix compilation · b9a0deb9
      Matthew Wilcox 提交于
      [ This resurrects commit 53855d10, which was reverted in
        2b41226b.  It depended on commit d544abd5 ("lib/radix-tree:
        Convert to hotplug state machine") so now it is correct to apply ]
      
      Patch "lib/radix-tree: Convert to hotplug state machine" breaks the test
      suite as it adds a call to cpuhp_setup_state_nocalls() which is not
      currently emulated in the test suite.  Add it, and delete the emulation
      of the old CPU hotplug mechanism.
      
      Link: http://lkml.kernel.org/r/1480369871-5271-36-git-send-email-mawilcox@linuxonhyperv.comSigned-off-by: NMatthew Wilcox <mawilcox@microsoft.com>
      Tested-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Konstantin Khlebnikov <koct9i@gmail.com>
      Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
      Cc: Matthew Wilcox <mawilcox@microsoft.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b9a0deb9
    • G
      printk: Remove no longer used second struct cont · 8fa9a697
      Geert Uytterhoeven 提交于
      If CONFIG_PRINTK=n:
      
          kernel/printk/printk.c:1893: warning: ‘cont’ defined but not used
      
      Note that there are actually two different struct cont definitions and
      objects: the first one is used if CONFIG_PRINTK=y, the second one became
      unused by removing console_cont_flush().
      
      Fixes: 5c2992ee ("printk: remove console flushing special cases for partial buffered lines")
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Acked-by: NPetr Mladek <pmladek@suse.com>
      [ I do the occasional "allnoconfig" builds, but apparently not often
        enough  - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8fa9a697
  2. 15 12月, 2016 23 次提交