linux-next: Tree for Apr 4

linux-next: Tree for Apr 4

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 36646 bytes --]

Hi all,

Please do not add any v4.18 destined stuff to your linux-next included
trees until after v4.17-rc1 has been released.

Changes since 20180403:

The vfs tree still had its build failure for which I reverted a commit.

Non-merge commits (relative to Linus' tree): 8505
 8493 files changed, 392779 insertions(+), 275941 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 261 trees (counting Linus' and 44 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.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (e40dc66220b7 Merge tag 'leds_for_4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds)
Merging fixes/master (7928b2cbe55b Linux 4.16-rc1)
Merging kbuild-current/fixes (28913ee8191a netfilter: nf_nat_snmp_basic: add correct dependency to Makefile)
Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4)
Merging arm-current/fixes (1b8837b61714 ARM: 8750/1: deflate_xip_data.sh: minor fixes)
Merging arm64-fixes/for-next/fixes (e21da1c99200 arm64: Relax ARM_SMCCC_ARCH_WORKAROUND_1 discovery)
Merging m68k-current/for-linus (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (52396500f97c powerpc/64s: Fix i-side SLB miss bad address handler saving nonvolatile GPRs)
Merging sparc/master (9c548bb5823d sparc64: Oracle DAX driver depends on SPARC64)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (b5dbc28762fd Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging bpf/master (e8a4796ee295 nfp: bpf: fix check of program max insn count)
Merging ipsec/master (9a3fb9fb84cc xfrm: Fix transport mode skb control buffer usage.)
Merging netfilter/master (b9fc828debc8 qede: Fix barrier usage after tx doorbell write.)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
Merging wireless-drivers/master (9b9322db5c5a brcmfmac: Fix check for ISO3166 code)
Merging mac80211/master (b5dbc28762fd Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging rdma-fixes/for-rc (84652aefb347 RDMA/ucma: Introduce safer rdma_addr_size() variants)
Merging sound-current/for-linus (a820ccbe21e8 ALSA: pcm: Fix UAF at PCM release via PCM timer access)
Merging pci-current/for-linus (fc110ebdd014 PCI: dwc: Fix enumeration end when reaching root subordinate)
Merging driver-core.current/driver-core-linus (0c8efd610b58 Linux 4.16-rc5)
Merging tty.current/tty-linus (c698ca527893 Linux 4.16-rc6)
Merging usb.current/usb-linus (c698ca527893 Linux 4.16-rc6)
Merging usb-gadget-fixes/fixes (c6ba5084ce0d usb: gadget: udc: renesas_usb3: add binging for r8a77965)
Merging usb-serial-fixes/usb-linus (86d71233b615 USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator)
Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup)
Merging phy/fixes (59fba0869aca phy: qcom-ufs: add MODULE_LICENSE tag)
Merging staging.current/staging-linus (a0306db6e575 Merge 4.16-rc7 into staging-next)
Merging char-misc.current/char-misc-linus (3eb2ce825ea1 Linux 4.16-rc7)
Merging input-current/for-linus (567b9b549cfa Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370)
CONFLICT (content): Merge conflict in drivers/input/joystick/analog.c
Merging crypto-current/master (c927b080c67e crypto: s5p-sss - Fix kernel Oops in AES-ECB mode)
Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time')
Merging vfio-fixes/for-linus (834814e80268 Revert: "vfio-pci: Mask INTx if a device is not capabable of enabling it")
Merging kselftest-fixes/fixes (ba004a2955f7 selftests: memory-hotplug: fix emit_tests regression)
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown)
Merging v4l-dvb-fixes/fixes (2c27476e398b media: dvb: fix a Kconfig typo)
Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
Merging mips-fixes/mips-fixes (a63d706ea719 MIPS: ralink: Fix booting on MT7621)
Merging kvm-fixes/master (17a1079d9c63 KVM: x86: Fix pv tlb flush dependencies)
Merging kvms390-fixes/master (f07afa0462b7 KVM: s390: fix memory overwrites when not using SCA entries)
Merging drm-intel-fixes/for-linux-next-fixes (3eb2ce825ea1 Linux 4.16-rc7)
Merging drm-misc-fixes/for-linux-next-fixes (5a9f698feb11 drm/ast: Fixed 1280x800 Display Issue)
Merging syscalls/syscalls-next (c9a211951c7c bpf: whitelist all syscalls for error injection)
Merging kbuild/for-next (1b7bdaa0f91e Merge branches 'kbuild', 'kconfig' and 'kbuild2' into for-next)
CONFLICT (modify/delete): arch/metag/boot/dts/Makefile deleted in HEAD and modified in kbuild/for-next. Version kbuild/for-next of arch/metag/boot/dts/Makefile left in tree.
CONFLICT (modify/delete): arch/blackfin/kernel/bfin_ksyms.c deleted in HEAD and modified in kbuild/for-next. Version kbuild/for-next of arch/blackfin/kernel/bfin_ksyms.c left in tree.
$ git rm -f arch/metag/boot/dts/Makefile arch/blackfin/kernel/bfin_ksyms.c
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging efi-lock-down/efi-lock-down (89bcd5b02f12 lockdown: Print current->comm in restriction messages)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (1f674e16f9ce usb: gadget: Add NO_DMA dummies for DMA mapping API)
Merging asm-generic/master (dd3b8c329aa2 MAINTAINERS: UNICORE32: Change email account)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (1c98ff49448a Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (44300aed5d28 perf: arm_spe: include linux/vmalloc.h for vmap())
Merging arm-soc/for-next (37c8295552b6 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in drivers/bus/arm-cci.c
Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (059e40d90876 Merge branch 'v4.17/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next)
Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next)
Merging bcm2835/for-next (cf172af3be59 Merge branch anholt/bcm2835-defconfig-next into for-next)
Merging imx-mxs/for-next (98f9530adda3 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (dacf37850167 Merge branch 'for_4.17/soc-drivers' into next)
Merging mvebu/for-next (4c1b45a44e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (d1cc5c055f7a Merge branch 'omap-for-v4.17/defconfig' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Merging reset/reset/next (0089313d8595 Merge branch 'reset/lookup' into reset/next)
Merging qcom/for-next (186d88395e05 Merge tag 'qcom-arm64-defconfig-for-4.17' into all-for-4.17-final)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (58eb42a95b24 Merge branches 'arm64-defconfig-for-v4.17', 'arm64-dt-for-v4.17', 'defconfig-for-v4.17', 'dt-bindings-for-v4.17', 'dt-for-v4.17' and 'soc-for-v4.17' into next)
Merging rockchip/for-next (f5a45eb97728 Merge branch 'v4.17-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (0bc590a59ce6 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (2d567752a056 Merge branch 'sunxi/clk-for-4.17' into sunxi/for-next)
Merging tegra/for-next (6b9b5116227d Merge branch for-4.17/clk into for-next)
Merging arm64/for-next/core (65896545b69f arm64: uaccess: Fix omissions from usercopy whitelist)
CONFLICT (content): Merge conflict in include/uapi/asm-generic/siginfo.h
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpu_errata.c
Merging clk/clk-next (804a4481ff50 Merge branch 'clk-si544' into clk-next)
Merging clk-samsung/for-next (182c084da5d1 clk: samsung: Add fout=196608001 Hz EPLL rate entry for exynos4412)
Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error)
Merging m68k/for-next (ecd685580c8f m68k/mac: Remove bogus "FIXME" comment)
Merging m68knommu/for-next (f61e64310b75 m68k: set dma and coherent masks for platform FEC ethernets)
Merging metag/for-next (8d06c3302635 i2c: img-scb: Drop METAG dependency)
Merging microblaze/next (70f6283a372b microblaze: Use generic pci_mmap_resource_range())
Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next)
Merging mips-james/mips-next (6a089769522c lib: Rename compiler intrinsic selects to GENERIC_LIB_*)
Merging nds32/next (6fc61ee69433 nds32: To use the generic dump_stack())
Merging nios2/for-next (e0691ebb33c1 nios2: defconfig: Cleanup from old Kconfig options)
Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE_MMU define)
Merging parisc-hd/for-next (0adb32858b0b Linux 4.16)
Merging powerpc/next (b6f534d1a642 selftests/powerpc: Fix copyloops build since Power4 assembler change)
CONFLICT (content): Merge conflict in lib/raid6/test/Makefile
Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device)
Merging risc-v/for-next (0adb32858b0b Linux 4.16)
Merging s390/features (92fa7a13c845 s390/kvm: improve stack frame constants in entry.S)
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
Merging sparc-next/master (d13864b68e41 sparc64: Make atomic_xchg() an inline function rather than a macro.)
CONFLICT (content): Merge conflict in arch/x86/kernel/signal_compat.c
Merging sh/for-next (d67cbbb113b7 arch/sh: pcie-sh7786: handle non-zero DMA offset)
Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic)
Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits)
Applying: f2fs: fixup for cgroup/writeback change
Merging btrfs-kdave/for-next (65fff2ba326d Merge branch 'for-next-next-v4.17-20180331' into for-next-20180331)
Merging ceph/master (9122eed5281e ceph: quota: report root dir quota usage in statfs)
Merging cifs/for-next (07108d0e7c7f cifs: Add minor debug message during negprot)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (f62fd7a77717 ecryptfs: fix spelling mistake: "cadidate" -> "candidate")
Merging ext3/for_next (b91ed9d8082c quota: Kill an unused extern entry form quota.h)
Merging ext4/dev (b025a674fc5d ext4: force revalidation of directory pointer after seekdir(2))
Merging f2fs/dev (dcbf2abadf6b f2fs: remain written times to update inode during fsync)
Merging fuse/for-next (5ba24197b94d fuse: add writeback documentation)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (0adb32858b0b Linux 4.16)
Merging nfs-anna/linux-next (7e8b4fa9fce9 NFSv4.1: Fix exclusive create)
Merging nfsd/nfsd-next (31ff77de4bea nfsd: zero out umask if the client didn't provide one)
Merging orangefs/for-next (74e938c22705 orangefs: reverse sense of is-inode-stale test in d_revalidate)
Merging overlayfs/overlayfs-next (55c23fb569e4 ovl: cleanup ovl_update_time())
Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove)
Merging xfs/for-next (dc1baa715bbf xfs: do not log/recover swapext extent owner changes for deleted inodes)
Merging file-locks/locks-next (8bad6f173914 locks: change POSIX lock ownership on execve when files_struct is displaced)
Merging vfs/for-next (fd70f4425f9b Merge branches 'work.dcache', 'old.dcache', 'work.misc', 'work.thaw', 'misc.compat' and 'misc.sparc' into for-next)
CONFLICT (content): Merge conflict in fs/open.c
CONFLICT (content): Merge conflict in fs/internal.h
CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c left in tree.
CONFLICT (modify/delete): drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c left in tree.
CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc32.c
$ git rm -f drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
Applying: Revert "buffer.c: call thaw_super during emergency thaw"
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging iversion/iversion-next (581e400ff935 Merge tag 'modules-for-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux)
Merging printk/for-next (23545acc2a0e Merge branch 'for-4.17' into for-next)
Merging pci/next (6e6ed068f092 Merge branch 'lorenzo/pci/xilinx')
CONFLICT (content): Merge conflict in drivers/pci/quirks.c
CONFLICT (content): Merge conflict in drivers/bus/Makefile
CONFLICT (modify/delete): arch/mn10300/unit-asb2305/pci.c deleted in HEAD and modified in pci/next. Version pci/next of arch/mn10300/unit-asb2305/pci.c left in tree.
CONFLICT (modify/delete): arch/frv/mb93090-mb00/pci-vdk.c deleted in HEAD and modified in pci/next. Version pci/next of arch/frv/mb93090-mb00/pci-vdk.c left in tree.
CONFLICT (modify/delete): arch/cris/arch-v32/drivers/pci/bios.c deleted in HEAD and modified in pci/next. Version pci/next of arch/cris/arch-v32/drivers/pci/bios.c left in tree.
$ git rm -f arch/cris/arch-v32/drivers/pci/bios.c arch/frv/mb93090-mb00/pci-vdk.c arch/mn10300/unit-asb2305/pci.c
Applying: PCI/cxgb4: morge fix up for move of quirk_chelsio_extend_vpd()
Merging pstore/for-next/pstore (58eb5b670747 pstore: fix crypto dependencies)
Merging hid/for-next (e221c81efb0c Merge branch 'for-4.17/google-hammer' into for-next)
Merging i2c/i2c/for-next (7dd6d78e9151 Merge branch 'i2c/for-4.17' into i2c/for-next)
CONFLICT (modify/delete): arch/blackfin/mach-bf561/boards/acvilon.c deleted in HEAD and modified in i2c/i2c/for-next. Version i2c/i2c/for-next of arch/blackfin/mach-bf561/boards/acvilon.c left in tree.
$ git rm -f arch/blackfin/mach-bf561/boards/acvilon.c
Merging dmi/master (eb693e35e850 firmware: dmi_scan: add DMI_OEM_STRING support to dmi_matches)
Merging hwmon-staging/hwmon-next (e3a2d2be510e hwmon: (via-cputemp) support new centaur CPUs)
Merging jc_docs/docs-next (86afad7d87f5 Documentation/process: update FUSE project website)
Merging v4l-dvb/master (6ccd228e0cfc media: fimc-capture: get rid of two warnings)
CONFLICT (modify/delete): drivers/media/platform/blackfin/bfin_capture.c deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of drivers/media/platform/blackfin/bfin_capture.c left in tree.
$ git rm -f drivers/media/platform/blackfin/bfin_capture.c
Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic)
Merging fbdev/fbdev-for-next (7c9b845e79ea video: fbdev: s3c-fb: remove dead platform code for Exynos and S5PV210 platforms)
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
Merging pm/linux-next (4606b87beeff Merge branch 'acpi-pm' into linux-next)
Merging cpupower/cpupower (7928b2cbe55b Linux 4.16-rc1)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (4a823c0be80f opp: cpu: Replace GFP_ATOMIC with GFP_KERNEL in dev_pm_opp_init_cpufreq_table)
Merging thermal/next (f8837aac36cd Merge branches 'thermal-core' and 'thermal-soc' into next)
Merging thermal-soc/next (2db48884bb51 dt-bindings: thermal: Remove "cooling-{min|max}-level" properties)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging rdma/for-next (44016b346640 iw_cxgb4: print mapped ports correctly)
CONFLICT (content): Merge conflict in drivers/infiniband/core/ucma.c
Merging net-next/master (4608f064532c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next)
CONFLICT (modify/delete): drivers/staging/irda/net/af_irda.c deleted in HEAD and modified in net-next/master. Version net-next/master of drivers/staging/irda/net/af_irda.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_main.c
$ git rm -f drivers/staging/irda/net/af_irda.c
Merging bpf-next/master (7828f20e3779 Merge branch 'bpf-cgroup-bind-connect')
Merging ipsec-next/master (415a13296a1a xfrm_policy: use true and false for boolean values)
Merging netfilter-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume')
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
Merging wireless-drivers-next/master (14c99949a339 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (1c663c629bb8 Bluetooth: hci_bcm: Remove irq-active-low DMI quirk for the Thinkpad 8)
Merging mac80211-next/master (159f02977b2f Merge branch 'net-mvneta-improve-suspend-resume')
Merging gfs2/for-next (5e86d9d122d0 gfs2: time journal recovery steps accurately)
Merging mtd/master (87a73eb5b56f mtd: jedec_probe: Fix crash in jedec_read_mfr())
Merging l2-mtd/mtd/next (b756816dad0a mtd: ftl: Use DIV_ROUND_UP())
Merging nand/nand/next (097ccca726ff mtd: nand: Fix some function description mismatches in core.c)
CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
CONFLICT (modify/delete): arch/cris/arch-v32/drivers/mach-fs/nandflash.c deleted in HEAD and modified in nand/nand/next. Version nand/nand/next of arch/cris/arch-v32/drivers/mach-fs/nandflash.c left in tree.
CONFLICT (modify/delete): arch/cris/arch-v32/drivers/mach-a3/nandflash.c deleted in HEAD and modified in nand/nand/next. Version nand/nand/next of arch/cris/arch-v32/drivers/mach-a3/nandflash.c left in tree.
$ git rm -f arch/cris/arch-v32/drivers/mach-a3/nandflash.c arch/cris/arch-v32/drivers/mach-fs/nandflash.c
Applying: mtd: nand: fix up for raw Kconfig move
Merging spi-nor/spi-nor/next (e8de85d5a107 dt-bindings: fsl-quadspi: Add the example of two SPI NOR)
Merging crypto/master (f444ec106407 crypto: ccree - remove unused enums)
CONFLICT (modify/delete): drivers/staging/ccree/Makefile deleted in HEAD and modified in crypto/master. Version crypto/master of drivers/staging/ccree/Makefile left in tree.
CONFLICT (modify/delete): drivers/staging/ccree/Kconfig deleted in HEAD and modified in crypto/master. Version crypto/master of drivers/staging/ccree/Kconfig left in tree.
$ git rm -f drivers/staging/ccree/Kconfig drivers/staging/ccree/Makefile
Merging drm/drm-next (694f54f680f7 Merge branch 'drm-misc-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (9f36f9c8eed8 Merge tag 'drm-amdkfd-next-2018-03-27' of git://people.freedesktop.org/~gabbayo/linux into drm-next)
Merging drm-tegra/drm/tegra/for-next (27e92f1f1600 drm/tegra: prime: Implement ->{begin,end}_cpu_access())
Merging drm-misc/for-linux-next (8cd1b5bd70cc ALSA: hda - Silence PM ops build warning)
Merging drm-msm/msm-next (288e5c8898c4 drm/msm: fix building without debugfs)
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (4a3928c6f8a5 Linux 4.16-rc3)
Merging etnaviv/etnaviv/next (4ed75c3e5255 drm/etnaviv: bump HW job limit to 4)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (2889312616ae Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next)
Merging sound/for-next (a820ccbe21e8 ALSA: pcm: Fix UAF at PCM release via PCM timer access)
Merging sound-asoc/for-next (445bb423f6a3 Merge remote-tracking branch 'asoc/topic/zx_aud96p22' into asoc-next)
Merging modules/modules-next (3f553b308bb0 module: propagate error in modules_open())
Merging input/next (adf313f41a0d Input: stmfts, s6sy761 - update my e-mail)
Merging block/for-next (667eea5d591b Merge branch 'for-4.17/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (856c5d438eff dm: remove fmode_t argument from .prepare_ioctl hook)
Applying: dm: merge fix for queue_flag_set_unlocked to blk_queue_flag_set API change
Merging mmc/next (4472f0fc248e mmc: renesas_sdhi: replace EXT_ACC with HOST_MODE)
Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy)
Merging md/for-next (3de59bb9d551 md/raid1: fix NULL pointer dereference)
Merging mfd/for-mfd-next (b45bf45f1b82 mfd: arizona: Update reset pin to use GPIOD)
Merging backlight/for-backlight-next (ea388d6cffd4 pwm-backlight: Add support for PWM delays proprieties.)
Merging battery/for-next (fd73a3e61888 power: reset: at91-reset: Switch from the pr_*() to the dev_*() logging functions)
Merging regulator/for-next (36fd679f45a2 Merge remote-tracking branches 'regulator/topic/88pg86x', 'regulator/topic/dt', 'regulator/topic/formatting' and 'regulator/topic/gpio' into regulator-next)
Merging security/next-testing (3f3122c1b84c Fixup after manual conflict merge, for testing only.)
Merging apparmor/apparmor-next (588558eb6d0e apparmor: fix memory leak on buffer on error exit path)
Merging integrity/next-integrity (ab60368ab6a4 ima: Fallback to the builtin hash algorithm)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (6b6bc6205d98 selinux: wrap AVC state)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
CONFLICT (content): Merge conflict in net/sctp/socket.c
CONFLICT (content): Merge conflict in include/linux/lsm_hooks.h
Merging tpmdd/next (2be8ffed093b tpm: fix intermittent failure with self tests)
Merging watchdog/master (1991a55dc87e Merge branch 'v4.17-rc1')
Merging iommu/next (d4f96fd5c249 Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (da9147140fe3 MAINTAINERS: vfio/platform: Update sub-maintainer)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (ea841bafda3f audit: add refused symlink to audit_names)
Merging devicetree/for-next (827473268ee4 of: unittest: fix an error code in of_unittest_apply_overlay())
Merging mailbox/mailbox-for-next (41c0e939d70d mailbox: Add support for Hi3660 mailbox)
Merging spi/for-next (0930437e8f9d Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sprd' and 'spi/topic/tegra20-slink' into spi-next)
Merging tip/auto-latest (f6512797fc28 Merge branch 'x86/urgent')
CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of Documentation/trace/ftrace.txt left in tree.
$ git rm -f Documentation/trace/ftrace.txt
Applying: perf/core: merge fix for "drivers/bus: Split Arm CCI driver"
Applying: perf/core: another merge fix for "drivers/bus: Split Arm CCI driver"
Applying: trace doc: merge fix for "tracing: Unify the "boot" and "mono" tracing clocks"
Merging clockevents/clockevents/next (0136c741ff40 clocksource/drivers/imx-tpm: Add different counter width support)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (6fd052665274 EDAC, sb_edac: Remove variable length array usage)
Merging irqchip/irq/irqchip-next (aa08192a254d irqchip/gic: Take lock when updating irq type)
Merging ftrace/for-next (80765597bc58 tracing: Rewrite filter logic to be simpler and faster)
CONFLICT (modify/delete): Documentation/trace/ftrace.txt deleted in HEAD and modified in ftrace/for-next. Version ftrace/for-next of Documentation/trace/ftrace.txt left in tree.
CONFLICT (content): Merge conflict in Documentation/trace/events.rst
$ git rm -f Documentation/trace/ftrace.txt
Applying: trace doc: merge fix for rst conversion of ftrace.txt
Merging rcu/rcu/next (338c46403f16 Merge branches 'fixes.2018.02.23a', 'srcu.2018.02.20a' and 'torture.2018.02.20a' into HEAD)
Merging kvm/linux-next (27aa8962817a Merge tag 'kvm-ppc-next-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc)
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
CONFLICT (content): Merge conflict in drivers/video/Kconfig
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/x86/kernel/kvm.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
Merging kvm-arm/next (dc6ed61d2f82 arm64: Add temporary ERRATA_MIDR_ALL_VERSIONS compatibility macro)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (31c8b0d0694a KVM: PPC: Book3S HV: Use __gfn_to_pfn_memslot() in page fault handler)
Merging kvms390/next (ccc40c53c07b KVM: s390: provide counters for all interrupt injects/delivery)
Merging xen-tip/linux-next (c37a3c947758 xen/acpi: off by one in read_acpi_id())
Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods)
Merging workqueues/for-next (1aa3798360db Merge branch 'for-4.17' into for-next)
Merging drivers-x86/for-next (7129707ec235 platform/x86: Fix dell driver init order)
Merging chrome-platform/for-next (3b7cedb42420 platform/chrome: cros_ec_lpc: Add support for Google devices using custom coreboot firmware)
Merging hsi/for-next (e3d7fbab062b HSI: hsi_char: Delete an error message for a failed memory allocation in hsc_probe())
Merging leds/for-next (92d7ec1d71e3 leds: Fix wrong dmi_match on PC Engines APU LEDs)
Merging ipmi/for-next (c6185e285c5c ipmi/parisc: Add IPMI chassis poweroff for certain HP PA-RISC and IA-64 servers)
Merging driver-core/driver-core-next (1fe56e0cafd7 drivers: base: remove check for callback in coredump_store())
Merging usb/usb-next (5267c5e09c25 Revert "USB: serial: ftdi_sio: add Id for Physik Instrumente E-870")
Merging usb-gadget/next (aaeab02ddcc8 usb/gadget: Add an EP dispose() callback for EP lifetime tracking)
Merging usb-serial/usb-next (79a0b33165d8 USB: serial: ftdi_sio: add Id for Physik Instrumente E-870)
Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53)
Merging phy-next/next (e7f4da4c44fe phy: tegra: xusb: Uncomment register write)
Merging tty/tty-next (4f794097797f serial: expose buf_overrun count through proc interface)
CONFLICT (content): Merge conflict in drivers/tty/hvc/Makefile
CONFLICT (content): Merge conflict in drivers/tty/hvc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih418-b2199.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410-b2260.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410-b2120.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih407-b2120.dts
Merging char-misc/char-misc-next (86f690e8bfd1 Merge tag 'stm-intel_th-for-greg-20180329' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next)
Merging extcon/extcon-next (eb7768e774d1 Merge branch 'ib-extcon-drm-dt-v4.17' into extcon-next)
Merging staging/staging-next (049b5e2ae30b staging: rtl8723bs: Remove yield call, replace with cond_resched())
Merging mux/for-next (fa934c06c0f4 mux: add mux_control_get_optional() API)
Merging slave-dma/next (d853f94a2da8 Merge branch 'topic/dw_axi' into next)
Merging cgroup/for-next (d1897c9538ed cgroup: fix rule checking for threaded mode switching)
Merging scsi/for-next (2e1f44f6ad80 Merge branch 'fixes' into misc)
CONFLICT (modify/delete): drivers/scsi/eata.c deleted in scsi/for-next and modified in HEAD. Version HEAD of drivers/scsi/eata.c left in tree.
$ git rm -f drivers/scsi/eata.c
Applying: scsi: qla2xxx: merge fix in qla_gs.c
Merging scsi-mkp/for-next (e5ad16982403 scsi: fnic: fix spelling mistake: "abord" -> "abort")
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging libata/for-next (d64c228ea181 Merge branch 'for-4.17' into for-next)
Merging vhost/linux-next (54939f252f97 fw_cfg: write vmcoreinfo details)
Merging rpmsg/for-next (1e2832764f26 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
CONFLICT (content): Merge conflict in samples/Makefile
Merging gpio/for-next (348f3cde84ab gpio: Add Spreadtrum PMIC EIC driver support)
Merging pinctrl/for-next (4fc97ef94bbf pinctrl: uniphier: add UART hardware flow control pin-mux settings)
Merging pinctrl-samsung/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging pwm/for-next (6873842235d6 pwm: rcar: Add suspend/resume support)
Merging userns/for-next (4be33329d46f m68k: Verify the offsets in struct siginfo never change.)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (6aa69043d9f3 selftests/intel_pstate: Fix build rule for x86)
Merging y2038/y2038 (ce380619fab9 Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next)
Merging coresight/next (7e7408725e0d coresight: use put_device() instead of kfree())
Merging rtc/rtc-next (1485991c0246 rtc: snvs: Fix usage of snvs_rtc_enable)
Merging nvdimm/libnvdimm-for-next (e0c19fad6c6c Merge branch 'for-4.17/dax' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.h
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging at24/at24/for-next (84e10623c0b9 dt-bindings: at24: add Renesas R1EX24128)
Merging ntb/ntb-next (53c3677c56c7 ntb: intel: change references of skx to gen3)
Merging kspp/for-next/kspp (0adb32858b0b Linux 4.16)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging akpm-current/current (3970218072c1 autofs4: use wake_up() instead of wake_up_interruptible)
CONFLICT (content): Merge conflict in mm/memory.c
CONFLICT (content): Merge conflict in fs/ocfs2/filecheck.c
CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs/dcache.c: add cond_resched() in shrink_dentry_list()
Applying: MAINTAINERS: update bouncing aacraid@adaptec.com addresses
Applying: kexec_file: make use of purgatory optional
Applying: kexec_file-make-an-use-of-purgatory-optional-fix
Applying: kexec_file,x86,powerpc: factor out kexec_file_ops functions
Applying: x86: kexec_file: purge system-ram walking from prepare_elf64_headers()
Applying: x86: kexec_file: remove X86_64 dependency from prepare_elf64_headers()
Applying: x86: kexec_file: lift CRASH_MAX_RANGES limit on crash_mem buffer
Applying: x86: kexec_file: clean up prepare_elf64_headers()
Applying: kexec_file, x86: move re-factored code to generic side
Applying: include/linux/kexec.h: silence compile warnings
Applying: kernel/kexec_file.c: remove checks in kexec_purgatory_load
Applying: kernel/kexec_file.c: make purgatory_info->ehdr const
Applying: kernel/kexec_file.c: search symbols in read-only kexec_purgatory
Applying: kernel/kexec_file.c: use read-only sections in arch_kexec_apply_relocations*
Applying: kernel/kexec_file.c: split up __kexec_load_puragory
Applying: kernel/kexec_file.c: remove unneeded for-loop in kexec_purgatory_setup_sechdrs
Applying: kernel/kexec_file.c: remove unneeded variables in kexec_purgatory_setup_sechdrs
Applying: kernel/kexec_file.c: remove mis-use of sh_offset field during purgatory load
Applying: kernel/kexec_file.c: allow archs to set purgatory load address
Applying: kernel/kexec_file.c: move purgatories sha256 to common code
Applying: kernel/kexec_file.c: add walk_system_ram_res_rev()
Applying: kernel/kexec_file.c: load kernel at top of system RAM if required
Applying: mm: introduce MAP_FIXED_NOREPLACE
Applying: fs, elf: drop MAP_FIXED usage from elf_map
Applying: elf: enforce MAP_FIXED on overlaying elf segments
Applying: xen, mm: allow deferred page initialization for xen pv domains
Applying: linux/const.h: prefix include guard of uapi/linux/const.h with _UAPI
Applying: linux/const.h: move UL() macro to include/linux/const.h
Applying: linux/const.h: refactor _BITUL and _BITULL a bit
Applying: mm: memcg: remote memcg charging for kmem allocations
Applying: mm: memcg: remote memcg charging for kmem allocations fix
Applying: fs: fsnotify: account fsnotify metadata to kmemcg
Applying: fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix
Applying: radix tree: use GFP_ZONEMASK bits of gfp_t for flags
Applying: mac80211_hwsim: use DEFINE_IDA
Applying: arm64: turn flush_dcache_mmap_lock into a no-op
Applying: unicore32: turn flush_dcache_mmap_lock into a no-op
Applying: export __set_page_dirty
Applying: fscache: use appropriate radix tree accessors
Applying: xarray: add the xa_lock to the radix_tree_root
Applying: page cache: use xa_lock
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Applying: sparc64: NG4 memset 32 bits overflow
Merging akpm/master (56c87c3878fd sparc64: NG4 memset 32 bits overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1355 bytes --]

Hi!

> Please do not add any v4.18 destined stuff to your linux-next included
> trees until after v4.17-rc1 has been released.
> 
> Changes since 20180403:
> 
> The vfs tree still had its build failure for which I reverted a commit.
> 
> Non-merge commits (relative to Linus' tree): 8505
>  8493 files changed, 392779 insertions(+), 275941 deletions(-)
> 
> ----------------------------------------------------------------------------

When trying to build kernel for N900, I get:

  CC      lib/timerqueue.o
    CC      lib/vsprintf.o
    lib/string.c: In function 'strstr':
    lib/string.c:478:8: error: inlining failed in call to
    always_inline 'strlen': function not inlinable
    lib/string.c:903:5: error: called from here
    lib/string.c:478:8: error: inlining failed in call to
    always_inline 'strlen': function not inlinable
    lib/string.c:906:5: error: called from here
    lib/string.c:855:15: error: inlining failed in call to
    always_inline 'memcmp': function not inlinable
    ...
pavel@duo:/data/l/linux-next-n900$ git branch -l
* (detached from next-20180403)

I'm using

eval ` eldk-switch.sh -r 5.4 armv7a`

for cross-compilation.

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

Hi!

> Please do not add any v4.18 destined stuff to your linux-next included
> trees until after v4.17-rc1 has been released.

On thinkpad x60, suspend does not suspend at all with this -next
version. Previous versions suspended/resumed fine but broke networking.

Any ideas? I guess bisecting on next would not be easy?

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Rafael J. Wysocki]

On Wed, Apr 4, 2018 at 9:50 AM, Pavel Machek <pavel@ucw.cz> wrote:
> Hi!
>
>> Please do not add any v4.18 destined stuff to your linux-next included
>> trees until after v4.17-rc1 has been released.
>
> On thinkpad x60, suspend does not suspend at all with this -next
> version. Previous versions suspended/resumed fine but broke networking.
>
> Any ideas? I guess bisecting on next would not be easy?

Well, why would it be different from a bisect on any other git repo?

Re: x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 980 bytes --]

On Wed 2018-04-04 09:58:17, Rafael J. Wysocki wrote:
> On Wed, Apr 4, 2018 at 9:50 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > Hi!
> >
> >> Please do not add any v4.18 destined stuff to your linux-next included
> >> trees until after v4.17-rc1 has been released.
> >
> > On thinkpad x60, suspend does not suspend at all with this -next
> > version. Previous versions suspended/resumed fine but broke networking.
> >
> > Any ideas? I guess bisecting on next would not be easy?
> 
> Well, why would it be different from a bisect on any other git repo?

Well, v4.16-rc4 is parent of v4.16-rc6, but next-20180304 is not
parent of next-20180307.

But you are right that if I do bisect between -linus and -next, it
should work.

Anyway, does s2ram work for you in -next? Are you testing 32bit?

Best regards,
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Tony Lindgren]

* Pavel Machek <pavel@ucw.cz> [180404 07:50]:
> Hi!
> 
> > Please do not add any v4.18 destined stuff to your linux-next included
> > trees until after v4.17-rc1 has been released.
> > 
> > Changes since 20180403:
> > 
> > The vfs tree still had its build failure for which I reverted a commit.
> > 
> > Non-merge commits (relative to Linus' tree): 8505
> >  8493 files changed, 392779 insertions(+), 275941 deletions(-)
> > 
> > ----------------------------------------------------------------------------
> 
> When trying to build kernel for N900, I get:
> 
>   CC      lib/timerqueue.o
>     CC      lib/vsprintf.o
>     lib/string.c: In function 'strstr':
>     lib/string.c:478:8: error: inlining failed in call to
>     always_inline 'strlen': function not inlinable
>     lib/string.c:903:5: error: called from here
>     lib/string.c:478:8: error: inlining failed in call to
>     always_inline 'strlen': function not inlinable
>     lib/string.c:906:5: error: called from here
>     lib/string.c:855:15: error: inlining failed in call to
>     always_inline 'memcmp': function not inlinable
>     ...
> pavel@duo:/data/l/linux-next-n900$ git branch -l
> * (detached from next-20180403)
> 
> I'm using
> 
> eval ` eldk-switch.sh -r 5.4 armv7a`
> 
> for cross-compilation.

Hmm I'm not seeing build issues with next-20180404, did this somehow
already get sorted out?

Regards,

Tony

Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1952 bytes --]

Hi!

> > > Please do not add any v4.18 destined stuff to your linux-next included
> > > trees until after v4.17-rc1 has been released.
> > > 
> > > Changes since 20180403:
> > > 
> > > The vfs tree still had its build failure for which I reverted a commit.
> > > 
> > > Non-merge commits (relative to Linus' tree): 8505
> > >  8493 files changed, 392779 insertions(+), 275941 deletions(-)
> > > 
> > > ----------------------------------------------------------------------------
> > 
> > When trying to build kernel for N900, I get:
> > 
> >   CC      lib/timerqueue.o
> >     CC      lib/vsprintf.o
> >     lib/string.c: In function 'strstr':
> >     lib/string.c:478:8: error: inlining failed in call to
> >     always_inline 'strlen': function not inlinable
> >     lib/string.c:903:5: error: called from here
> >     lib/string.c:478:8: error: inlining failed in call to
> >     always_inline 'strlen': function not inlinable
> >     lib/string.c:906:5: error: called from here
> >     lib/string.c:855:15: error: inlining failed in call to
> >     always_inline 'memcmp': function not inlinable
> >     ...
> > pavel@duo:/data/l/linux-next-n900$ git branch -l
> > * (detached from next-20180403)
> > 
> > I'm using
> > 
> > eval ` eldk-switch.sh -r 5.4 armv7a`
> > 
> > for cross-compilation.
> 
> Hmm I'm not seeing build issues with next-20180404, did this somehow
> already get sorted out?

Let me check...

  CC      lib/vsprintf.o
  lib/string.c: In function 'strstr':
  lib/string.c:478:8: error: inlining failed in call to always_inline
  'strlen': function not inlinable

Same problem.

pavel@duo:~$ eval ` eldk-switch.sh -r 5.4 armv7a`
pavel@duo:~$ arm-linux-gnueabi-gcc --version
arm-linux-gnueabi-gcc (GCC) 4.7.2

Best regards,								Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1.1: Type: text/plain, Size: 1220 bytes --]

Hi!

> > When trying to build kernel for N900, I get:
> > 
> >   CC      lib/timerqueue.o
> >     CC      lib/vsprintf.o
> >     lib/string.c: In function 'strstr':
> >     lib/string.c:478:8: error: inlining failed in call to
> >     always_inline 'strlen': function not inlinable
> >     lib/string.c:903:5: error: called from here
> >     lib/string.c:478:8: error: inlining failed in call to
> >     always_inline 'strlen': function not inlinable
> >     lib/string.c:906:5: error: called from here
> >     lib/string.c:855:15: error: inlining failed in call to
> >     always_inline 'memcmp': function not inlinable
> >     ...
> > pavel@duo:/data/l/linux-next-n900$ git branch -l
> > * (detached from next-20180403)
> > 
> > I'm using
> > 
> > eval ` eldk-switch.sh -r 5.4 armv7a`
> > 
> > for cross-compilation.
> 
> Hmm I'm not seeing build issues with next-20180404, did this somehow
> already get sorted out?

It seems it is config-dependend. omap2plus_defconfig compiles ok for
me.

Can you try with attached .config?

									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #1.2: config.ok.gz --]
[-- Type: application/gzip, Size: 25181 bytes --]

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Tony Lindgren]

* Pavel Machek <pavel@ucw.cz> [180404 18:47]:
> Hi!
> 
> > > When trying to build kernel for N900, I get:
> > > 
> > >   CC      lib/timerqueue.o
> > >     CC      lib/vsprintf.o
> > >     lib/string.c: In function 'strstr':
> > >     lib/string.c:478:8: error: inlining failed in call to
> > >     always_inline 'strlen': function not inlinable
> > >     lib/string.c:903:5: error: called from here
> > >     lib/string.c:478:8: error: inlining failed in call to
> > >     always_inline 'strlen': function not inlinable
> > >     lib/string.c:906:5: error: called from here
> > >     lib/string.c:855:15: error: inlining failed in call to
> > >     always_inline 'memcmp': function not inlinable
> > >     ...
> > > pavel@duo:/data/l/linux-next-n900$ git branch -l
> > > * (detached from next-20180403)
> > > 
> > > I'm using
> > > 
> > > eval ` eldk-switch.sh -r 5.4 armv7a`
> > > 
> > > for cross-compilation.
> > 
> > Hmm I'm not seeing build issues with next-20180404, did this somehow
> > already get sorted out?
> 
> It seems it is config-dependend. omap2plus_defconfig compiles ok for
> me.
> 
> Can you try with attached .config?

That still builds for me. This with plain gcc-7.3.0 binutils-2.30
built with buildall script.

Regards,

Tony

FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 2916 bytes --]

On Wed 2018-04-04 12:59:51, Tony Lindgren wrote:
> * Pavel Machek <pavel@ucw.cz> [180404 18:47]:
> > Hi!
> > 
> > > > When trying to build kernel for N900, I get:
> > > > 
> > > >   CC      lib/timerqueue.o
> > > >     CC      lib/vsprintf.o
> > > >     lib/string.c: In function 'strstr':
> > > >     lib/string.c:478:8: error: inlining failed in call to
> > > >     always_inline 'strlen': function not inlinable
> > > >     lib/string.c:903:5: error: called from here
> > > >     lib/string.c:478:8: error: inlining failed in call to
> > > >     always_inline 'strlen': function not inlinable
> > > >     lib/string.c:906:5: error: called from here
> > > >     lib/string.c:855:15: error: inlining failed in call to
> > > >     always_inline 'memcmp': function not inlinable
> > > >     ...
> > > > pavel@duo:/data/l/linux-next-n900$ git branch -l
> > > > * (detached from next-20180403)
> > > > 
> > > > I'm using
> > > > 
> > > > eval ` eldk-switch.sh -r 5.4 armv7a`
> > > > 
> > > > for cross-compilation.
> > > 
> > > Hmm I'm not seeing build issues with next-20180404, did this somehow
> > > already get sorted out?
> > 
> > It seems it is config-dependend. omap2plus_defconfig compiles ok for
> > me.
> > 
> > Can you try with attached .config?
> 
> That still builds for me. This with plain gcc-7.3.0 binutils-2.30
> built with buildall script.

Thanks.

Ok, let me try to bisect it. Compile-problem should be easy...

Hmm. And as it is compile-problem in single file, it should even be
reasonably fast. I did not realize how easy it would be:

#!/bin/bash
set -e
cp config.ok .config
yes '' | ARCH=arm make lib/string.o

And the winner is:

ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
commit ee333554fed55555a986a90bb097ac7f9d6f05bf
Author: Jinbum Park <jinb.park7@gmail.com>
Date:   Tue Mar 6 01:39:24 2018 +0100

    ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE

    CONFIG_FORTIFY_SOURCE detects various overflows at compile-time.
        (6974f0c4555e ("include/linux/string.h:
    add the option of fortified string.h functions)
    
    ARCH_HAS_FORTIFY_SOURCE means that the architecture can be built
    and
    run with CONFIG_FORTIFY_SOURCE.
    
    Since ARM can be built and run with that flag like other
    architectures,
    select ARCH_HAS_FORTIFY_SOURCE as default.
    
    Acked-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

:040000 040000 2bff2f75ba36dd838a8ded3028b745d9f13f4c4a
									e61289e33a1fb71b1a6c05c442d45ea40bd5aba0
									M
									arch
bisect run success
pavel@duo:/data/l/linux-next-n900$ 


									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

update-binfmts breaking suspend was Re: x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 2017 bytes --]

On Wed 2018-04-04 10:49:05, Pavel Machek wrote:
> On Wed 2018-04-04 09:58:17, Rafael J. Wysocki wrote:
> > On Wed, Apr 4, 2018 at 9:50 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > > Hi!
> > >
> > >> Please do not add any v4.18 destined stuff to your linux-next included
> > >> trees until after v4.17-rc1 has been released.
> > >
> > > On thinkpad x60, suspend does not suspend at all with this -next
> > > version. Previous versions suspended/resumed fine but broke networking.
> > >
> > > Any ideas? I guess bisecting on next would not be easy?
> > 
> > Well, why would it be different from a bisect on any other git repo?
> 
> Well, v4.16-rc4 is parent of v4.16-rc6, but next-20180304 is not
> parent of next-20180307.
> 
> But you are right that if I do bisect between -linus and -next, it
> should work.
> 
> Anyway, does s2ram work for you in -next? Are you testing 32bit?

Hmm. I tested on T40p. That works ok, so at least some 32bit machines
do work.

Hmm, and my test scripts were wrong.

Failure is not a hang, as they expect, but... machine locks up, but
does not suspend, and then continues running after a delay..

[   35.038766] PM: Syncing filesystems ... done.
[   35.051246] Freezing user space processes ...
[   55.060528] Freezing of tasks failed after 20.009 seconds (1 tasks
refusing to freeze, wq_busy
=0):
[   55.060552] update-binfmts  D    0  2727      1 0x80000004
[   55.060576] Call Trace:
[   55.060600]  __schedule+0x37a/0x7e0
[   55.060618]  schedule+0x29/0x70
[   55.060635]  autofs4_wait+0x359/0x7a0
[   55.060653]  ? wait_woken+0x70/0x70
[   55.060668]  autofs4_mount_wait+0x4a/0xe0
[   55.060684]  ? autofs4_mount_wait+0x4a/0xe0
[   55.060699]  autofs4_d_automount+0xe0/0x200
[   55.060715]  ? autofs4_d_automount+0xe0/0x200

Did the rework of freezing start already in -next?


									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: update-binfmts breaking suspend was Re: x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 2226 bytes --]

Hi!

> > Well, v4.16-rc4 is parent of v4.16-rc6, but next-20180304 is not
> > parent of next-20180307.
> > 
> > But you are right that if I do bisect between -linus and -next, it
> > should work.
> > 
> > Anyway, does s2ram work for you in -next? Are you testing 32bit?
> 
> Hmm. I tested on T40p. That works ok, so at least some 32bit machines
> do work.
> 
> Hmm, and my test scripts were wrong.
> 
> Failure is not a hang, as they expect, but... machine locks up, but
> does not suspend, and then continues running after a delay..
> 
> [   35.038766] PM: Syncing filesystems ... done.
> [   35.051246] Freezing user space processes ...
> [   55.060528] Freezing of tasks failed after 20.009 seconds (1 tasks
> refusing to freeze, wq_busy
> =0):
> [   55.060552] update-binfmts  D    0  2727      1 0x80000004
> [   55.060576] Call Trace:
> [   55.060600]  __schedule+0x37a/0x7e0
> [   55.060618]  schedule+0x29/0x70
> [   55.060635]  autofs4_wait+0x359/0x7a0
> [   55.060653]  ? wait_woken+0x70/0x70
> [   55.060668]  autofs4_mount_wait+0x4a/0xe0
> [   55.060684]  ? autofs4_mount_wait+0x4a/0xe0
> [   55.060699]  autofs4_d_automount+0xe0/0x200
> [   55.060715]  ? autofs4_d_automount+0xe0/0x200
> 
> Did the rework of freezing start already in -next?

Hmm, so I did git bisect, and it pointed to:

commit 7cb03edf112fea6ead2fcd3c5fd639756d6d114b
Author: Matthew Wilcox <mawilcox@microsoft.com>
Date:   Thu Mar 29 10:15:17 2018 +1100

    autofs4: use wait_event_killable

    This playing with signals to allow only fatal signals appears to
    predate
        the introduction of wait_event_killable(), and I'm fairly sure
    that
        wait_event_killable is what was meant to happen here.

    Link:
    http://lkml.kernel.org/r/20180319191609.23880-1-willy@infradead.org
        Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
	    Acked-by: Ian Kent <raven@themaw.net>
	        Signed-off-by: Andrew Morton
    <akpm@linux-foundation.org>
        Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
	



-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: update-binfmts breaking suspend was Re: x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Rafael J. Wysocki]

