From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,LOCALPART_IN_SUBJECT, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D147CC282CB for ; Tue, 5 Feb 2019 06:12:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7383020821 for ; Tue, 5 Feb 2019 06:12:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ODhdFzsG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727730AbfBEGMi (ORCPT ); Tue, 5 Feb 2019 01:12:38 -0500 Received: from ozlabs.org ([203.11.71.1]:54711 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726031AbfBEGMh (ORCPT ); Tue, 5 Feb 2019 01:12:37 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43tvPT10cPz9sMp; Tue, 5 Feb 2019 17:12:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1549347149; bh=gB53hU/a9bPP4hJhqABeJiHrlqjwcSBPmrmmOME55v4=; h=Date:From:To:Cc:Subject:From; b=ODhdFzsGOgXukvoqF8Bcva4Gur5K0PufqdLRADU6XCwng81fL2grOg7e7DuUAN0Ia d8RwX+nxdqSGKmzaFrw2Uif7HosUu6mGx2slfK0Cp/A8+Cz3bBipjziDfgTjMURp5v /6cYPr7nckJGToZIJvLgl3VKr5I/0Riq/5KvsUoA7zC+DMVXOPhkaTN3zwfVmlITZl +Lu1GTG5AFSQGFvoldpw4ifPv3+B1E1K7pDF0KM1qvNXk4vMxTp2f34AZ4hLPladVd Jc/52zWDT70Xh0mTmSwush5YTyrXuWJBu4VCjuzlePtOOoimD2hxY4wQ6JT8RZmYuY c7zNnZF68eeHA== Date: Tue, 5 Feb 2019 17:12:28 +1100 From: Stephen Rothwell To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Feb 5 Message-ID: <20190205171228.41a9f771@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/rf=EaOEAKZ2vZNBGPkyzu66"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/rf=EaOEAKZ2vZNBGPkyzu66 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Changes since 20190204: The vfs tree lost its build failure. The net-next tree lost its build failure. The drm-tegra tree lost its build failure. The akpm-current tree gained a conflict against the net tree. Non-merge commits (relative to Linus' tree): 5606 6290 files changed, 231350 insertions(+), 149552 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 296 trees (counting Linus' and 69 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. --=20 Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (8834f5600cf3 Linux 5.0-rc5) Merging fixes/master (d8d0c3a7f601 x86/syscalls: Mark expected switch fall-= throughs) Merging kbuild-current/fixes (6db2983cd806 kallsyms: Handle too long symbol= s in kallsyms.c) Merging arc-current/for-curr (c4a8fb41246c ARCv2: lib: memcpy: fix doing pr= efetchw outside of buffer) Merging arm-current/fixes (1b5ba3507842 ARM: 8824/1: fix a migrating irq bu= g when hotplug cpu) Merging arm64-fixes/for-next/fixes (f7daa9c8fd19 arm64: hibernate: Clean th= e __hyp_text to PoC after resume) Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related cra= shes) Merging powerpc-fixes/fixes (7bea7ac0ca01 powerpc/syscalls: Fix syscall tra= cing) Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel= .org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (0429f237ce08 Merge branch 's390-qeth-fixes') Merging bpf/master (0429f237ce08 Merge branch 's390-qeth-fixes') Merging ipsec/master (09db51241118 esp: Skip TX bytes accounting when sendi= ng from a request socket) Merging netfilter/master (f6ac85858976 netfilter: nf_tables: unbind set in = rule from commit path) Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function m= ust not have side effects) Merging wireless-drivers/master (8c22d81d5535 MAINTAINERS: add entry for re= dpine wireless driver) Merging mac80211/master (e005bd7ddea0 cfg80211: call disconnect_wk when AP = stops) Merging rdma-fixes/for-rc (7b21b69ab203 IB/uverbs: Fix OOPs in uverbs_user_= mmap_disassociate) Merging sound-current/for-linus (305a0ade1809 ALSA: hda - Serialize codec r= egistrations) Merging sound-asoc-fixes/for-linus (72a52a2e9596 Merge branch 'asoc-5.0' in= to asoc-linus) Merging regmap-fixes/for-linus (f17b5f06cb92 Linux 5.0-rc4) Merging regulator-fixes/for-linus (3a3a75eaefb1 Merge branch 'regulator-5.0= ' into regulator-linus) Merging spi-fixes/for-linus (2186097e00f9 Merge branch 'spi-5.0' into spi-l= inus) Merging pci-current/for-linus (f14bcc0add3a Revert "PCI: armada8k: Add supp= ort for gpio controlled reset signal") Merging driver-core.current/driver-core-linus (36991ca68db9 blk-mq: protect= debugfs_create_files() from failures) Merging tty.current/tty-linus (fedb5760648a serial: fix race between flush_= to_ldisc and tty_open) Merging usb.current/usb-linus (a07ddce4df80 usb: typec: tcpm: Correct the P= PS out_volt calculation) Merging usb-gadget-fixes/fixes (a53469a68eb8 usb: phy: am335x: fix race con= dition in _probe) Merging usb-serial-fixes/usb-linus (f17b5f06cb92 Linux 5.0-rc4) Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: f= ix static checker warning for NULL pointer) Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to = match the DT binding) Merging staging.current/staging-linus (6d923f8fe821 Merge tag 'iio-fixes-5.= 0a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging= -linus) Merging char-misc.current/char-misc-linus (4bf13fdbc356 mic: vop: Fix crash= on remove) Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt-fixes/fixes (f17b5f06cb92 Linux 5.0-rc4) Merging input-current/for-linus (94803aef3533 Input: pwm-vibra - stop regul= ator after disabling pwm, not before) Merging crypto-current/master (356690d029e1 crypto: cavium/nitrox - Invoke = callback after DMA unmap) Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name com= parisons) Merging vfio-fixes/for-linus (9a71ac7e15a7 vfio-pci/nvlink2: Fix ancient gc= c warnings) Merging kselftest-fixes/fixes (7d4e591bc051 selftests: timers: use LDLIBS i= nstead of LDFLAGS) Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wr= ong module .text address) Merging slave-dma-fixes/fixes (6454368a804c dmaengine: dmatest: Abort test = in case of mapping error) Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) Merging mtd-fixes/master (455e7b387b44 mtd: rawnand: fix kernel-doc warning= s) Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use dev= m_kzalloc for private data") Merging v4l-dvb-fixes/fixes (240809ef6630 media: vim2m: only cancel work if= it is for right context) Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writi= ng bits as 0) Merging mips-fixes/mips-fixes (67fc5dc8a541 MIPS: VDSO: Include $(ccflags-v= dso) in o32,n32 .lds builds) Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1) Merging omap-fixes/fixes (dc30e7039137 ARM: OMAP2+: Variable "reg" in funct= ion omap4_dsi_mux_pads() could be uninitialized) Merging kvm-fixes/master (826c1362e79a x86/kvm/nVMX: don't skip emulated in= struction twice when vmptr address is not backed) Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unava= ilable in ucontrol VMs) Merging hwmon-fixes/hwmon (2a2ec4aa0577 hwmon: (nct6775) Fix fan6 detection= for NCT6793D) Merging nvdimm-fixes/libnvdimm-fixes (11189c1089da acpi/nfit: Fix command-s= upported detection) Merging btrfs-fixes/next-fixes (8834f5600cf3 Linux 5.0-rc5) Merging vfs-fixes/fixes (fbdb44013202 copy_mount_string: Limit string lengt= h to PATH_MAX) Merging dma-mapping-fixes/for-linus (60d8cd572f65 arm64/xen: fix xen-swiotl= b cache flushing) Merging i3c-fixes/master (f36c1f9a8dfd i3c: master: dw: fix deadlock) Merging drivers-x86-fixes/fixes (6a730fcb9cb4 Documentation/ABI: Correct ml= xreg-io KernelVersion for 5.0) Merging samsung-krzk-fixes/fixes (bfeffd155283 Linux 5.0-rc1) Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1) Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding= _check target for in tree builds) Merging scsi-fixes/fixes (8437fcf14dee scsi: 53c700: pass correct "dev" to = dma_alloc_attrs()) Merging drm-fixes/drm-fixes (2072ce03637f Merge branch 'drm-fixes-5.0' of g= it://people.freedesktop.org/~agd5f/linux into drm-fixes) Merging drm-intel-fixes/for-linux-next-fixes (f17b5f06cb92 Linux 5.0-rc4) Merging mmc-fixes/fixes (3751e008da0d mmc: mediatek: fix incorrect register= setting of hs400_cmd_int_delay) Merging rtc-fixes/rtc-fixes (bfeffd155283 Linux 5.0-rc1) Merging gnss-fixes/gnss-linus (bfeffd155283 Linux 5.0-rc1) Merging hyperv-fixes/hyperv-fixes (52d3b4949192 hv_netvsc: fix typos in cod= e comments) Merging drm-misc-fixes/for-linux-next-fixes (b14e945bda8a drm/sun4i: tcon: = Prepare and enable TCON channel 0 clock at init) Merging kbuild/for-next (9b676182bf01 Merge branch 'kconfig' into for-next) Merging compiler-attributes/compiler-attributes (058b472f2035 lib/crc32.c: = mark crc32_le_base/__crc32c_le_base aliases as __pure) Merging leaks/leaks-next (8fe28cb58bcb Linux 4.20) Merging dma-mapping/for-next (0a3b192c26da dma-debug: add dumping facility = via debugfs) Merging asm-generic/master (2b3c5a99d5f3 sh: generate uapi header and sysca= ll table header files) Merging arc/for-next (529c44807715 ARCv2: Add explcit unaligned access supp= ort (and ability to disable too)) Merging arm/for-next (c43658cedf4d Merge branches 'fixes', 'misc' and 'smp-= hotplug' into for-next) Merging arm64/for-next/core (67f52a9540e0 efi/arm: Don't expect a return va= lue of ptdump_debugfs_register) Merging arm-perf/for-next/perf (cf2d65ec1d21 perf: xgene: Remove set but no= t used variable 'config') Merging arm-soc/for-next (06f885da38ae soc: document merges) Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps= ' into next) Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) Merging amlogic/for-next (59f249fca4f0 Merge branch 'v5.1/dt64' into tmp/am= l-rebuild) Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable= uart1) Merging at91/at91-next (3850dd7a32a0 Merge branch 'at91-dt' into at91-next) Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' = into for-next) Merging imx-mxs/for-next (376c79c46ca2 Merge branch 'imx/maintainers' into = for-next) Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into= next) Merging mediatek/for-next (ecee13a082e0 Merge branch 'v5.0-next/dts64' into= for-next) Merging mvebu/for-next (b5f034845e70 ARM: dts: kirkwood: Fix polarity of GP= IO fan lines) Merging omap/for-next (e6e7b013aca0 Merge branch 'omap-for-v5.0/fixes-v2' i= nto for-next) Merging reset/reset/next (c979dbf59987 reset: imx7: Add support for i.MX8MQ= IP block variant) Merging qcom/for-next (6277cb1ccc3b Merge tag 'qcom-arm64-for-5.1' into all= -for-5.1) CONFLICT (content): Merge conflict in arch/arm/boot/dts/qcom-ipq4019.dtsi Merging renesas/next (077d339df29e Merge branch 'dt-bindings-for-v5.1' into= next) Merging rockchip/for-next (21123b35a4e8 Merge branch 'v5.1-armsoc/dts64' in= to for-next) Merging samsung/for-next (bebc6082da0a Linux 4.14) Merging samsung-krzk/for-next (13427eabb93f Merge branch 'next/soc' into fo= r-next) Merging sunxi/sunxi/for-next (4b0ebb6cff0f Merge branches 'sunxi/dt64-for-5= .1' and 'sunxi/config64-for-5.1' into sunxi/for-next) Merging tegra/for-next (45bfb6b333ab Merge branch for-5.1/arm64/dt into for= -next) Merging clk/clk-next (15961a572b90 Merge branch 'clk-json-schema' into clk-= next) Merging clk-samsung/for-next (81faa30df9b6 clk: samsung: exynos5433: Add se= lected IMEM clocks) Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://= git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging csky/linux-next (d1b5a330692a csky: Fixup dead loop in show_stack) Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration= of pcibios_penalize_isa_irq) Merging ia64/next (c51836246f97 ia64: generate uapi header and system call = table files) Merging m68k/for-next (28713169d879 m68k: Add -ffreestanding to CFLAGS) Merging m68knommu/for-next (3b4de615cfd9 m68k: add ColdFire mcf5441x eDMA p= latform support) Merging microblaze/next (226a893bbb1f microblaze: no need to check return v= alue of debugfs_create functions) Merging mips/mips-next (9ae1f262cd48 MIPS: Don't select ARCH_HAS_SYNC_DMA_F= OR_CPU when DMA is coherent) Merging nds32/next (bfeffd155283 Linux 5.0-rc1) Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TL= B with the new PTE) Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/= or32) Merging parisc-hd/for-next (47e157d5206d parisc: Use F_EXTEND() macro in io= sapic code) Merging powerpc/next (63da6caeb84c powerpc: remove unnecessary unlikely()) Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dm= a_set_mask") Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of= git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) Merging risc-v/for-next (801009424e05 Fix a handful of audit-related issue) Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git= ://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) Merging s390/features (7dd541a3fb34 s390: no need to check return value of = debugfs_create functions) Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.k= ernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) Merging uml/linux-next (940b241d9050 um: Remove obsolete reenable_XX calls) Merging xtensa/xtensa-for-next (20d45b2c3fe9 Merge branch 'xtensa-5.0-fixes= ' into xtensa-for-next) Merging fscrypt/master (f5e55e777cc9 fscrypt: return -EXDEV for incompatibl= e rename or link into encrypted dir) Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding stan= dard issues) Merging btrfs/next (29dcea88779c Linux 4.17) Merging btrfs-kdave/for-next (5b113911bac9 Merge branch 'for-next-next-v5.0= -20190204' into for-next-20190204) Merging ceph/master (74827ee29565 ceph: quota: cleanup license mess) Merging cifs/for-next (7b2e4d21175a cifs: Fix NULL pointer dereference of d= evname) Merging configfs/for-next (cc57c07343bd configfs: fix registered group remo= val) Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion b= ugs) Merging ext3/for_next (772989eab6a5 Merge ext2 cleanups and fixes.) Merging ext4/dev (191ce17876c9 ext4: fix special inode number checks in __e= xt4_iget()) Merging f2fs/dev (72aa2995d2b3 f2fs: do not use mutex lock in atomic contex= t) Merging fuse/for-next (e057f7fc89c2 fuse: cache readdir calls if filesystem= opts out of opendir) Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID A= PI) Merging nfs/linux-next (8834f5600cf3 Linux 5.0-rc5) Merging nfs-anna/linux-next (8fc75bed96bb NFS: Fix up return value on fatal= errors in nfs_page_async_flush()) Merging nfsd/nfsd-next (978c707df559 svcrdma: Use struct_size() in kmalloc(= )) Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for serv= ice_operation returns > 0) Merging overlayfs/overlayfs-next (2424e1c7256c overlayfs: During copy up, f= irst copy up data and then xattrs) Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes c= orrectly while recovery) Merging v9fs/9p-next (3bbe8b1a4ae9 9p: mark expected switch fall-through) Merging xfs/for-next (add46b3b0212 xfs: set buffer ops when repair probes f= or btree type) Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_= blocks()) Merging vfs/for-next (b59b26d1f597 Merge branches 'work.mount', 'work.misc'= and 'work.iov_iter' into for-next) CONFLICT (content): Merge conflict in fs/Makefile Merging printk/for-next (15ff2069cb7f printk: Add caller information to pri= ntk() output.) Merging pci/next (4e4af4fc53c1 Merge branch 'remotes/lorenzo/pci/vmd') Merging pstore/for-next/pstore (182ca6e0ae23 pstore/ram: Replace dummy_data= heap memory with stack memory) Merging hid/for-next (06e284aafd45 Merge branch 'for-5.1/ish' into for-next) Merging i2c/i2c/for-next (44783efdfed1 i2c: aspeed: Remove hard-coded bus t= imeout value setting) Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in = Cadence I3C master driver) Merging dmi/master (57361846b52b Linux 4.19-rc2) Merging hwmon-staging/hwmon-next (d79d81923274 hwmon: (lm85) add support fo= r LM96000 high frequencies) Merging jc_docs/docs-next (8f7e6d134bda doc: process: GPL -> GPL-compatible) Merging v4l-dvb/master (f0ef022c85a8 media: vim2m: allow setting the defaul= t transaction time via parameter) CONFLICT (content): Merge conflict in drivers/media/platform/vim2m.c Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAI= NTAINERS entry) CONFLICT (add/add): Merge conflict in Documentation/media/v4l-drivers/ipu3.= rst CONFLICT (add/add): Merge conflict in Documentation/media/uapi/v4l/pixfmt-m= eta-intel-ipu3.rst Merging fbdev/fbdev-for-next (890d14d2d4b5 fbdev: fbmem: convert CONFIG_FB_= LOGO_CENTER into a cmd line option) Merging pm/linux-next (c46ebc17bc08 Merge branches 'pm-cpuidle' and 'pm-cpu= freq' into linux-next) Merging cpufreq-arm/cpufreq/arm/linux-next (fb9b07a0f2d1 cpufreq: tegra124:= add missing of_node_put()) Merging cpupower/cpupower (bfeffd155283 Linux 5.0-rc1) Merging opp/opp/linux-next (c257a22bea9b PM / OPP: Remove unused parameter = of _generic_set_opp_clk_only()) Merging thermal/next (301c9a43e158 Merge branches 'for-rc' and 'thermal-int= el' into next) Merging thermal-soc/next (9d216211fded thermal: generic-adc: Fix adc to tem= p interpolation) Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA= in case of platform dependency) Merging dlm/next (5c1597bfeb2c dlm: retry wait_event_interruptible in event= of ERESTARTSYS) Merging swiotlb/linux-next (227a76b64718 swiotlb: clear io_tlb_start and io= _tlb_end in swiotlb_exit) Merging rdma/for-next (da91ddfdc721 RDMA/hns: Remove set but not used varia= ble 'rst') Merging net-next/master (cc7335786f72 socket: fix for Add SO_TIMESTAMP[NS]_= NEW) Merging bpf-next/master (1728b11110f1 Merge branch 'libbpf-btf_ext') Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix= indentation for switch spi bindings) Merging mlx5-next/mlx5-next (46861e3e88be net/mlx5: Set ODP SRQ support in = firmware) Merging netfilter-next/master (0604628bb03a netfilter: nf_tables: add NFTA_= RULE_POSITION_ID to nla_policy) Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warning= s) Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port= values for other l4 protocols) Merging wireless-drivers-next/master (030b43671ae8 wireless: prefix header = search paths with $(srctree)/) Merging bluetooth/master (e20a2e9c42c9 Bluetooth: Fix decrementing referenc= e count twice in releasing socket) Merging mac80211-next/master (7d4194633b29 mac80211: fix missing/malformed = documentation) Merging gfs2/for-next (2abbf9a4d262 gfs: no need to check return value of d= ebugfs_create functions) Merging mtd/mtd/next (b0dd77a79642 mtd: docg3: fix a possible memory leak o= f mtd->name) Merging nand/nand/next (e74745d96478 mtd: rawnand: fsmc: Disable NAND on re= move()) Merging spi-nor/spi-nor/next (a2126b0a0109 mtd: spi-nor: refine Spansion S2= 5FL512S ID) Merging crypto/master (8336bdf12a9e crypto: arm64/crct10dif - register PMUL= L variants as separate algos) Merging drm/drm-next (2cc3b81dfa7f Merge tag 'drm-intel-next-2019-02-02' of= git://anongit.freedesktop.org/drm/drm-intel into drm-next) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dc_str= eam.h CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_dev= ice.c Applying: drm: merge fix up for and extra #pragma line Merging drm-intel/for-linux-next (1413b2bc0717 drm/i915: Trim NEWCLIENT boo= sting) Merging drm-tegra/drm/tegra/for-next (5da853b860e5 drm/tegra: sor: Support = device tree crossbar configuration) Merging drm-misc/for-linux-next (1e55a53a28d3 drm: Trivial comment grammar = cleanups) Merging drm-msm/msm-next (8aa82766de12 dt-bindings: drm/msm/a6xx: Document = GMU bindings) Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic= commits that disable only the plane) Merging mali-dp/for-upstream/mali-dp (dcc9d76b6d83 drm/komeda: Off by one i= n komeda_fb_get_pixel_addr()) Merging imx-drm/imx-drm/next (e4a2457f459b drm/imx: only send commit done e= vent when all state has been applied) Merging etnaviv/etnaviv/next (fd4b77e8deea drm/etnaviv: don't restrict to c= ertain architectures) Merging kconfig/for-next (bebc6082da0a Linux 4.14) Merging regmap/for-next (66fb181d6f82 Merge remote-tracking branch 'regmap/= topic/irq' into regmap-next) Merging sound/for-next (0b6a2c9cf4a0 ALSA: isa: Avoid passing NULL to memor= y allocators) Merging sound-asoc/for-next (23c10f83944b Merge branch 'asoc-5.1' into asoc= -next) Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsy= ms on Thumb-2) Merging input/next (281d5e66e01e Input: sx8654 - convert #defined flags to = BIT(x)) Merging block/for-next (bdec662b033e Merge branch 'for-5.1/block' into for-= next) Merging device-mapper/for-next (075c18c3e124 dm: add missing trace_block_sp= lit() to __split_and_process_bio()) Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol = disabling for Ricoh bridges) Merging mmc/next (dc5c8daecc7e mmc: tegra: HW Command Queue Support for Teg= ra SDMMC) Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers in= stead of hashed addresses) CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barri= er) Merging mfd/for-mfd-next (c52b8fd546d8 mfd: wm8400-core: Make it explicitly= non-modular) Merging backlight/for-backlight-next (cec2b18832e2 backlight: pwm_bl: Use g= piod_get_value_cansleep() to get initial state) Merging battery/for-next (f83a6ece6997 power: supply: bq25890: show max cha= rge current/voltage as configured) Merging regulator/for-next (ec3096e764b3 Merge branch 'regulator-5.1' into = regulator-next) Merging security/next-testing (d87331e4a620 Merge branch 'next-general' int= o next-testing) Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about un= used function apparmor_ipv6_postroute) Merging integrity/next-integrity (cd0b86fe9529 ima: define ima_post_create_= tmpfile() hook and add missing call) Merging selinux/next (e6f2f381e401 selinux: replace BUG_ONs with WARN_ONs i= n avc.c) Merging tpmdd/next (20a2e0a7a26d tpm: don't return bool from update_timeout= s) Merging watchdog/master (59600d045ff4 dt-bindings: watchdog: renesas-wdt: D= ocument r8a77470 support) Merging iommu/next (af728567eaac Merge branches 'iommu/fixes', 'arm/msm', '= arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) Merging vfio/next (8ba35b3a0046 vfio-mdev/samples: Use u8 instead of char f= or handle functions) Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) Merging audit/next (5f3d544f1671 audit: remove audit_context when CONFIG_ A= UDIT and not AUDITSYSCALL) Merging devicetree/for-next (42e45a9449f1 media: s5p-mfc: Fix memdev DMA co= nfiguration) Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use devi= ce-managed registration API) Merging spi/for-next (57b20d4d93f7 Merge branch 'spi-5.1' into spi-next) CONFLICT (modify/delete): arch/mips/ath79/dev-spi.h deleted in HEAD and mod= ified in spi/for-next. Version spi/for-next of arch/mips/ath79/dev-spi.h le= ft in tree. $ git rm -f arch/mips/ath79/dev-spi.h Merging tip/auto-latest (3fc175d79dbc Merge branch 'x86/urgent') Merging clockevents/clockevents/next (7cd6dca3600d clocksource/drivers/arch= _timer: Workaround for Allwinner A64 timer instability) Merging edac-amd/for-next (d4dc89d069aa EDAC, i10nm: Add a driver for Intel= 10nm server processors) Merging irqchip/irq/irqchip-next (56841070ccc8 irqchip/gic-v3-its: Fix ITT_= entry_size accessor) Merging ftrace/for-next (3d739c1f6156 tracing: Use the return of str_has_pr= efix() to remove open coded numbers) Merging rcu/rcu/next (e81e38da861d Merge LKMM and RCU commits) Merging kvm/linux-next (bfeffd155283 Linux 5.0-rc1) Merging kvm-arm/next (bb16c22a780e arm64: KVM: Describe data or unified cac= hes as having 1 set and 1 way) Merging kvm-ppc/kvm-ppc-next (ae59a7e1945b KVM: PPC: Book3S HV: Keep rc bit= s in shadow pgtable in sync with host) Merging kvms390/next (7aedd9d48f2a KVM: s390: fix kmsg component kvm-s390) Merging xen-tip/linux-next (8d2df8a2d0fa arch/arm/xen: Remove duplicate hea= der) Merging percpu/for-next (718f6757a29b Merge branch 'for-4.21' into for-next) Merging workqueues/for-next (4d43d395fed1 workqueue: Try to catch flush_wor= k() without INIT_WORK().) Merging drivers-x86/for-next (e7706a4359f0 platform/x86: mlx-platform: Add = support for new VMOD0007 board name) Merging chrome-platform/for-next (bfeffd155283 Linux 5.0-rc1) Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW= _ATTRIBUTE macro) Merging leds/for-next (0f85e8498a48 leds: trigger: timer: Add initializatio= n from Device Tree) Merging ipmi/for-next (2b835103f84d ipmi: Use dedicated API for copying a U= UID) Merging driver-core/driver-core-next (79a4e91d1bb2 device.h: Add __cold to = dev_ logging functions) Merging usb/usb-next (a2fd23b93733 usbip: Fix vep_free_request() null point= er checks on input args) Merging usb-gadget/next (1c7fc5cbc339 Linux 5.0-rc2) Merging usb-serial/usb-next (15fb84b74196 USB: serial: cp210x: add GPIO sup= port for CP2104) Merging usb-chipidea-next/ci-for-usb-next (9049fce897ed usb: chipidea: imx:= allow to configure oc polarity on i.MX25) Merging phy-next/next (49ee1406355e phy: qcom-qusb2: Add QUSB2 PHY support = for msm8998) Merging tty/tty-next (9c6a2583f115 serial: mps2-uart: Add parentheses aroun= d conditional in mps2_uart_shutdown) Merging char-misc/char-misc-next (9f23379c67fa nvmem: allow to select i.MX = nvmem driver for i.MX 7D) Merging extcon/extcon-next (a9857d45edf3 extcon: ptn5150: Fix return value = check in ptn5150_i2c_probe()) Merging soundwire/next (bfeffd155283 Linux 5.0-rc1) Merging thunderbolt/next (f17b5f06cb92 Linux 5.0-rc4) Merging staging/staging-next (1dcc3ed4a774 Merge tag 'iio-for-5.1a' of git:= //git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next) Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for= -next) Merging icc/icc-next (1c7fc5cbc339 Linux 5.0-rc2) Merging slave-dma/next (6f53b3d320ac Merge branch 'topic/k3dma' into next) CONFLICT (content): Merge conflict in drivers/dma/imx-sdma.c Merging cgroup/for-next (6b3a6a132dfc MAINTAINERS: Update cgroup entry) Merging scsi/for-next (e999fb7cc97c Merge branch 'misc' into for-next) CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c Merging scsi-mkp/for-next (ede2afb9c8ed scsi: hisi_sas: Add missing seq_pri= ntf() call in hisi_sas_show_row_32()) Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wa= ke up sleeping login worker) Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) Merging vhost/linux-next (ae5d11d206fc arch: move common mmap flags to linu= x/mman.h) CONFLICT (content): Merge conflict in drivers/pci/setup-bus.c Merging rpmsg/for-next (19f5ccc8bbc9 Merge branches 'hwspinlock-next', 'rpm= sg-next' and 'rproc-next' into for-next) Merging gpio/for-next (5c713d9394f3 pinctrl: qcom: spmi-gpio: select IRQ_DO= MAIN_HIERARCHY in Kconfig) Merging gpio-brgl/gpio/for-next (060175a657f0 gpio: altera-a10sr: Trivial c= oding style fix) CONFLICT (content): Merge conflict in drivers/gpio/gpio-altera-a10sr.c Merging pinctrl/for-next (fb5ed1b8df2b Merge branch 'devel' into for-next) Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1) Merging pwm/for-next (7ca17b207127 pwm: imx: Signedness bug in imx_pwm_get_= state()) Merging userns/for-next (ee17e5d6201c signal: Make siginmask safe when pass= ed a signal of 0) Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for g= rub2 menus) Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng s= tatic) Merging kselftest/next (bfeffd155283 Linux 5.0-rc1) Merging y2038/y2038 (4ad44aba07b7 y2038: add 64-bit time_t syscalls to all = 32-bit architectures) Merging livepatching/for-next (62ecab9b2482 Merge branch 'for-5.1-atomic-re= place' into for-next) Merging coresight/next (c714bc38ebee coresight: Use event attributes for si= nk selection) Merging rtc/rtc-next (75455e258ea2 rtc: abx80x: Configure reserved bits in = RV1805) Merging nvdimm/libnvdimm-for-next (8a6f7591ddf5 Merge branch 'for-5.0/dax' = into libnvdimm-for-next) Merging at24/at24/for-next (3b0548784079 eeprom: at24: remove at24_platform= _data) Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=3D4= G memory windows) Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/= arm-stackprotector' into for-next/kspp) Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next) CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c Merging gnss/gnss-next (f9eb86fddaf2 dt-bindings: gnss: add lna-supply prop= erty) Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) Merging slimbus/for-next (81648d8bc222 slimbus: core: add missing spin_lock= _init on txn_lock) Merging nvmem/for-next (c86d78c459db nvmem: allow to select i.MX nvmem driv= er for i.MX 7D) Merging xarray/xarray (809ab9371ca0 XArray: Update xa_erase family descript= ions) Merging hyperv/hyperv-next (27207b76011f vmbus: Switch to use new generic U= UID API) Merging auxdisplay/auxdisplay (49a57857aeea Linux 5.0-rc3) Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct = kgdb_arch arch_kgdb_ops) Merging pidfd/for-next (a662d9f6ca22 selftests: add tests for pidfd_send_si= gnal()) CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl Merging kspp-gustavo/for-next/kspp (f993bd3e061d ASN.1: mark expected switc= h fall-through) CONFLICT (content): Merge conflict in kernel/time/timer.c CONFLICT (content): Merge conflict in kernel/time/hrtimer.c Merging akpm-current/current (727dbfc786c4 ipc/sem.c: replace kvmalloc/mems= et with kvzalloc and use struct_size) CONFLICT (content): Merge conflict in security/selinux/ss/services.c CONFLICT (content): Merge conflict in net/sctp/stream.c CONFLICT (content): Merge conflict in include/linux/sched.h CONFLICT (content): Merge conflict in include/linux/kernfs.h $ git checkout -b akpm remotes/origin/akpm/master Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are ex= ecutable Applying: proc: calculate end pointer for /proc/*/* lookup at compile time Applying: proc: merge fix for proc_pident_lookup() API change Applying: unicore32: stop printing the virtual memory layout Applying: arch/nios2/mm/fault.c: remove duplicate include Applying: include/linux/sched/signal.h: replace `tsk' with `task' Applying: openrisc: prefer memblock APIs returning virtual address Applying: powerpc: use memblock functions returning virtual address Applying: memblock: replace memblock_alloc_base(ANYWHERE) with memblock_phy= s_alloc Applying: memblock: drop memblock_alloc_base_nid() Applying: memblock: emphasize that memblock_alloc_range() returns a physica= l address Applying: memblock: memblock_phys_alloc_try_nid(): don't panic Applying: memblock: memblock_phys_alloc(): don't panic Applying: memblock: drop __memblock_alloc_base() Applying: memblock: drop memblock_alloc_base() Applying: memblock: refactor internal allocation functions Applying: memblock: fix parameter order in memblock_phys_alloc_try_nid() Applying: memblock: make memblock_find_in_range_node() and choose_memblock_= flags() static Applying: arch: use memblock_alloc() instead of memblock_alloc_from(size, a= lign, 0) Applying: arch: don't memset(0) memory returned by memblock_alloc() Applying: ia64: add checks for the return value of memblock_alloc*() Applying: sparc: add checks for the return value of memblock_alloc*() Applying: mm/percpu: add checks for the return value of memblock_alloc*() Applying: init/main: add checks for the return value of memblock_alloc*() Applying: swiotlb: add checks for the return value of memblock_alloc*() Applying: treewide: add checks for the return value of memblock_alloc*() Applying: mm: sparse: Use '%pa' with 'phys_addr_t' type Applying: memblock: fix format strings for panics after memblock_alloc Applying: mm/sparse: don't panic if the allocation in sparse_buffer_init fa= ils Applying: memblock: memblock_alloc_try_nid: don't panic Applying: memblock: drop memblock_alloc_*_nopanic() variants Applying: include/linux/relay.h: fix percpu annotation in struct rchan Applying: kernel/fork.c: remove duplicated include Applying: samples/mic/mpssd/mpssd.h: remove duplicate header Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer ove= rflow Merging akpm/master (be4ee30bdc3e drivers/media/platform/sti/delta/delta-ip= c.c: fix read buffer overflow) --Sig_/rf=EaOEAKZ2vZNBGPkyzu66 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlxZKUwACgkQAVBC80lX 0Gxa+AgAlR/KVWBv/vM9gi+uiP+hH/WAK4/pduEllrJyMwD7aLsYdlI6fjV1WCFq O2spYO1259X7IdxM0PiRnD93tsJNP07wDzGv2hlNwqK2VWSqtpi4LbU+RC103cgh aDr3iIY+gLRHDyHLydAjlbEO/h9mVIIZNXgCw6oUbHSprMuKYF4EGGQEqx3baJjD F8S2SMAbOw6HR+J+5kq30gCvEh7MeoZU5K88Ou0q9Ll1aG887k1tOwzTTKc4Xd1D F+eQshDaAF7oXWZiec0YCDuT/cAvHeh/fHThNcFcsO28CdFFw47/UQ/6PqgHFCJl DzRzCCEHqzTYxKIhUCB7fOdinxTDtQ== =qpZs -----END PGP SIGNATURE----- --Sig_/rf=EaOEAKZ2vZNBGPkyzu66--