1. 16 Aug, 2018 15 commits
    • Linus Torvalds's avatar
      Merge branch 'next-integrity' of... · f91e6544
      Linus Torvalds authored
      Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
      
      Pull integrity updates from James Morris:
       "This adds support for EVM signatures based on larger digests, contains
        a new audit record AUDIT_INTEGRITY_POLICY_RULE to differentiate the
        IMA policy rules from the IMA-audit messages, addresses two deadlocks
        due to either loading or searching for crypto algorithms, and cleans
        up the audit messages"
      
      * 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        EVM: fix return value check in evm_write_xattrs()
        integrity: prevent deadlock during digsig verification.
        evm: Allow non-SHA1 digital signatures
        evm: Don't deadlock if a crypto algorithm is unavailable
        integrity: silence warning when CONFIG_SECURITYFS is not enabled
        ima: Differentiate auditing policy rules from "audit" actions
        ima: Do not audit if CONFIG_INTEGRITY_AUDIT is not set
        ima: Use audit_log_format() rather than audit_log_string()
        ima: Call a...
      f91e6544
    • Linus Torvalds's avatar
      Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · c715ebeb
      Linus Torvalds authored
      Pull TPM updates from James Morris:
      
       - Migrate away from PM runtime as explicit cmdReady/goIdle transactions
         for every command is a spec requirement. PM runtime adds only a layer
         of complexity on our case.
      
       - tpm_tis drivers can now specify the hwrng quality.
      
       - TPM 2.0 code uses now tpm_buf for constructing messages. Jarkko
         thinks Tomas Winkler has done the same for TPM 1.2, and will start
         digging those changes from the patchwork in the near future.
      
       - Bug fixes and clean ups
      
      * 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: Get rid of ima_used_chip and use ima_tpm_chip != NULL instead
        ima: Use tpm_default_chip() and call TPM functions with a tpm_chip
        tpm: replace TPM_TRANSMIT_RAW with TPM_TRANSMIT_NESTED
        tpm: Convert tpm_find_get_ops() to use tpm_default_chip()
        tpm: Implement tpm_default_chip() to find a TPM chip
        tpm: rename tpm_chip_find_g...
      c715ebeb
    • Linus Torvalds's avatar
      Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 04743f89
      Linus Torvalds authored
      Pull smack updates from James Morris:
       "Minor fixes from Piotr Sawicki"
      
      * 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Smack: Inform peer that IPv6 traffic has been blocked
        Smack: Check UDP-Lite and DCCP protocols during IPv6 handling
        Smack: Fix handling of IPv4 traffic received by PF_INET6 sockets
      04743f89
    • Linus Torvalds's avatar
      Merge tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy · 5bae2be4
      Linus Torvalds authored
      Pull jfs update from David Kleikamp:
       "Just one jfs patch for 4.19"
      
      * tag 'jfs-4.19' of git://github.com/kleikamp/linux-shaggy:
        jfs: use time64_t for otime
      5bae2be4
    • Linus Torvalds's avatar
      Merge tag 'gfs2-4.19.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 2b2f2aed
      Linus Torvalds authored
      Pull gfs2 updates from Andreas Gruenbacher:
      
       - iomap support for buffered writes and for direct I/O
      
       - two patches that reduce the size of struct gfs2_inode
      
       - lots of fixes and cleanups
      
      * tag 'gfs2-4.19.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: (25 commits)
        gfs2: eliminate update_rgrp_lvb_unlinked
        gfs2: Fix gfs2_testbit to use clone bitmaps
        gfs2: Get rid of gfs2_ea_strlen
        gfs2: cleanup: call gfs2_rgrp_ondisk2lvb from gfs2_rgrp_out
        gfs2: Special-case rindex for gfs2_grow
        GFS2: rgrp free blocks used incorrectly
        gfs2: remove redundant variable 'moved'
        gfs2: use iomap_readpage for blocksize == PAGE_SIZE
        gfs2: Use iomap for stuffed direct I/O reads
        gfs2: fallocate_chunk: Always initialize struct iomap
        GFS2: Fix recovery issues for spectators
        fs: gfs2: Adding new return type vm_fault_t
        gfs2: using posix_acl_xattr_size instead of posix_acl_to_xattr
        gfs2: Don't reject a supposedly full bitmap if we have blocks reserved
        gfs2: Eliminate redundant ip->i_rgd
        gfs2: Stop messing with ip->i_rgd in the rlist code
        gfs2: Remove gfs2_write_{begin,end}
        gfs2: iomap direct I/O support
        gfs2: gfs2_extent_length cleanup
        gfs2: iomap buffered write support
        ...
      2b2f2aed
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 72f02ba6
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This is mostly updates to the usual drivers: mpt3sas, lpfc, qla2xxx,
        hisi_sas, smartpqi, megaraid_sas, arcmsr.
      
        In addition, with the continuing absence of Nic we have target updates
        for tcmu and target core (all with reviews and acks).
      
        The biggest observable change is going to be that we're (again) trying
        to switch to mulitqueue as the default (a user can still override the
        setting on the kernel command line).
      
        Other major core stuff is the removal of the remaining Microchannel
        drivers, an update of the internal timers and some reworks of
        completion and result handling"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits)
        scsi: core: use blk_mq_run_hw_queues in scsi_kick_queue
        scsi: ufs: remove unnecessary query(DM) UPIU trace
        scsi: qla2xxx: Fix issue reported by static checker for qla2x00_els_dcmd2_sp_done()
        scsi: aa...
      72f02ba6
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · db06f826
      Linus Torvalds authored
      Pull clk updates from Stephen Boyd:
       "The new and exciting feature this time around is in the clk core.
        We've added duty cycle support to the clk API so that clk signal duty
        cycle ratios can be adjusted while taking into account things like clk
        dividers and clk tree hierarchy. So far only one SoC has implemented
        support for this, but I expect there will be more to come in the
        future.
      
        Outside of the core, we have the usual pile of clk driver updates and
        additions. The Amlogic meson driver got the most lines in the diffstat
        this time around because it added support for a whole bunch of
        hardware and duty cycle configuration. After that the Rockchip PX30,
        Qualcomm SDM845, and Renesas SoC drivers fill in a majority of the
        diff. We're left with the collection of non-critical fixes after that.
        Overall it looks pretty quiet this time.
      
        Core:
         - Clk duty cycle support
         - Proper CLK_SET_RATE_GATE support throughout the tree
      
        New Drivers:
         - Actions Semi Owl series S700 SoC clk driver
         - Qualcomm SDM845 display clock controller
         - i.MX6SX ocram_s clk support
         - Uniphier NAND, USB3 PHY, and SPI clk support
         - Qualcomm RPMh clk driver
         - i.MX7D mailbox clk support
         - Maxim 9485 Programmable Clock Generator
         - expose 32 kHz PLL on PXA SoCs
         - imx6sll GPIO clk gate support
         - Atmel at91 I2S audio clk support
         - SI544/SI514 clk on/off support
         - i.MX6UL GPIO clock gates in CCM CCGR
         - Renesas Crypto Engine clocks on R-Car H3
         - Renesas clk support for the new RZ/N1D SoC
         - Allwinner A64 display engine clock support
         - support for Rockchip's PX30 SoC
         - Amlogic Meson axg PCIe and audio clocks
         - Amlogic Meson GEN CLK on gxbb, gxl and axg
      
        Updates:
         - remove an unused variable from Exynos4412 ISP driver
         - fix a thinko bug in SCMI clk division logic
         - add missing of_node_put()s in some i.MX clk drivers
         - Tegra SDMMC clk jitter improvements with high speed signaling modes
         - SPDX tagging for qcom and cs2000-cp drivers
         - stop leaking con ids in __clk_put()
         - fix a corner case in fixed factor clk probing where node is in DT
           but parent clk is registered much later
         - Marvell Armada 3700 clk_pm_cpu_get_parent() had an invalid return
           value
         - i.MX clk init arrays removed in place of CLK_IS_CRITICAL
         - convert to CLK_IS_CRITICAL for i.MX51/53 driver
         - fix Tegra BPMP driver oops when xlating a NULL clk
         - proper default configuration for vic03 and vde clks on Tegra124
         - mark Tegra memory controller clks as critical
         - fix array bounds clamp in Tegra's emc determine_rate() op
         - Ingenic i2s bit update and allow UDC clk to gate
         - fix name of aspeed SDC clk define to have only one 'CLK'
         - fix i.MX6QDL video clk parent
         - critical clk markings for qcom SDM845
         - fix Stratix10 mpu_free_clk and sdmmc_free_clk parents
         - mark Rockchip's pclk_rkpwm_pmu as critical clock, due to it
           supplying the pwm used to drive the logic supply of the rk3399
           core"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (85 commits)
        clk: rockchip: Add pclk_rkpwm_pmu to PMU critical clocks in rk3399
        clk: cs2000-cp: convert to SPDX identifiers
        clk: scmi: Fix the rounding of clock rate
        clk: qcom: Add display clock controller driver for SDM845
        clk: mvebu: armada-37xx-periph: Remove unused var num_parents
        clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable
        clk: actions: Add S700 SoC clock support
        dt-bindings: clock: Add S700 support for Actions Semi Soc's
        clk: actions: Add missing REGMAP_MMIO dependency
        clk: uniphier: add clock frequency support for SPI
        clk: uniphier: add more USB3 PHY clocks
        clk: uniphier: add NAND 200MHz clock
        clk: tegra: make sdmmc2 and sdmmc4 as sdmmc clocks
        clk: tegra: Add sdmmc mux divider clock
        clk: tegra: Refactor fractional divider calculation
        clk: tegra: Fix includes required by fence_udelay()
        clk: imx6sll: fix missing of_node_put()
        clk: imx6ul: fix missing of_node_put()
        clk: imx: add ocram_s clock for i.mx6sx
        clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent
        ...
      db06f826
    • Linus Torvalds's avatar
      Merge tag 'gpio-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 6de4c691
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.19 kernel cycle.
      
        I don't know if anything in particular stands out. Maybe the Aspeed
        coprocessor thing from Benji: Aspeed is doing baseboard management
        chips (BMC's) for servers etc.
      
        These Aspeed's are ARM processors that exist inside (I guess) Intel
        servers, and they are moving forward to using mainline Linux in those.
        This is one of the pieces of the puzzle to achive that. They are doing
        OpenBMC, it's pretty cool: https://lwn.net/Articles/683320/
      
        Summary:
      
        Core changes:
      
         - Add a new API for explicitly naming GPIO consumers, when needed.
      
         - Don't let userspace set values on input lines. While we do not
           think anyone would do this crazy thing we better plug the hole
           before someone uses it and think it's a nifty feature.
      
         - Avoid calling chip->request() for unused GPIOs.
      
        New drivers/subdriver...
      6de4c691
    • Linus Torvalds's avatar
      Merge tag 'edac_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · c1c2ad82
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
      
       - Add support for systems with PCI segmented buses to sb_edac, by
         Masayoshi Mizuma
      
       - The usual pile of fixes and cleanups
      
      * tag 'edac_for_4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, sb_edac: Add support for systems with segmented PCI buses
        EDAC, thunderx: Remove VLA usage
        EDAC, i7core: Fix memleaks and use-after-free on probe and remove
        EDAC: Fix memleak in module init error path
        EDAC, altera: Fix an error handling path in altr_s10_sdram_probe()
      c1c2ad82
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 99a2c789
      Linus Torvalds authored
      Pull random updates from Ted Ts'o:
       "Some changes to trust cpu-based hwrng (such as RDRAND) for
        initializing hashed pointers and (optionally, controlled by a config
        option) to initialize the CRNG to avoid boot hangs"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: Make crng state queryable
        random: remove preempt disabled region
        random: add a config option to trust the CPU's hwrng
        vsprintf: Add command line option debug_boot_weak_hash
        vsprintf: Use hw RNG for ptr_key
        random: Return nbytes filled from hw RNG
        random: Fix whitespace pre random-bytes work
      99a2c789
    • Linus Torvalds's avatar
      Merge tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux · fa3b39cd
      Linus Torvalds authored
      Pull clang-format updates from Miguel Ojeda:
       "Two improvements for .clang-format:
      
         - Set IndentWrappedFunctionNames false (Jason Gunthorpe)
      
         - Add MAINTAINERS entry (Miguel Ojeda)"
      
      * tag 'clang-format-for-linus-v4.19' of git://github.com/ojeda/linux:
        MAINTAINERS: Add .clang-format entry
        clang-format: Set IndentWrappedFunctionNames false
      fa3b39cd
    • Linus Torvalds's avatar
      Merge tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux · 25ca1d74
      Linus Torvalds authored
      Pull auxdisplay updates from Miguel Ojeda:
       "Two cleanups for char_lcd:
      
         - simplify getting .drvdata (Wolfram Sang)
      
         - delete mdelay in long_sleep (Jia-Ju Bai)"
      
      * tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux:
        auxdisplay: simplify getting .drvdata
        auxdisplay: charlcd: delete mdelay in long_sleep
      25ca1d74
    • Linus Torvalds's avatar
      ALSA: update dell-wmi mic-mute registration to new world order · 70b20dd7
      Linus Torvalds authored
      Commit c647f806 ("ALSA: hda - Allow multiple ADCs for mic mute LED
      controls") changed the return value of the snd_hda_gen_add_micmute_led()
      without actually updating the callers.
      
      Admittedly, almost no callers actually cared about the return value.
      But one call site very much did: the Dell wmi code.  It would see the
      registration return zero, which _used_ to mean "failed" but now means
      "success", and clear the dell_micmute_led_set_func pointer.
      
      End result: the successful registration would end up calling the Dell
      code that thought it had all failed, and call through a NULL pointer.
      
      To make matters worse, it ends up being a tail-call, and with the
      retpoline sequence you don't even see the caller (dell_micmute_update())
      in the stack trace, so the error ended up way less obvious than it
      should have been.
      
      Fixes: c647f806 "ALSA: hda - Allow multiple ADCs for mic mute LED controls"
      Cc: Takashi Iwai <tiwai@suse.de>
      Signed-off-by: Linus Tor...
      70b20dd7
    • Linus Torvalds's avatar
      Merge tag 'media/v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 71f3a82f
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
      
       - new Socionext MN88443x ISDB-S/T demodulator driver: mn88443x
      
       - new sensor drivers: ak7375, ov2680 and rj54n1cb0c
      
       - an old soc-camera sensor driver converted to the V4L2 framework:
         mt9v111
      
       - a new Voice-Coil Motor (VCM) driver: dw9807-vcm
      
       - some cleanups at cx25821, removing legacy unused code
      
       - some improvements at ddbridge driver
      
       - new platform driver: vicodec
      
       - some DVB API cleanups, removing ioctls and compat code for old
         out-of-tree drivers that were never merged upstream
      
       - improvements at DVB core to support frontents that support both
         Satellite and non-satellite delivery systems
      
       - got rid of the unused VIDIOC_RESERVED V4L2 ioctl
      
       - some cleanups/improvements at gl861 ISDB driver
      
       - several improvements on ov772x, ov7670 and ov5640, imx274, ov5645,
         and smiapp sensor drivers
      
       - fixes at em28xx to support dual TS devices
      
       - some cleanups at V4L2/VB2 locking logic
      
       - some API improvements at media controller
      
       - some cec core and drivers improvements
      
       - some uvcvideo improvements
      
       - some improvements at platform drivers: stm32-dcmi, rcar-vin, coda,
         reneseas-ceu, imx, vsp1, venus, camss
      
       - lots of other cleanups and fixes
      
      * tag 'media/v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (406 commits)
        Revert "media: vivid: shut up warnings due to a non-trivial logic"
        siano: get rid of an unused return code for debugfs register
        media: isp: fix a warning about a wrong struct initializer
        media: radio-wl1273: fix return code for the polling routine
        media: s3c-camif: fix return code for the polling routine
        media: saa7164: fix return codes for the polling routine
        media: exynos-gsc: fix return code if mutex was interrupted
        media: mt9v111: Fix build error with no VIDEO_V4L2_SUBDEV_API
        media: xc4000: get rid of uneeded casts
        media: drxj: get rid of uneeded casts
        media: tuner-xc2028: don't use casts for printing sizes
        media: cleanup fall-through comments
        media: vivid: shut up warnings due to a non-trivial logic
        media: rtl28xxu: be sure that it won't go past the array size
        media: mt9v111: avoid going past the buffer
        media: vsp1_dl: add a description for cmdpool field
        media: sta2x11: add a missing parameter description
        media: v4l2-mem2mem: add descriptions to MC fields
        media: i2c: fix warning in Aptina MT9V111
        media: imx: shut up a false positive warning
        ...
      71f3a82f
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm · 54dbe75b
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "This is the main drm pull request for 4.19.
      
        Rob has some new hardware support for new qualcomm hw that I'll send
        along separately. This has the display part of it, the remaining pull
        is for the acceleration engine.
      
        This also contains a wound-wait/wait-die mutex rework, Peter has acked
        it for merging via my tree.
      
        Otherwise mostly the usual level of activity. Summary:
      
        core:
         - Wound-wait/wait-die mutex rework
         - Add writeback connector type
         - Add "content type" property for HDMI
         - Move GEM bo to drm_framebuffer
         - Initial gpu scheduler documentation
         - GPU scheduler fixes for dying processes
         - Console deferred fbcon takeover support
         - Displayport support for CEC tunneling over AUX
      
        panel:
         - otm8009a panel driver fixes
         - Innolux TV123WAM and G070Y2-L01 panel driver
         - Ilitek ILI9881c panel driver
         - Rocktech RK070ER9427 LCD
         - EDT ETM0700G0EDH6 and ...
      54dbe75b
  2. 15 Aug, 2018 22 commits
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · dafa5f65
      Linus Torvalds authored
      Pull crypto updates from Herbert Xu:
       "API:
         - Fix dcache flushing crash in skcipher.
         - Add hash finup self-tests.
         - Reschedule during speed tests.
      
        Algorithms:
         - Remove insecure vmac and replace it with vmac64.
         - Add public key verification for DH/ECDH.
      
        Drivers:
         - Decrease priority of sha-mb on x86.
         - Improve NEON latency/throughput on ARM64.
         - Add md5/sha384/sha512/des/3des to inside-secure.
         - Support eip197d in inside-secure.
         - Only register algorithms supported by the host in virtio.
         - Add cts and remove incompatible cts1 from ccree.
         - Add hisilicon SEC security accelerator driver.
         - Replace msm hwrng driver with qcom pseudo rng driver.
      
        Misc:
         - Centralize CRC polynomials"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (121 commits)
        crypto: arm64/ghash-ce - implement 4-way aggregation
        crypto: arm64/ghash-ce - replace NEON yield ch...
      dafa5f65
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 9a76aba0
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Highlights:
      
         - Gustavo A. R. Silva keeps working on the implicit switch fallthru
           changes.
      
         - Support 802.11ax High-Efficiency wireless in cfg80211 et al, From
           Luca Coelho.
      
         - Re-enable ASPM in r8169, from Kai-Heng Feng.
      
         - Add virtual XFRM interfaces, which avoids all of the limitations of
           existing IPSEC tunnels. From Steffen Klassert.
      
         - Convert GRO over to use a hash table, so that when we have many
           flows active we don't traverse a long list during accumluation.
      
         - Many new self tests for routing, TC, tunnels, etc. Too many
           contributors to mention them all, but I'm really happy to keep
           seeing this stuff.
      
         - Hardware timestamping support for dpaa_eth/fsl-fman from Yangbo Lu.
      
         - Lots of cleanups and fixes in L2TP code from Guillaume Nault.
      
         - Add IPSEC offload support to netdevsim, from Shannon Nelson.
      
         - Add support for slotting with n...
      9a76aba0
    • Guenter Roeck's avatar
      x86: i8259: Add missing include file · 0a957467
      Guenter Roeck authored
      
      
      i8259.h uses inb/outb and thus needs to include asm/io.h to avoid the
      following build error, as seen with x86_64:defconfig and CONFIG_SMP=n.
      
        In file included from drivers/rtc/rtc-cmos.c:45:0:
        arch/x86/include/asm/i8259.h: In function 'inb_pic':
        arch/x86/include/asm/i8259.h:32:24: error:
      	implicit declaration of function 'inb'
      
        arch/x86/include/asm/i8259.h: In function 'outb_pic':
        arch/x86/include/asm/i8259.h:45:2: error:
      	implicit declaration of function 'outb'
      Reported-by: default avatarSebastian Gottschall <s.gottschall@dd-wrt.com>
      Suggested-by: default avatarSebastian Gottschall <s.gottschall@dd-wrt.com>
      Fixes: 447ae316
      
       ("x86: Don't include linux/irq.h from asm/hardirq.h")
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0a957467
    • Linus Torvalds's avatar
      Merge tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · fa1b5d09
      Linus Torvalds authored
      Pull Kconfig consolidation from Masahiro Yamada:
       "Consolidation of Kconfig files by Christoph Hellwig.
      
        Move the source statements of arch-independent Kconfig files instead
        of duplicating the includes in every arch/$(SRCARCH)/Kconfig"
      
      * tag 'kconfig-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kconfig: add a Memory Management options" menu
        kconfig: move the "Executable file formats" menu to fs/Kconfig.binfmt
        kconfig: use a menu in arch/Kconfig to reduce clutter
        kconfig: include kernel/Kconfig.preempt from init/Kconfig
        Kconfig: consolidate the "Kernel hacking" menu
        kconfig: include common Kconfig files from top-level Kconfig
        kconfig: remove duplicate SWAP symbol defintions
        um: create a proper drivers Kconfig
        um: cleanup Kconfig files
        um: stop abusing KBUILD_KCONFIG
      fa1b5d09
    • Linus Torvalds's avatar
      Merge tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 01f0e5cd
      Linus Torvalds authored
      Pull Kconfig updates from Masahiro Yamada:
      
       - show clearer error messages where pkg-config is needed, but not
         installed
      
       - rename SYMBOL_AUTO to SYMBOL_NO_WRITE to reflect its semantics
      
       - create all necessary directories by Kconfig tool itself instead of
         Makefile
      
       - update the .config unconditionally when syncconfig is invoked
      
       - use 'include' directive instead of '-include' where
         include/config/{auto,tristate}.conf is mandatory
      
       - do not try to update the .config when running install targets
      
       - add .DELETE_ON_ERROR to delete partially updated files
      
       - misc cleanups and fixes
      
      * tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kconfig: remove P_ENV property type
        kconfig: remove unused sym_get_env_prop() function
        kconfig: fix the rule of mainmenu_stmt symbol
        init/Kconfig: Use short unix-style option instead of --longname
        Kbuild: Makefile.m...
      01f0e5cd
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · e026bcc5
      Linus Torvalds authored
      Pull Kbuild updates from Masahiro Yamada:
      
       - verify depmod is installed before modules_install
      
       - support build salt in case build ids must be unique between builds
      
       - allow users to specify additional host compiler flags via HOST*FLAGS,
         and rename internal variables to KBUILD_HOST*FLAGS
      
       - update buildtar script to drop vax support, add arm64 support
      
       - update builddeb script for better debarch support
      
       - document the pit-fall of if_changed usage
      
       - fix parallel build of UML with O= option
      
       - make 'samples' target depend on headers_install to fix build errors
      
       - remove deprecated host-progs variable
      
       - add a new coccinelle script for refcount_t vs atomic_t check
      
       - improve double-test coccinelle script
      
       - misc cleanups and fixes
      
      * tag 'kbuild-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (41 commits)
        coccicheck: return proper error code on fail
        Coccinelle:...
      e026bcc5
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugin-cleanup-v4.19-rc1' of... · 7c7b562c
      Linus Torvalds authored
      Merge tag 'gcc-plugin-cleanup-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
      
      Pull gcc plugin cleanups from Kees Cook:
      
       - Kconfig and Makefile clean-ups (Masahiro Yamada, Kees Cook)
      
       - gcc-common.h definition clean-ups (Alexander Popov)
      
      * tag 'gcc-plugin-cleanup-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: Clean up the cgraph_create_edge* macros
        gcc-plugins: Regularize Makefile.gcc-plugins
        gcc-plugins: split out Kconfig entries to scripts/gcc-plugins/Kconfig
        gcc-plugins: remove unused GCC_PLUGIN_SUBDIR
      7c7b562c
    • Linus Torvalds's avatar
      Merge tag 'printk-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk · b125d903
      Linus Torvalds authored
      Pull printk updates from Petr Mladek:
      
       - Different vendors have a different expectation about a console
         quietness. Make it configurable to reduce bike-shedding about the
         upstream default
      
       - Decide about the message visibility when the message is stored. It
         avoids races caused by a delayed console handling
      
       - Always store printk() messages into the per-CPU buffers again in NMI.
         The only exception is when flushing trace log in panic(). There the
         risk of loosing messages is worth an eventual reordering
      
       - Handle invalid %pO printf modifiers correctly
      
       - Better handle %p printf modifier tests before crng is initialized
      
       - Some clean up
      
      * tag 'printk-for-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
        lib/vsprintf: Do not handle %pO[^F] as %px
        printk: Fix warning about unused suppress_message_printing
        printk/nmi: Prevent deadlock when accessing the main log buffer in NMI
        printk: Create helper function to queue deferred console handling
        printk: Split the code for storing a message into the log buffer
        printk: Clean up syslog_print_all()
        printk: Remove unnecessary kmalloc() from syslog during clear
        printk: Make CONSOLE_LOGLEVEL_QUIET configurable
        printk: make sure to print log on console.
        lib/test_printf.c: accept "ptrval" as valid result for plain 'p' tests
      b125d903
    • Linus Torvalds's avatar
      Merge tag 'audit-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · 8c326850
      Linus Torvalds authored
      Pull audit patches from Paul Moore:
       "Twelve audit patches for v4.19 and they run the full gamut from fixes
        to features.
      
        Notable changes include the ability to use the "exe" audit filter
        field in a wider variety of filter types, a fix for our comparison of
        GID/EGID in audit filter rules, better association of related audit
        records (connecting related audit records together into one audit
        event), and a fix for a potential use-after-free in audit_add_watch().
      
        All the patches pass the audit-testsuite and merge cleanly on your
        current master branch"
      
      * tag 'audit-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: fix use-after-free in audit_add_watch
        audit: use ktime_get_coarse_real_ts64() for timestamps
        audit: use ktime_get_coarse_ts64() for time access
        audit: simplify audit_enabled check in audit_watch_log_rule_change()
        audit: check audit_enabled in audit_...
      8c326850
    • Linus Torvalds's avatar
      Merge tag 'selinux-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux · 6f7dac11
      Linus Torvalds authored
      Pull SELinux updates from Paul Moore:
       "There are 16 patches in here but really only one that is of any
        significance. That one patch is by nixiaoming and fixes a few places
        where we were not properly cleaning up dentry and inode objects in the
        selinuxfs error handling code. The rest are either printk->pr_*
        conversions, constification tweaks, and a minor tweak to MAINTAINERS.
      
        Everything passes the selinux-testsuite and looks to merge cleanly
        against your master branch"
      
      * tag 'selinux-pr-20180814' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
        selinux: cleanup dentry and inodes on error in selinuxfs
        selinux: constify write_op[]
        selinux: Cleanup printk logging in netnode
        selinux: Cleanup printk logging in avc
        selinux: Cleanup printk logging in netif
        selinux: Cleanup printk logging in netport
        selinux: Cleanup printk logging in sidtab
        selinux: Cleanup printk logging in netlink
        selinux: Cleanup printk logging in selinuxfs
        selinux: Cleanup printk logging in services
        selinux: Cleanup printk logging in avtab
        selinux: Cleanup printk logging in hooks
        selinux: Cleanup printk logging in policydb
        selinux: Cleanup printk logging in ebitmap
        selinux: Cleanup printk logging in conditional
        MAINTAINERS: update the LSM and SELinux subsystems
      6f7dac11
    • Linus Torvalds's avatar
      Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 92d4a036
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
      
       - kstrdup() return value fix from Eric Biggers
      
       - Add new security_load_data hook to differentiate security checking of
         kernel-loaded binaries in the case of there being no associated file
         descriptor, from Mimi Zohar.
      
       - Add ability to IMA to specify a policy at build-time, rather than
         just via command line params or by loading a custom policy, from
         Mimi.
      
       - Allow IMA and LSMs to prevent sysfs firmware load fallback (e.g. if
         using signed firmware), from Mimi.
      
       - Allow IMA to deny loading of kexec kernel images, as they cannot be
         measured by IMA, from Mimi.
      
      * 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        security: check for kstrdup() failure in lsm_append()
        security: export security_kernel_load_data function
        ima: based on policy warn about loading firmware (pre-allocated buffer)
        module: replace the existing LSM hook in init_module
        ima: add build time policy
        ima: based on policy require signed firmware (sysfs fallback)
        firmware: add call to LSM hook before firmware sysfs fallback
        ima: based on policy require signed kexec kernel images
        kexec: add call to LSM hook in original kexec_load syscall
        security: define new LSM hook named security_kernel_load_data
        MAINTAINERS: remove the outdated "LINUX SECURITY MODULE (LSM) FRAMEWORK" entry
      92d4a036
    • Guenter Roeck's avatar
      x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled · 1eb46908
      Guenter Roeck authored
      allmodconfig+CONFIG_INTEL_KVM=n results in the following build error.
      
        ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined!
      
      Fixes: 5b76a3cf
      
       ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry")
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Cc: Meelis Roos <mroos@linux.ee>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1eb46908
    • Linus Torvalds's avatar
      Merge tag 'pstore-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 3529b970
      Linus Torvalds authored
      Pull pstore update from Kees Cook:
       "This cycle has been very quiet for pstore: the only change is adding
        awareness of the zstd compression method"
      
      * tag 'pstore-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        pstore: add zstd compression support
      3529b970
    • Linus Torvalds's avatar
      Merge tag 'hardened-usercopy-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 8c479c2c
      Linus Torvalds authored
      Pull hardened usercopy updates from Kees Cook:
       "This cleans up a minor Kconfig issue and adds a kernel boot option for
        disabling hardened usercopy for distro users that may have corner-case
        performance issues (e.g. high bandwidth small-packet UDP traffic).
      
        Summary:
      
         - drop unneeded Kconfig "select BUG" (Kamal Mostafa)
      
         - add "hardened_usercopy=off" rare performance needs (Chris von
           Recklinghausen)"
      
      * tag 'hardened-usercopy-v4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        usercopy: Allow boot cmdline disabling of hardening
        usercopy: Do not select BUG with HARDENED_USERCOPY
      8c479c2c
    • Stephen Boyd's avatar
      Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845',... · ac7da1b7
      Stephen Boyd authored
      Merge branches 'clk-actions-s700', 'clk-exynos-unused', 'clk-qcom-dispcc-845', 'clk-scmi-round' and 'clk-cs2000-spdx' into clk-next
      
      * clk-actions-s700:
        :  - Actions Semi Owl series S700 SoC clk driver
        clk: actions: Add S700 SoC clock support
        dt-bindings: clock: Add S700 support for Actions Semi Soc's
        clk: actions: Add missing REGMAP_MMIO dependency
      
      * clk-exynos-unused:
        :  - Remove an unused variable from Exynos4412 ISP driver
        clk: samsung: Remove unused mout_user_aclk400_mcuisp_p4x12 variable
      
      * clk-qcom-dispcc-845:
        :  - Qualcomm SDM845 display clock controller
        clk: qcom: Add display clock controller driver for SDM845
        dt-bindings: clock: Introduce QCOM Display clock bindings
        clk: qcom: Move frequency table macro to common file
      
      * clk-scmi-round:
        :  - Fix a thinko bug in SCMI clk division logic
        clk: scmi: Fix the rounding of clock rate
      
      * clk-cs2000-spdx:
        clk: cs2000-cp: convert to SPDX identifiers
      ac7da1b7
    • Stephen Boyd's avatar
      Merge branches 'clk-imx6-ocram', 'clk-missing-put', 'clk-tegra-sdmmc-jitter',... · 032405a7
      Stephen Boyd authored
      Merge branches 'clk-imx6-ocram', 'clk-missing-put', 'clk-tegra-sdmmc-jitter', 'clk-allwinner' and 'clk-uniphier' into clk-next
      
      * clk-imx6-ocram:
        :  - i.MX6SX ocram_s clk support
        clk: imx: add ocram_s clock for i.mx6sx
      
      * clk-missing-put:
        :  - Add missing of_node_put()s in some i.MX clk drivers
        clk: imx6sll: fix missing of_node_put()
        clk: imx6ul: fix missing of_node_put()
      
      * clk-tegra-sdmmc-jitter:
        :  - Tegra SDMMC clk jitter improvements with high speed signaling modes
        clk: tegra: make sdmmc2 and sdmmc4 as sdmmc clocks
        clk: tegra: Add sdmmc mux divider clock
        clk: tegra: Refactor fractional divider calculation
        clk: tegra: Fix includes required by fence_udelay()
      
      * clk-allwinner:
        clk: sunxi-ng: add A64 compatible string
        dt-bindings: add compatible string for the A64 DE2 CCU
        clk: sunxi-ng: r40: Export video PLLs
        clk: sunxi-ng: r40: Allow setting parent rate to display related clocks
        clk: sunxi-ng: r40: Add minimal rate for video PLLs
      
      * clk-uniphier:
        :  - Uniphier NAND, USB3 PHY, and SPI clk support
        clk: uniphier: add clock frequency support for SPI
        clk: uniphier: add more USB3 PHY clocks
        clk: uniphier: add NAND 200MHz clock
      032405a7
    • Stephen Boyd's avatar
      Merge branches 'clk-qcom-rpmh', 'clk-qcom-spdx', 'clk-con-id-leak',... · 4a18ef5b
      Stephen Boyd authored
      Merge branches 'clk-qcom-rpmh', 'clk-qcom-spdx', 'clk-con-id-leak', 'clk-fixed-factor-populated' and 'clk-mvebu-periph-parent' into clk-next
      
      * clk-qcom-rpmh:
        :  - Qualcomm RPMh clk driver
        clk: qcom: clk-rpmh: Add QCOM RPMh clock driver
      
      * clk-qcom-spdx:
        :  - SPDX tagging for qcom
        clk: qcom: Update SPDX headers for common files
      
      * clk-con-id-leak:
        :  - Stop leaking con ids in __clk_put()
        clk: core: Potentially free connection id
      
      * clk-fixed-factor-populated:
        :  - Fix a corner case in fixed factor clk probing where node is in DT but
        :    parent clk is registered much later
        clk: clk-fixed-factor: Clear OF_POPULATED flag in case of failure
      
      * clk-mvebu-periph-parent:
        :  - Marvell Armada 3700 clk_pm_cpu_get_parent() had an invalid return value
        clk: mvebu: armada-37xx-periph: Remove unused var num_parents
        clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent
      4a18ef5b
    • Stephen Boyd's avatar
      Merge branches 'clk-mvebu-spdx', 'clk-meson', 'clk-imx7d-mu',... · d16adaf0
      Stephen Boyd authored
      Merge branches 'clk-mvebu-spdx', 'clk-meson', 'clk-imx7d-mu', 'clk-imx-init-array-cleanup' and 'clk-rockchip' into clk-next
      
      * clk-mvebu-spdx:
        clk: mvebu: armada-37xx-periph: switch to SPDX license identifier
      
      * clk-meson:
        clk: meson: add gen_clk
        clk: meson: gxbb: remove HHI_GEN_CLK_CTNL duplicate definition
        clk: meson-axg: add clocks required by pcie driver
        clk: meson: remove unused clk-audio-divider driver
        clk: meson: stop rate propagation for audio clocks
        clk: meson: axg: add the audio clock controller driver
        clk: meson: add axg audio sclk divider driver
        clk: meson: add triple phase clock driver
        clk: meson: add clk-phase clock driver
        clk: meson: clean-up meson clock configuration
        clk: meson: remove obsolete register access
        clk: meson: expose GEN_CLK clkid
        clk: meson-axg: add pcie and mipi clock bindings
        dt-bindings: clock: add meson axg audio clock controller bindings
        clk: meson: audio-divider is one based
        clk: meson-gxbb: set fclk_div2 as CLK_IS_CRITICAL
      
      * clk-imx7d-mu:
        :  - i.MX7D mailbox clk support
        clk: imx7d: add IMX7D_MU_ROOT_CLK
      
      * clk-imx-init-array-cleanup:
        :  - i.MX clk init arrays removed in place of CLK_IS_CRITICAL
        clk: imx6sx: remove clks_init_on array
        clk: imx6sl: remove clks_init_on array
        clk: imx6q: remove clks_init_on array
      
      * clk-rockchip:
        clk: rockchip: Add pclk_rkpwm_pmu to PMU critical clocks in rk3399
        clk: rockchip: fix clk_i2sout parent selection bits on rk3399
        clk: rockchip: add clock controller for px30
        clk: rockchip: add support for half divider
        dt-bindings: add bindings for px30 clock controller
        clk: rockchip: add dt-binding header for px30
      d16adaf0
    • Stephen Boyd's avatar
      Merge branches 'clk-imx-critical', 'clk-tegra-bpmp', 'clk-tegra-124',... · 13905463
      Stephen Boyd authored
      Merge branches 'clk-imx-critical', 'clk-tegra-bpmp', 'clk-tegra-124', 'clk-tegra-critical' and 'clk-tegra-emc-oob' into clk-next
      
      * clk-imx-critical:
        :  - Convert to CLK_IS_CRITICAL for i.MX51/53 driver
        clk: imx51-imx53: Include sizes.h to silence compile errors
        clk: imx51-imx53: Annotate critical clocks as CLK_IS_CRITICAL
      
      * clk-tegra-bpmp:
        :  - Fix Tegra BPMP driver oops when some xlating a NULL clk
        clk: tegra: bpmp: Don't crash when a clock fails to register
      
      * clk-tegra-124:
        :  - Proper default configuration for vic03 and vde clks on Tegra124
        clk: tegra: Make vde a child of pll_c3
        clk: tegra: Make vic03 a child of pll_c3
      
      * clk-tegra-critical:
        :  - Mark Tegra memory controller clks as critical
        clk: tegra: Mark Memory Controller clock as critical
      
      * clk-tegra-emc-oob:
        :  - Fix array bounds clamp in Tegra's emc determine_rate() op
        clk: tegra: emc: Avoid out-of-bounds bug
      13905463
    • Stephen Boyd's avatar
      Merge branches 'clk-ingenic-fixes', 'clk-max9485', 'clk-pxa-32k-pll',... · ea4f7872
      Stephen Boyd authored
      Merge branches 'clk-ingenic-fixes', 'clk-max9485', 'clk-pxa-32k-pll', 'clk-aspeed' and 'clk-imx6sll-gpio' into clk-next
      
      * clk-ingenic-fixes:
        :  - Ingenic i2s bit update and allow UDC clk to gate
        clk: ingenic: Add missing flag for UDC clock
        clk: ingenic: Fix incorrect data for the i2s clock
      
      * clk-max9485:
        :  - Maxim 9485 Programmable Clock Generator
        clk: Add driver for MAX9485
        dts: clk: add devicetree bindings for MAX9485
      
      * clk-pxa-32k-pll:
        :  - Expose 32 kHz PLL on PXA SoCs
        clk: pxa: export 32kHz PLL
      
      * clk-aspeed:
        :  - Fix name of aspeed SDC clk define to have only one 'CLK'
        clk: aspeed: Fix SDCLK name
      
      * clk-imx6sll-gpio:
        :  - imx6sll GPIO clk gate support
        clk: imx6sll: add GPIO LPCGs
      ea4f7872
    • Stephen Boyd's avatar
      Merge branches 'clk-imx6-video-parent', 'clk-qcom-sdm845-criticals',... · b183c688
      Stephen Boyd authored
      Merge branches 'clk-imx6-video-parent', 'clk-qcom-sdm845-criticals', 'clk-renesas', 'clk-stratix10-fixes' and 'clk-atmel-i2s' into clk-next
      
      * clk-imx6-video-parent:
        :  - Fix i.MX6QDL video clk parent
        clk: imx6: fix video_27m parent for IMX6QDL_CLK_CKO1_SEL
      
      * clk-qcom-sdm845-criticals:
        :  - critical clk markings for qcom SDM845
        clk: qcom: Enable clocks which needs to be always on for SDM845
      
      * clk-renesas:
        clk: renesas: Renesas R9A06G032 clock driver
        dt-bindings: clock: renesas,r9a06g032-sysctrl: documentation
        dt-bindings: clock: Add the r9a06g032-sysctrl.h file
        clk: renesas: r8a7795: Add CCREE clock
        clk: renesas: r8a7795: Add CR clock
      
      * clk-stratix10-fixes:
        :  - Fix Stratix10 mpu_free_clk and sdmmc_free_clk parents
        clk: socfpga: stratix10: fix the sdmmc_free_clk mux
        clk: socfpga: stratix10: fix the parents of mpu_free_clk
      
      * clk-atmel-i2s:
        :  - Atmel at91 I2S audio clk support
        clk: at91: add I2S clock mux driver
        dt-bindings: clk: at91: add an I2S mux clock
      b183c688
    • Stephen Boyd's avatar
      Merge branches 'clk-qcom-set-rate-gate', 'clk-core-set-rate-gate',... · 5ef7748b
      Stephen Boyd authored
      Merge branches 'clk-qcom-set-rate-gate', 'clk-core-set-rate-gate', 'clk-core-duty-cycle', 'clk-si-prepare' and 'clk-imx-gpio-gates' into clk-next
      
      * clk-qcom-set-rate-gate:
        clk: qcom: drop CLK_SET_RATE_GATE from sdc clocks
      
      * clk-core-set-rate-gate:
        clk: fix CLK_SET_RATE_GATE with clock rate protection
      
      * clk-core-duty-cycle:
        clk: add duty cycle support
      
      * clk-si-prepare:
        :  - SI544/SI514 clk on/off support
        clk-si514, clk-si544: Implement prepare/unprepare/is_prepared operations
      
      * clk-imx-gpio-gates:
        :  - i.MX6UL GPIO clock gates in CCM CCGR
        clk: imx6ul: remove clks_init_on array
        clk: imx6ul: add GPIO clock gates
        dt-bindings: clock: imx6ul: Do not change the clock definition order
      5ef7748b
  3. 14 Aug, 2018 3 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 31130a16
      Linus Torvalds authored
      Pull xen updates from Juergen Gross:
      
       - add dma-buf functionality to Xen grant table handling
      
       - fix for booting the kernel as Xen PVH dom0
      
       - fix for booting the kernel as a Xen PV guest with
         CONFIG_DEBUG_VIRTUAL enabled
      
       - other minor performance and style fixes
      
      * tag 'for-linus-4.19-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/balloon: fix balloon initialization for PVH Dom0
        xen: don't use privcmd_call() from xen_mc_flush()
        xen/pv: Call get_cpu_address_sizes to set x86_virt/phys_bits
        xen/biomerge: Use true and false for boolean values
        xen/gntdev: don't dereference a null gntdev_dmabuf on allocation failure
        xen/spinlock: Don't use pvqspinlock if only 1 vCPU
        xen/gntdev: Implement dma-buf import functionality
        xen/gntdev: Implement dma-buf export functionality
        xen/gntdev: Add initial support for dma-buf UAPI
        xen/gntdev: Make private routines/structures accessible
        xen/gntdev: Allow mappings for DMA buffers
        xen/grant-table: Allow allocating buffers suitable for DMA
        xen/balloon: Share common memory reservation routines
        xen/grant-table: Make set/clear page private code shared
      31130a16
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 1202f4fd
      Linus Torvalds authored
      Pull arm64 updates from Will Deacon:
       "A bunch of good stuff in here. Worth noting is that we've pulled in
        the x86/mm branch from -tip so that we can make use of the core
        ioremap changes which allow us to put down huge mappings in the
        vmalloc area without screwing up the TLB. Much of the positive
        diffstat is because of the rseq selftest for arm64.
      
        Summary:
      
         - Wire up support for qspinlock, replacing our trusty ticket lock
           code
      
         - Add an IPI to flush_icache_range() to ensure that stale
           instructions fetched into the pipeline are discarded along with the
           I-cache lines
      
         - Support for the GCC "stackleak" plugin
      
         - Support for restartable sequences, plus an arm64 port for the
           selftest
      
         - Kexec/kdump support on systems booting with ACPI
      
         - Rewrite of our syscall entry code in C, which allows us to zero the
           GPRs on entry from userspace
      
         - Support for chained PMU counters...
      1202f4fd
    • Vlastimil Babka's avatar
      x86/smp: fix non-SMP broken build due to redefinition of apic_id_is_primary_thread · d0055f35
      Vlastimil Babka authored
      
      
      The function has an inline "return false;" definition with CONFIG_SMP=n
      but the "real" definition is also visible leading to "redefinition of
      ‘apic_id_is_primary_thread’" compiler error.
      
      Guard it with #ifdef CONFIG_SMP
      Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
      Fixes: 6a4d2657
      
       ("x86/smp: Provide topology_is_primary_thread()")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d0055f35