On Thursday, April 5, 2018 10:30:45 PM CEST Pavel Machek wrote:
> Hi!
> 
> > > Well, v4.16-rc4 is parent of v4.16-rc6, but next-20180304 is not
> > > parent of next-20180307.
> > > 
> > > But you are right that if I do bisect between -linus and -next, it
> > > should work.
> > > 
> > > Anyway, does s2ram work for you in -next? Are you testing 32bit?
> > 
> > Hmm. I tested on T40p. That works ok, so at least some 32bit machines
> > do work.
> > 
> > Hmm, and my test scripts were wrong.
> > 
> > Failure is not a hang, as they expect, but... machine locks up, but
> > does not suspend, and then continues running after a delay..
> > 
> > [   35.038766] PM: Syncing filesystems ... done.
> > [   35.051246] Freezing user space processes ...
> > [   55.060528] Freezing of tasks failed after 20.009 seconds (1 tasks
> > refusing to freeze, wq_busy
> > =0):
> > [   55.060552] update-binfmts  D    0  2727      1 0x80000004
> > [   55.060576] Call Trace:
> > [   55.060600]  __schedule+0x37a/0x7e0
> > [   55.060618]  schedule+0x29/0x70
> > [   55.060635]  autofs4_wait+0x359/0x7a0
> > [   55.060653]  ? wait_woken+0x70/0x70
> > [   55.060668]  autofs4_mount_wait+0x4a/0xe0
> > [   55.060684]  ? autofs4_mount_wait+0x4a/0xe0
> > [   55.060699]  autofs4_d_automount+0xe0/0x200
> > [   55.060715]  ? autofs4_d_automount+0xe0/0x200
> > 
> > Did the rework of freezing start already in -next?
> 
> Hmm, so I did git bisect, and it pointed to:
> 
> commit 7cb03edf112fea6ead2fcd3c5fd639756d6d114b
> Author: Matthew Wilcox <mawilcox@microsoft.com>
> Date:   Thu Mar 29 10:15:17 2018 +1100
> 
>     autofs4: use wait_event_killable
> 
>     This playing with signals to allow only fatal signals appears to
>     predate
>         the introduction of wait_event_killable(), and I'm fairly sure
>     that
>         wait_event_killable is what was meant to happen here.
> 
>     Link:
>     http://lkml.kernel.org/r/20180319191609.23880-1-willy@infradead.org
>         Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
> 	    Acked-by: Ian Kent <raven@themaw.net>
> 	        Signed-off-by: Andrew Morton
>     <akpm@linux-foundation.org>
>         Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Well, let's tell Thorsten about this (CCed).

Re: x32 suspend failuer in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

On Wed 2018-04-04 09:50:47, Pavel Machek wrote:
> Hi!
> 
> > Please do not add any v4.18 destined stuff to your linux-next included
> > trees until after v4.17-rc1 has been released.
> 
> On thinkpad x60, suspend does not suspend at all with this -next
> version. Previous versions suspended/resumed fine but broke networking.

I bisected networking breakage to

c16add24522547bf52c189b3c0d1ab6f5c2b4375

which is slightly weird. But it modifies ACPI in strange way, so maybe
not that weird.

Networking breakage is still in next-20180406.

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: update-binfmts breaking suspend

[Matthew Wilcox]

Ping?

On Fri, Apr 06, 2018 at 07:43:55AM -0700, Matthew Wilcox wrote:
> Pavel Machek <pavel@ucw.cz> wrote:
> > > Failure is not a hang, as they expect, but... machine locks up, but
> > > does not suspend, and then continues running after a delay..
> > > 
> > > [   35.038766] PM: Syncing filesystems ... done.
> > > [   35.051246] Freezing user space processes ...
> > > [   55.060528] Freezing of tasks failed after 20.009 seconds (1 tasks
> > > refusing to freeze, wq_busy
> > > =0):
> > > [   55.060552] update-binfmts  D    0  2727      1 0x80000004
> > > [   55.060576] Call Trace:
> > > [   55.060600]  __schedule+0x37a/0x7e0
> > > [   55.060618]  schedule+0x29/0x70
> > > [   55.060635]  autofs4_wait+0x359/0x7a0
> > > [   55.060653]  ? wait_woken+0x70/0x70
> > > [   55.060668]  autofs4_mount_wait+0x4a/0xe0
> > > [   55.060684]  ? autofs4_mount_wait+0x4a/0xe0
> > > [   55.060699]  autofs4_d_automount+0xe0/0x200
> > > [   55.060715]  ? autofs4_d_automount+0xe0/0x200
> > > 
> > > Did the rework of freezing start already in -next?
> > 
> > Hmm, so I did git bisect, and it pointed to:
> > 
> > commit 7cb03edf112fea6ead2fcd3c5fd639756d6d114b
> > Author: Matthew Wilcox <mawilcox@microsoft.com>
> > Date:   Thu Mar 29 10:15:17 2018 +1100
> > 
> >     autofs4: use wait_event_killable
> > 
> >     This playing with signals to allow only fatal signals appears to
> >     predate
> >         the introduction of wait_event_killable(), and I'm fairly sure
> >     that
> >         wait_event_killable is what was meant to happen here.
> 
> Umm.  I'm not familiar with the freezer.  Help me out here ...
> 
> I see the message coming from here:
> 
>                 pr_err("Freezing of tasks %s after %d.%03d seconds "
>                        "(%d tasks refusing to freeze, wq_busy=%d):\n",
>                        wakeup ? "aborted" : "failed",
>                        elapsed_msecs / 1000, elapsed_msecs % 1000,
>                        todo - wq_busy, wq_busy);
> 
> and then backtracking in that function, I see this:
> 
>                 for_each_process_thread(g, p) {
>                         if (p == current || !freeze_task(p))
>                                 continue;
> 
> in freeze_task(), I see this:
> 
>         if (!(p->flags & PF_KTHREAD))
>                 fake_signal_wake_up(p);
>         else
>                 wake_up_state(p, TASK_INTERRUPTIBLE);
> 
> which does this:
> 
>         if (lock_task_sighand(p, &flags)) {
>                 signal_wake_up(p, 0);
>                 unlock_task_sighand(p, &flags);
>         }
> 
> which does this:
> 
> static inline void signal_wake_up(struct task_struct *t, bool resume)
> {
>         signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0);
> }
> 
> which does this:
> 
> void signal_wake_up_state(struct task_struct *t, unsigned int state)
> {
>         set_tsk_thread_flag(t, TIF_SIGPENDING);
>         /*
>          * TASK_WAKEKILL also means wake it up in the stopped/traced/killable
>          * case. We don't check t->state here because there is a race with it
>          * executing another processor and just now entering stopped state.
>          * By using wake_up_state, we ensure the process will wake up and
>          * handle its death signal.
>          */
>         if (!wake_up_state(t, state | TASK_INTERRUPTIBLE))
>                 kick_process(t);
> }
> 
> Now I don't know why we only wake interruptible tasks here and not killable
> tasks.  I've trawled git history all the way back to 2.6.12-rc2, and the
> reasoning behind signal_wake_up() (as it originally was) is lost to pre-git
> history.
> 
> So ... why do we only wake interruptible tasks on suspend?  Why not wake
> uninterruptible tasks too?
> 
>         if (lock_task_sighand(p, &flags)) {
> -               signal_wake_up(p, 0);
> +               signal_wake_up_state(p, TASK_WAKEKILL);
>                 unlock_task_sighand(p, &flags);
>         }
> 
> or why do we consider tasks waiting uninterruptibly to block freezing?
> Is it because they're (probably) waiting for I/O and we want the I/O
> to complete?

Re: update-binfmts breaking suspend

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

Hi!

> Ping?

See the thread... akpm pointed out fix for autofs, and the problem is
gone with newer -next kernels, so I assume the fix fixes it :-).

								Pavel
								
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

Hi!

> Thanks.
> 
> Ok, let me try to bisect it. Compile-problem should be easy...
> 
> Hmm. And as it is compile-problem in single file, it should even be
> reasonably fast. I did not realize how easy it would be:
> 
> #!/bin/bash
> set -e
> cp config.ok .config
> yes '' | ARCH=arm make lib/string.o
> 
> And the winner is:
> 
> ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
> commit ee333554fed55555a986a90bb097ac7f9d6f05bf
> Author: Jinbum Park <jinb.park7@gmail.com>
> Date:   Tue Mar 6 01:39:24 2018 +0100
...

>     Acked-by: Kees Cook <keescook@chromium.org>
>     Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
>     Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

So I bisect a problem in -next, and patch is merged to Linus,
_anyway_, breaking compilation there? Neither Jinbum nor Russell even
bother to comment.

And BTW, Russell, there's another regression I bisected to your
commit, that one is like two releases old, and "only" causes
compilation warnings during build with non-US locale. I even proposed
fix for that. Guess what? Ignored too.


									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Kees Cook]

On Sun, Apr 15, 2018 at 10:39 AM, Pavel Machek <pavel@ucw.cz> wrote:
> Hi!
>
>> Thanks.
>>
>> Ok, let me try to bisect it. Compile-problem should be easy...
>>
>> Hmm. And as it is compile-problem in single file, it should even be
>> reasonably fast. I did not realize how easy it would be:
>>
>> #!/bin/bash
>> set -e
>> cp config.ok .config
>> yes '' | ARCH=arm make lib/string.o
>>
>> And the winner is:
>>
>> ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
>> commit ee333554fed55555a986a90bb097ac7f9d6f05bf
>> Author: Jinbum Park <jinb.park7@gmail.com>
>> Date:   Tue Mar 6 01:39:24 2018 +0100
> ...
>
>>     Acked-by: Kees Cook <keescook@chromium.org>
>>     Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
>>     Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
>
> So I bisect a problem in -next, and patch is merged to Linus,
> _anyway_, breaking compilation there? Neither Jinbum nor Russell even
> bother to comment.

Hi! Sorry I lost this email in my inbox. It seems this is specific to
a particular subset of arm architectures? (My local builds of arm all
succeed, for example. Can you send your failing config?) I'll take a
closer look on Monday if Daniel doesn't beat me to it.

-Kees

>
> And BTW, Russell, there's another regression I bisected to your
> commit, that one is like two releases old, and "only" causes
> compilation warnings during build with non-US locale. I even proposed
> fix for that. Guess what? Ignored too.
>
>
>                                                                         Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html



-- 
Kees Cook
Pixel Security

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]

On Sun 2018-04-15 11:00:06, Kees Cook wrote:
> On Sun, Apr 15, 2018 at 10:39 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > Hi!
> >
> >> Thanks.
> >>
> >> Ok, let me try to bisect it. Compile-problem should be easy...
> >>
> >> Hmm. And as it is compile-problem in single file, it should even be
> >> reasonably fast. I did not realize how easy it would be:
> >>
> >> #!/bin/bash
> >> set -e
> >> cp config.ok .config
> >> yes '' | ARCH=arm make lib/string.o
> >>
> >> And the winner is:
> >>
> >> ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
> >> commit ee333554fed55555a986a90bb097ac7f9d6f05bf
> >> Author: Jinbum Park <jinb.park7@gmail.com>
> >> Date:   Tue Mar 6 01:39:24 2018 +0100
> > ...
> >
> >>     Acked-by: Kees Cook <keescook@chromium.org>
> >>     Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
> >>     Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
> >
> > So I bisect a problem in -next, and patch is merged to Linus,
> > _anyway_, breaking compilation there? Neither Jinbum nor Russell even
> > bother to comment.
> 
> Hi! Sorry I lost this email in my inbox. It seems this is specific to
> a particular subset of arm architectures? (My local builds of arm all
> succeed, for example. Can you send your failing config?) I'll take a
> closer look on Monday if Daniel doesn't beat me to it.

I believe it depends on gcc version really. I should get some sleep
now, but details should be in the corresponding thread on lkml.

I'll send you my .config privately.
								Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]

On Sun 2018-04-15 11:00:06, Kees Cook wrote:
> On Sun, Apr 15, 2018 at 10:39 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > Hi!
> >
> >> Thanks.
> >>
> >> Ok, let me try to bisect it. Compile-problem should be easy...
> >>
> >> Hmm. And as it is compile-problem in single file, it should even be
> >> reasonably fast. I did not realize how easy it would be:
> >>
> >> #!/bin/bash
> >> set -e
> >> cp config.ok .config
> >> yes '' | ARCH=arm make lib/string.o
> >>
> >> And the winner is:
> >>
> >> ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
> >> commit ee333554fed55555a986a90bb097ac7f9d6f05bf
> >> Author: Jinbum Park <jinb.park7@gmail.com>
> >> Date:   Tue Mar 6 01:39:24 2018 +0100
> > ...
> >
> >>     Acked-by: Kees Cook <keescook@chromium.org>
> >>     Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
> >>     Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
> >
> > So I bisect a problem in -next, and patch is merged to Linus,
> > _anyway_, breaking compilation there? Neither Jinbum nor Russell even
> > bother to comment.
> 
> Hi! Sorry I lost this email in my inbox. It seems this is specific to
> a particular subset of arm architectures? (My local builds of arm all
> succeed, for example. Can you send your failing config?) I'll take a
> closer look on Monday if Daniel doesn't beat me to it.

Daniel, Kees: any news?

I'm aware you did not specify which Monday :-).
									Pavel
									
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Kees Cook]

On Fri, Apr 20, 2018 at 12:34 AM, Pavel Machek <pavel@ucw.cz> wrote:
> On Sun 2018-04-15 11:00:06, Kees Cook wrote:
>> On Sun, Apr 15, 2018 at 10:39 AM, Pavel Machek <pavel@ucw.cz> wrote:
>> > Hi!
>> >
>> >> Thanks.
>> >>
>> >> Ok, let me try to bisect it. Compile-problem should be easy...
>> >>
>> >> Hmm. And as it is compile-problem in single file, it should even be
>> >> reasonably fast. I did not realize how easy it would be:
>> >>
>> >> #!/bin/bash
>> >> set -e
>> >> cp config.ok .config
>> >> yes '' | ARCH=arm make lib/string.o
>> >>
>> >> And the winner is:
>> >>
>> >> ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
>> >> commit ee333554fed55555a986a90bb097ac7f9d6f05bf
>> >> Author: Jinbum Park <jinb.park7@gmail.com>
>> >> Date:   Tue Mar 6 01:39:24 2018 +0100
>> > ...
>> >
>> >>     Acked-by: Kees Cook <keescook@chromium.org>
>> >>     Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
>> >>     Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
>> >
>> > So I bisect a problem in -next, and patch is merged to Linus,
>> > _anyway_, breaking compilation there? Neither Jinbum nor Russell even
>> > bother to comment.
>>
>> Hi! Sorry I lost this email in my inbox. It seems this is specific to
>> a particular subset of arm architectures? (My local builds of arm all
>> succeed, for example. Can you send your failing config?) I'll take a
>> closer look on Monday if Daniel doesn't beat me to it.
>
> Daniel, Kees: any news?
>
> I'm aware you did not specify which Monday :-).

Hi! Sorry, I got distracted. So the .config you sent me builds fine
with my cross compiler. I suspect this is something specific to ELDK's
compiler. I can try some other compiler versions. What version of gcc
is failing?

-Kees

-- 
Kees Cook
Pixel Security

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Russell King - ARM Linux]

On Fri, Apr 20, 2018 at 08:05:17AM -0700, Kees Cook wrote:
> On Fri, Apr 20, 2018 at 12:34 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > On Sun 2018-04-15 11:00:06, Kees Cook wrote:
> >> On Sun, Apr 15, 2018 at 10:39 AM, Pavel Machek <pavel@ucw.cz> wrote:
> >> > Hi!
> >> >
> >> >> Thanks.
> >> >>
> >> >> Ok, let me try to bisect it. Compile-problem should be easy...
> >> >>
> >> >> Hmm. And as it is compile-problem in single file, it should even be
> >> >> reasonably fast. I did not realize how easy it would be:
> >> >>
> >> >> #!/bin/bash
> >> >> set -e
> >> >> cp config.ok .config
> >> >> yes '' | ARCH=arm make lib/string.o
> >> >>
> >> >> And the winner is:
> >> >>
> >> >> ee333554fed55555a986a90bb097ac7f9d6f05bf is the first bad commit
> >> >> commit ee333554fed55555a986a90bb097ac7f9d6f05bf
> >> >> Author: Jinbum Park <jinb.park7@gmail.com>
> >> >> Date:   Tue Mar 6 01:39:24 2018 +0100
> >> > ...
> >> >
> >> >>     Acked-by: Kees Cook <keescook@chromium.org>
> >> >>     Signed-off-by: Jinbum Park <jinb.park7@gmail.com>
> >> >>     Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
> >> >
> >> > So I bisect a problem in -next, and patch is merged to Linus,
> >> > _anyway_, breaking compilation there? Neither Jinbum nor Russell even
> >> > bother to comment.
> >>
> >> Hi! Sorry I lost this email in my inbox. It seems this is specific to
> >> a particular subset of arm architectures? (My local builds of arm all
> >> succeed, for example. Can you send your failing config?) I'll take a
> >> closer look on Monday if Daniel doesn't beat me to it.
> >
> > Daniel, Kees: any news?
> >
> > I'm aware you did not specify which Monday :-).
> 
> Hi! Sorry, I got distracted. So the .config you sent me builds fine
> with my cross compiler. I suspect this is something specific to ELDK's
> compiler. I can try some other compiler versions. What version of gcc
> is failing?

Hi Kees,

We know it works fine with:

linux-next's gcc 4.6.3 + binutils 2.22
my gcc 4.7.4 + binutils 2.25
kernelci.org's Linaro GCC 5.3-2016.05 toolchain (gcc 5.3.1 20160412)
Tony's using gcc 7.3.0 + binutils 2.30
Arnd's using mostly gcc 8.0.1 + binutils 2.29
What-ever toolchain Olof's autobuilder is using

which is quite a spread of versions, both binutils and gcc, and they
all work.  The autobuilders plus Arnd's are regularly verifying lots
of kernel trees (including my own) with lots of configurations, and
the identified patch has not reproduced this compile failure there.

Searching google for:

lib/string.c "error: inlining failed in call to always_inline 'strlen': function not inlinable"

gives me only three hits on mail-archive.com for this, all of them
are Pavel's email or a reply to it.  There appears to be no other
reports of compile failure anywhere else on the google-crawled
Internet.

There appears to be no information readily available as to what
compiler versions each ELDK version contains (see
http://www.denx.de/wiki/view/ELDK-5) so providing the eldk-switch
command to us gives us no useful information.

I think more information about Pavel's setup is needed, including:

* compiler version
* environment (any kernel build specific environment variables set?)
* exact make command line

Maybe even showing the exact command used by kbuild to invoke the
C compiler for lib/string.c.

It could simply be a bug in the ELDK GCC version that Pavel's using.
Could it be that DENX have patched gcc for ELDK and subtly broken
it?  We all know distros like to apply patches to packages.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1396 bytes --]

Hi!

> >> Hi! Sorry I lost this email in my inbox. It seems this is specific to
> >> a particular subset of arm architectures? (My local builds of arm all
> >> succeed, for example. Can you send your failing config?) I'll take a
> >> closer look on Monday if Daniel doesn't beat me to it.
> >
> > Daniel, Kees: any news?
> >
> > I'm aware you did not specify which Monday :-).
> 
> Hi! Sorry, I got distracted. So the .config you sent me builds fine
> with my cross compiler. I suspect this is something specific to ELDK's
> compiler. I can try some other compiler versions. What version of gcc
> is failing?

I have:

pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-gcc --version
arm-linux-gnueabi-gcc (GCC) 4.7.2
Copyright (C) 2012 Free Software Foundation, Inc.
pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-ld --version
GNU ld (GNU Binutils) 2.23.1.20121113
Copyright 2012 Free Software Foundation, Inc.

Let me try with eldk-5.6:

pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-gcc --version
arm-linux-gnueabi-gcc (GCC) 4.8.2
pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-ld --version
GNU ld (GNU Binutils) 2.24

make  lib/string.o

Seems to succeed, so I guess full build will succeed, too...

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Daniel Micay]

On 20 April 2018 at 15:15, Pavel Machek <pavel@ucw.cz> wrote:
> Hi!
>
>> >> Hi! Sorry I lost this email in my inbox. It seems this is specific to
>> >> a particular subset of arm architectures? (My local builds of arm all
>> >> succeed, for example. Can you send your failing config?) I'll take a
>> >> closer look on Monday if Daniel doesn't beat me to it.
>> >
>> > Daniel, Kees: any news?
>> >
>> > I'm aware you did not specify which Monday :-).
>>
>> Hi! Sorry, I got distracted. So the .config you sent me builds fine
>> with my cross compiler. I suspect this is something specific to ELDK's
>> compiler. I can try some other compiler versions. What version of gcc
>> is failing?
>
> I have:
>
> pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-gcc --version
> arm-linux-gnueabi-gcc (GCC) 4.7.2
> Copyright (C) 2012 Free Software Foundation, Inc.
> pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-ld --version
> GNU ld (GNU Binutils) 2.23.1.20121113
> Copyright 2012 Free Software Foundation, Inc.
>
> Let me try with eldk-5.6:
>
> pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-gcc --version
> arm-linux-gnueabi-gcc (GCC) 4.8.2
> pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-ld --version
> GNU ld (GNU Binutils) 2.24
>
> make  lib/string.o
>
> Seems to succeed, so I guess full build will succeed, too...

It doesn't imply that a full build would work.

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]

On Fri 2018-04-20 15:18:32, Daniel Micay wrote:
> On 20 April 2018 at 15:15, Pavel Machek <pavel@ucw.cz> wrote:
> > Hi!
> >
> >> >> Hi! Sorry I lost this email in my inbox. It seems this is specific to
> >> >> a particular subset of arm architectures? (My local builds of arm all
> >> >> succeed, for example. Can you send your failing config?) I'll take a
> >> >> closer look on Monday if Daniel doesn't beat me to it.
> >> >
> >> > Daniel, Kees: any news?
> >> >
> >> > I'm aware you did not specify which Monday :-).
> >>
> >> Hi! Sorry, I got distracted. So the .config you sent me builds fine
> >> with my cross compiler. I suspect this is something specific to ELDK's
> >> compiler. I can try some other compiler versions. What version of gcc
> >> is failing?
> >
> > I have:
> >
> > pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-gcc --version
> > arm-linux-gnueabi-gcc (GCC) 4.7.2
> > Copyright (C) 2012 Free Software Foundation, Inc.
> > pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-ld --version
> > GNU ld (GNU Binutils) 2.23.1.20121113
> > Copyright 2012 Free Software Foundation, Inc.
> >
> > Let me try with eldk-5.6:
> >
> > pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-gcc --version
> > arm-linux-gnueabi-gcc (GCC) 4.8.2
> > pavel@duo:/data/l/linux-n900$ arm-linux-gnueabi-ld --version
> > GNU ld (GNU Binutils) 2.24
> >
> > make  lib/string.o
> >
> > Seems to succeed, so I guess full build will succeed, too...
> 
> It doesn't imply that a full build would work.

You are right. eldk-5.6 does not have problem with string.o, but does
not compile the kernel, either...

  CC      arch/arm/kernel/asm-offsets.s
  arch/arm/kernel/asm-offsets.c:56:2: error: #error Your compiler is
  too buggy; it is known to miscompile kernels
   #error Your compiler is too buggy; it is known to miscompile
  kernels
    ^
    arch/arm/kernel/asm-offsets.c:57:2: error: #error and result in
  filesystem corruption and oopses.
   #error and result in filesystem corruption and oopses.
     ^

									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Daniel Micay]

Well, that's not related, it's just this:

#ifdef __GNUC__
#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
#error Your compiler is too buggy; it is known to miscompile kernels.
#error    Known good compilers: 3.3, 4.x
#endif
#if GCC_VERSION >= 40800 && GCC_VERSION < 40803
#error Your compiler is too buggy; it is known to miscompile kernels
#error and result in filesystem corruption and oopses.
#endif
#endif

Re: [regression v4.17-rc0] Re: FORTIFY_SOURCE breaks ARM compilation in -next -- was Re: ARM compile failure in Re: linux-next: Tree for Apr 4

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

On Fri 2018-04-20 15:30:03, Daniel Micay wrote:
> Well, that's not related, it's just this:
> 
> #ifdef __GNUC__
> #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
> #error Your compiler is too buggy; it is known to miscompile kernels.
> #error    Known good compilers: 3.3, 4.x
> #endif
> #if GCC_VERSION >= 40800 && GCC_VERSION < 40803
> #error Your compiler is too buggy; it is known to miscompile kernels
> #error and result in filesystem corruption and oopses.
> #endif
> #endif

Yeah, I know. I guess the kernel would compile if I removed those
checks... 

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]