* linux-next: Tree for Jun 20
From: Stephen Rothwell @ 2016-06-20 6:05 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160617:
The net-next tree gained conflicts agains the net tree.
The block tree gained a conflict against the f2fs tree.
The tpmdd tree gained conflicts against Linus' tree.
The iommu tree gained a conflict against the arm tree.
The staging tree gained a conflict against the drm tree.
Non-merge commits (relative to Linus' tree): 4227
4338 files changed, 194819 insertions(+), 76399 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 and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 234 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).
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 (c3695331f3a3 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3)
Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (8550e2fa34f0 powerpc/mm/hash: Use the correct PPP mask when updating HPTE)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (ab522fd68bc7 Merge branch 'qed-fixes')
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (50219538ffc0 vmxnet3: segCnt can be 1 for LRO packets)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel)
Merging sound-current/for-linus (8198868f0a28 ALSA: hdac_regmap - fix the register access for runtime PM)
Merging pci-current/for-linus (af8c34ce6ae3 Linux 4.7-rc2)
Merging driver-core.current/driver-core-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging tty.current/tty-linus (5edb56491d48 Linux 4.7-rc3)
Merging usb.current/usb-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (af8c34ce6ae3 Linux 4.7-rc2)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging char-misc.current/char-misc-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging input-current/for-linus (30172936eefb MAINTAINERS: add Pali Rohár as reviewer of ALPS PS/2 touchpad driver)
Merging crypto-current/master (19ced623db2f crypto: ux500 - memmove the right size)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (59461c018204 mfd: max77620: Fix FPS switch statements)
Merging drm-intel-fixes/for-linux-next-fixes (476490a945e1 drm/i915/ilk: Don't disable SSC source if it's in use)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (5edb56491d48 Linux 4.7-rc3)
Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (1a8883e0ddcd Merge branch 'fixes' into for-next)
Merging amlogic/for-next (32535cf02be1 Merge branch 'v4.7/deps/external' into tmp/aml-reset)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (24c3004a3258 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a9015e7c9dd2 Merge branch 'for_4.8/keystone_config' into next)
Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (be5f1e3cfa86 Merge branch 'omap-for-v4.7/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (275804c07f41 firmware: qcom: scm: Peripheral Authentication Service)
Merging renesas/next (adc9b8a6ecde Merge branches 'heads/dt-for-v4.8', 'heads/rcar-sysc-for-v4.8' and 'heads/soc-for-v4.8' into next)
Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (a0c8f253cf3e Merge branch 'for-v4.8/exynos-mfc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (7c7a0b23a909 Merge branch for-4.8/arm64 into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (5edb56491d48 Linux 4.7-rc3)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (a43073900938 cxl: Make vPHB device node match adapter's)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (63bf903583d7 Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (ca768667d873 tile 32-bit big-endian: fix bugs in syscall argument order)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (8f4aa7bf64af Merge branch 'for-next-next-4.7-20160617' into for-next-20160617)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (507c552aa58f fuse: improve aio directIO write performance for size extending writes)
Merging gfs2/for-next (1e875f5a95a2 gfs2: Initialize iopen glock holder for new inodes)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (a12a4fc64de7 Merge branch 'writeback')
Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (f920c41f047a ovl: move some common code in a function)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (61edc3f3b51d ubi: Don't bypass ->getattr())
Merging xfs/for-next (26f1fe858f27 xfs: reduce lock hold times in buffer writeback)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (34bfa4dd01cf Merge branch 'pci/resource' into next)
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (646944182a4b Merge branch 'for-4.8/alps' into for-next)
Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (e616f770b52c hwmon: (ads7871) Convert to devm_hwmon_device_register_with_groups)
Merging v4l-dvb/master (2ed52999aaf3 Merge branch 'patchwork' into to_next)
Merging pm/linux-next (8fa3e03d9249 Merge branches 'pm-cpufreq-fixes' and 'acpica-fixes' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (f1faa4f5b460 Merge branch 'topic/tegra' into next)
Merging net-next/master (697666eac664 net: ethernet: bcmsysport: use phy_ethtool_{get|set}_link_ksettings)
CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile
CONFLICT (content): Merge conflict in net/rds/tcp_listen.c
CONFLICT (content): Merge conflict in net/rds/tcp_connect.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git)
Merging bluetooth/master (a78c16e1b9ea mdio: mux: avoid 'maybe-uninitialized' warning)
Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle')
Merging rdma/for-next (61c78eea9516 IB/IPoIB: Don't update neigh validity for unresolved entries)
Merging rdma-leon/rdma-next (5edb56491d48 Linux 4.7-rc3)
Merging rdma-leon-test/testing/rdma-next (a5792590474b Merge branch 'topic/rxe' into testing/rdma-next)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (e2442baf99bc mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare())
Merging crypto/master (5a7de97309f5 crypto: rsa - return raw integers for the ASN.1 parser)
Merging drm/drm-next (a0877f520352 Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback)
Merging drm-intel/for-linux-next (a02b01096def drm/i915: Update DRIVER_DATE to 20160620)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (e63d87c0b02f drm/i915: Move backlight unregistration to connector unregistration)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (3f306a53b571 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (6b31814f0507 gcc-plugins: disable under COMPILE_TEST)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (65a003e5c0c9 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally)
Merging sound-asoc/for-next (1a7d46a9dfeb Merge remote-tracking branches 'asoc/topic/wm8731' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (9096a45d99d0 Input: psmouse - use same format for secondary devices as for primary)
Merging block/for-next (3cee5575153a Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in block/blk-lib.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (68c1c4d5eafc dm raid: don't use 'const' in function return)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (b28173343703 mmc: tmio: make a cast explicit)
Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module)
Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator)
Merging battery/master (2e05b518c897 power_supply: bq27xxx_battery: Group register mappings into one table)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (1fc4aeb3d151 Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/pfuze100', 'regulator/topic/pwm', 'regulator/topic/qcom-smd' and 'regulator/topic/twl' into regulator-next)
Merging security/next (26703c636c1f um/ptrace: run seccomp after ptrace)
Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (309c5fad5de4 selinux: fix type mismatch)
Merging tpmdd/next (3051e8c00764 tpm_crb: fix address space of the return pointer in crb_map_res())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (da3189d191e4 Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d', 'arm/exynos' and 'arm/mediatek' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (8569de68e79e docs: kernel-doc: Add "example" and "note" to the magic section types)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (66b12abc846d audit: fix some horrible switch statement style crimes)
Merging devicetree/for-next (06dfeef88573 drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch)
Merging mailbox/mailbox-for-next (9ef3c5112139 mailbox: mailbox-test: set tdev->signal to NULL after freeing)
Merging spi/for-next (10a340f4245c Merge remote-tracking branches 'spi/topic/rockchip' and 'spi/topic/sunxi' into spi-next)
Merging tip/auto-latest (2e8756bc09bd Merge branch 'x86/boot')
Merging clockevents/clockevents/next (dda57f6be11f Merge branches 'clockevents/clksrc-of-ret' and 'clockevents/compile-test' into clockevents/next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (bba142957e04 EDAC: Correct channel count limit)
Merging irqchip/irqchip/for-next (ebf63bb87f67 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (b4aa201e0c7c torture: Convert torture_shutdown() to hrtimer)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: rcu: merge fix for kernel/rcu/tree_exp.h
Merging kvm/linux-next (64672c95ea4c kvm: vmx: hook preemption timer support)
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (a7e19ab55ffd KVM: s390: handle missing storage-key facility)
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (ea12c45f1b36 hsi: Only descend into hsi directory when CONFIG_HSI is set)
Merging leds/for-next (ba6bc7dc4d39 leds: pca9532: Add device tree support)
Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg())
Merging driver-core/driver-core-next (5edb56491d48 Linux 4.7-rc3)
Merging tty/tty-next (5edb56491d48 Linux 4.7-rc3)
Merging usb/usb-next (76d15c8fba65 ehci-platform: Add support for shared reset controllers)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (af8c34ce6ae3 Linux 4.7-rc2)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (0fd9da9a979a staging/android: sync_debug: unproxify debugfs files' fops)
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
CONFLICT (content): Merge conflict in drivers/iio/industrialio-trigger.c
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c
$ git rm -f drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (c0ff9019ee64 mei: drop wr_msg from the mei_dev structure)
Merging extcon/extcon-next (4239b7f76be3 Merge branch 'ib-extcon-powersupply-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into extcon-next)
Merging cgroup/for-next (44fa3a451ffe Merge branch 'for-4.8' into for-next)
Merging scsi/for-next (3236f0748964 Merge branch 'misc' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (da780c64d2b6 Merge branch 'for-4.7-fixes' into for-next)
Merging pinctrl/for-next (fe9f516997c6 Merge branch 'devel' into for-next)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (ef583d362047 Merge branch 'rproc-next' into for-next)
Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (318480569156 pwm: lpss: pci: Enable PWM module on Intel Edison)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (071a0cb66cc6 Merge commit 'f17a0dd1c2e0' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1a695a905c18 Linux 4.7-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (c95eca78d3c8 coresight: add PM runtime calls to coresight_simple_func())
Merging rtc/rtc-next (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (dc87c36fac15 firmware-support-loading-into-a-pre-allocated-buffer-fix)
CONFLICT (content): Merge conflict in ipc/sem.c
Applying: mm: make optimistic check for swapin readahead fix
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Merging akpm/master (e80940b56fc8 include/linux/bitmap.h: cleanup)
^ permalink raw reply
* Re: linux-next: manual merge of the iommu tree with the arm tree
From: Russell King @ 2016-06-20 8:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Joerg Roedel, linux-next, linux-kernel
In-Reply-To: <20160620132009.4e2c0e32@canb.auug.org.au>
On Mon, Jun 20, 2016 at 01:20:09PM +1000, Stephen Rothwell wrote:
> Hi Joerg,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/iommu/mtk_iommu.c
>
> between commit:
>
> d267804c8457 ("iommu: convert DT component matching to component_match_add_release()")
>
> from the arm tree and commit:
>
> da4d6e6d3b3e ("iommu/mediatek: Convert DT component matching to component_match_add_release()")
>
> from the iommu tree.
This looks like it's going to end up being broken. I self-NACK'd my v2
patch series was, and it looks like the v2 patch was picked up instead
of v1.
It's also part of a _three_ patch series, where the _second two_ patches
depend on the _first_ patch. Such series can't be split up.
--
Russell King
ARM architecture Linux Kernel maintainer
^ permalink raw reply
* next-20160620 build: 2 failures 9 warnings (next-20160620)
From: Build bot for Mark Brown @ 2016-06-20 10:17 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160620
Git describe: next-20160620
Commit: 6ab97590a2 Add linux-next specific files for 20160620
Build Time: 87 min 20 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 2
Warnings: 9
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
arm-allmodconfig
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
8 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-multi_v7_defconfig
72 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 2
3 ../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
2 ../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
Warnings Summary: 9
66 ../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
4 ../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
4 ../drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
4 ../drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
2 ../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../drivers/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 8 warnings, 0 section mismatches
Errors:
../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
Warnings:
../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 4 errors, 72 warnings, 0 section mismatches
Errors:
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
Warnings:
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
^ permalink raw reply
* Re: next-20160620 build: 2 failures 9 warnings (next-20160620)
From: Mark Brown @ 2016-06-20 13:42 UTC (permalink / raw)
To: Russell King, Joerg Roedel
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <E1bEwGe-0004DR-4p@optimist>
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
On Mon, Jun 20, 2016 at 11:17:20AM +0100, Build bot for Mark Brown wrote:
Today's -next fails to build due to:
> arm64-allmodconfig
> ../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
which is triggered by da4d6e6d3b3ef (iommu/mediatek: Convert DT
component matching to component_match_add_release()) - there is
presumably a dependency on some other patch series that is still in
review.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160620 build: 2 failures 9 warnings (next-20160620)
From: Joerg Roedel @ 2016-06-20 13:52 UTC (permalink / raw)
To: Mark Brown
Cc: Russell King, linaro-kernel, linux-next, linux-arm-kernel,
kernel-build-reports
In-Reply-To: <20160620134200.GU26099@sirena.org.uk>
On Mon, Jun 20, 2016 at 02:42:00PM +0100, Mark Brown wrote:
> On Mon, Jun 20, 2016 at 11:17:20AM +0100, Build bot for Mark Brown wrote:
>
> Today's -next fails to build due to:
>
> > arm64-allmodconfig
> > ../drivers/iommu/mtk_iommu.c:27:32: fatal error: linux/of_component.h: No such file or directory
>
> which is triggered by da4d6e6d3b3ef (iommu/mediatek: Convert DT
> component matching to component_match_add_release()) - there is
> presumably a dependency on some other patch series that is still in
> review.
Yes, this came to my attention already. I will remove that patch from
the iommu tree.
Thanks,
Joerg
^ permalink raw reply
* Re: linux-next: manual merge of the tpmdd tree with Linus' tree
From: Jarkko Sakkinen @ 2016-06-20 14:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Srinivas Kandagatla, Rob Herring,
Christophe Ricard, Fabio Estevam
In-Reply-To: <20160620131345.1d6f64bd@canb.auug.org.au>
On Mon, Jun 20, 2016 at 01:13:45PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
>
> Today's linux-next merge of the tpmdd tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 7aa5d38cfb77 ("of: Add Inforce Computing to vendor prefix list")
> 3eefa7e8cc85 ("dt-bindings: Add vendor prefix for TechNexion")
>
> from Linus' tree and commits:
>
> 45a33961f81a ("devicetree: Add infineon to vendor-prefix.txt")
> 3a34e75f6a91 ("devicetree: Add Trusted Computing Group to vendor-prefix.txt")
>
> from the tpmdd tree.
>
> BTW: commit 3a34e75f6a91 added the new entry out of alphabetical order.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Got you, thanks.
> --
> Cheers,
> Stephen Rothwell
/Jarkko
>
> diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
> index d2bce2239769,717bae92e28a..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -125,10 -111,9 +125,11 @@@ hp Hewlett Packar
> i2se I2SE GmbH
> ibm International Business Machines (IBM)
> idt Integrated Device Technologies, Inc.
> +ifi Ingenieurburo Fur Ic-Technologie (I/F/I)
> iom Iomega Corporation
> img Imagination Technologies Ltd.
> + infineon Infineon Technologies
> +inforce Inforce Computing
> ingenic Ingenic Semiconductor
> innolux Innolux Corporation
> intel Intel Corporation
> @@@ -251,12 -227,10 +252,13 @@@ st STMicroelectronic
> startek Startek
> ste ST-Ericsson
> stericsson ST-Ericsson
> +syna Synaptics Inc.
> synology Synology, Inc.
> +SUNW Sun Microsystems, Inc
> tbs TBS Technologies
> -tcl Toby Churchill Ltd.
> + tcg Trusted Computing Group
> +tcl Toby Churchill Ltd.
> +technexion TechNexion
> technologic Technologic Systems
> thine THine Electronics, Inc.
> ti Texas Instruments
^ permalink raw reply
* Re: [PATCH] i2c: remove __init from i2c_register_board_info()
From: Luis R. Rodriguez @ 2016-06-20 15:12 UTC (permalink / raw)
To: Wolfram Sang
Cc: Luis R. Rodriguez, linux-i2c, linux-kernel, feng.tang, linux-next
In-Reply-To: <20160619121538.GB3072@tetsubishi>
On Sun, Jun 19, 2016 at 02:15:38PM +0200, Wolfram Sang wrote:
> On Tue, Jun 07, 2016 at 04:52:27PM -0700, Luis R. Rodriguez wrote:
> > As of next-20160607 with allyesconfig we get this linker failure:
> >
> > MODPOST vmlinux.o
> > WARNING: vmlinux.o(.text+0x21bc0d): Section mismatch in reference from
> > the function intel_scu_devices_create() to the function
> > .init.text:i2c_register_board_info()
> >
> > This is caused by the fact that intel_scu_devices_create() calls
> > i2c_register_board_info() and intel_scu_devices_create() is not
> > annotated with __init. This typically involves manual code
> > inspection and if one is certain this is correct we would
> > just peg intel_scu_devices_create() with a __ref annotation.
> >
> > In this case this would be wrong though as the
> > intel_scu_devices_create() call is exported, and used in
> > the ipc_probe() on drivers/platform/x86/intel_scu_ipc.c.
> > The issue is that even though builtin_pci_driver(ipc_driver)
> > is used this just exposes the probe routine, which can occur
> > at any point in time if this bus supports hotplug. A race
> > can happen between kernel_init_freeable() that calls the init
> > calls (in this case registeres the intel_scu_ipc.c driver, and
> > later free_initmem(), which would free the i2c_register_board_info().
> > If a probe happens later in boot i2c_register_board_info() would
> > not be present and we should get a page fault.
> >
> > Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
>
> Applied to for-current, thanks! Do you think this should go to stable?
Its a theoretical race, but a real one, but does fix allyesconfig builds.
Up to you.
Luis
^ permalink raw reply
* Re: linux-next: build warnings after merge of the pci tree
From: Bjorn Helgaas @ 2016-06-20 19:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Bjorn Helgaas, linux-next, linux-kernel
In-Reply-To: <20160620115213.07231836@canb.auug.org.au>
On Mon, Jun 20, 2016 at 11:52:13AM +1000, Stephen Rothwell wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (arm
> multi_v7_defconfig) produced these warnings:
>
> drivers/pci/host/pci-host-common.c: In function 'gen_pci_init':
> drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
> return err;
> ^
> drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
> return PTR_ERR(cfg);
> ^
> drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
> return err;
> ^
>
> Introduced by commit
>
> 3f8dcfc3fbba ("PCI: generic: Free resource list close to where it's allocated")
Fixed, thanks a lot, Stephen!
^ permalink raw reply
* Re: linux-next: Tree for Jun 20
From: Sudip Mukherjee @ 2016-06-20 21:59 UTC (permalink / raw)
To: Stephen Rothwell, linux-next, Ralf Baechle
Cc: linux-kernel@vger.kernel.org, linux-mips
In-Reply-To: <20160620160537.3ea30484@canb.auug.org.au>
On Monday 20 June 2016 07:05 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160617:
I just started trying gcc 6.1.0 for mips and mips allmodconfig is
failing with the error:
{standard input}: Assembler messages:
{standard input}:147: Error: number (0x9000000080000000) larger than 32 bits
{standard input}:176: Error: number (0x9000000080000000) larger than 32 bits
{standard input}:198: Error: number (0x9000000080000000) larger than 32 bits
make[3]: *** [arch/mips/mm/sc-ip22.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [arch/mips/mm] Error 2
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [arch/mips] Error 2
make[1]: *** Waiting for unfinished jobs....
build log can be seen at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/138824794
regards
sudip
^ permalink raw reply
* Re: [PATCH 1/2] ipc/sem.c: Fix complex_count vs. simple op race
From: Andrew Morton @ 2016-06-20 23:04 UTC (permalink / raw)
To: Manfred Spraul
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, LKML, linux-next, 1vier1, Davidlohr Bueso, felixh,
stable
In-Reply-To: <1466280142-19741-1-git-send-email-manfred@colorfullife.com>
On Sat, 18 Jun 2016 22:02:21 +0200 Manfred Spraul <manfred@colorfullife.com> wrote:
> Commit 6d07b68ce16a ("ipc/sem.c: optimize sem_lock()") introduced a race:
>
> sem_lock has a fast path that allows parallel simple operations.
> There are two reasons why a simple operation cannot run in parallel:
> - a non-simple operations is ongoing (sma->sem_perm.lock held)
> - a complex operation is sleeping (sma->complex_count != 0)
>
> As both facts are stored independently, a thread can bypass the current
> checks by sleeping in the right positions. See below for more details
> (or kernel bugzilla 105651).
>
> The patch fixes that by creating one variable (complex_mode)
> that tracks both reasons why parallel operations are not possible.
>
> The patch also updates stale documentation regarding the locking.
>
> With regards to stable kernels:
> The patch is required for all kernels that include the commit 6d07b68ce16a
> ("ipc/sem.c: optimize sem_lock()") (3.10?)
I've had this in -mm (and -next) since January 4, without issues. I
put it on hold because Davidlohr expressed concern about performance
regressions.
Your [2/2] should prevent those regressions (yes?) so I assume that any
kernel which has [1/2] really should have [2/2] as well. But without
any quantitative information, this is all mad guesswork.
What to do?
(The [2/2] changelog should explain that it is the cure to [1/2]'s
regressions, btw).
^ permalink raw reply
* Re: [PATCH 1/2] ipc/sem.c: Fix complex_count vs. simple op race
From: Davidlohr Bueso @ 2016-06-21 0:30 UTC (permalink / raw)
To: Manfred Spraul
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Andrew Morton, LKML, linux-next, 1vier1, felixh,
stable
In-Reply-To: <1466280142-19741-1-git-send-email-manfred@colorfullife.com>
On Sat, 18 Jun 2016, Manfred Spraul wrote:
>diff --git a/include/linux/sem.h b/include/linux/sem.h
>index 976ce3a..d0efd6e 100644
>--- a/include/linux/sem.h
>+++ b/include/linux/sem.h
>@@ -21,6 +21,7 @@ struct sem_array {
> struct list_head list_id; /* undo requests on this array */
> int sem_nsems; /* no. of semaphores in array */
> int complex_count; /* pending complex operations */
I see this patch also takes care of complex_count needing READ/WRITE_ONCE
as you change that to always be done with the big sem_perm lock.
>+ bool complex_mode; /* no parallel simple ops */
But I'm wondering about races with this one. Doesn't complex_mode need
acquire/release semantics?
> };
>
[...]
> /*
>- * Wait until all currently ongoing simple ops have completed.
>+ * Enter the mode suitable for non-simple operations:
> * Caller must own sem_perm.lock.
>- * New simple ops cannot start, because simple ops first check
>- * that sem_perm.lock is free.
>- * that a) sem_perm.lock is free and b) complex_count is 0.
> */
>-static void sem_wait_array(struct sem_array *sma)
>+static void complexmode_enter(struct sem_array *sma)
> {
> int i;
> struct sem *sem;
>
>- if (sma->complex_count) {
>- /* The thread that increased sma->complex_count waited on
>- * all sem->lock locks. Thus we don't need to wait again.
>- */
>+ if (sma->complex_mode) {
>+ /* We are already in complex_mode. Nothing to do */
This complex_mode load is serialized because both complexmode_enter() and
_tryleave(), which are the main calls that modify the variable, are serialized
by sem_perm lock, right?
> return;
> }
Btw, I like that this logic is much simpler, just by reading the comments :)
>+ WRITE_ONCE(sma->complex_mode, true);
>+
>+ /* We need a full barrier:
>+ * The write to complex_mode must be visible
>+ * before we read the first sem->lock spinlock state.
>+ */
>+ smp_mb();
>
> for (i = 0; i < sma->sem_nsems; i++) {
> sem = sma->sem_base + i;
>@@ -285,6 +294,29 @@ static void sem_wait_array(struct sem_array *sma)
> }
>
> /*
>+ * Try to leave the mode that disallows simple operations:
>+ * Caller must own sem_perm.lock.
>+ */
>+static void complexmode_tryleave(struct sem_array *sma)
>+{
>+ if (sma->complex_count) {
>+ /* Complex ops are sleeping.
>+ * We must stay in complex mode
>+ */
>+ return;
>+ }
>+ /*
>+ * Immediately after setting complex_mode to false,
>+ * a simple op can start. Thus: all memory writes
>+ * performed by the current operation must be visible
>+ * before we set complex_mode to false.
>+ */
>+ smp_wmb();
>+
>+ WRITE_ONCE(sma->complex_mode, false);
smp_store_release()? See below.
>+}
>+
>+/*
> * If the request contains only one semaphore operation, and there are
> * no complex transactions pending, lock only the semaphore involved.
> * Otherwise, lock the entire semaphore array, since we either have
>@@ -300,56 +332,38 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
> /* Complex operation - acquire a full lock */
> ipc_lock_object(&sma->sem_perm);
>
>- /* And wait until all simple ops that are processed
>- * right now have dropped their locks.
>- */
>- sem_wait_array(sma);
>+ /* Prevent parallel simple ops */
>+ complexmode_enter(sma);
> return -1;
> }
>
> /*
> * Only one semaphore affected - try to optimize locking.
>- * The rules are:
>- * - optimized locking is possible if no complex operation
>- * is either enqueued or processed right now.
>- * - The test for enqueued complex ops is simple:
>- * sma->complex_count != 0
>- * - Testing for complex ops that are processed right now is
>- * a bit more difficult. Complex ops acquire the full lock
>- * and first wait that the running simple ops have completed.
>- * (see above)
>- * Thus: If we own a simple lock and the global lock is free
>- * and complex_count is now 0, then it will stay 0 and
>- * thus just locking sem->lock is sufficient.
>+ * Optimized locking is possible if no complex operation
>+ * is either enqueued or processed right now.
>+ *
>+ * Both facts are tracked by complex_mode.
> */
> sem = sma->sem_base + sops->sem_num;
>
>- if (sma->complex_count == 0) {
>+ /*
>+ * Initial check for complex_mode. Just an optimization,
>+ * no locking.
>+ */
>+ if (!READ_ONCE(sma->complex_mode)) {
We have no lock (which is the whole point), I think we need stronger
guarantees here to avoid racing with another thread that holds sem_perm
lock and is entering complexmode for the first time or vice versa with
tryleave(). An smp_load_acquire here would pair with the suggested
smp_store_release calls.
Thanks,
Davidlohr
^ permalink raw reply
* Re: linux-next: build warnings after merge of the pci tree
From: Stephen Rothwell @ 2016-06-21 1:08 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Bjorn Helgaas, linux-next, linux-kernel
In-Reply-To: <20160620191136.GA17036@localhost>
Hi Bjorn,
On Mon, 20 Jun 2016 14:11:36 -0500 Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> On Mon, Jun 20, 2016 at 11:52:13AM +1000, Stephen Rothwell wrote:
> > Hi Bjorn,
> >
> > After merging the pci tree, today's linux-next build (arm
> > multi_v7_defconfig) produced these warnings:
> >
> > drivers/pci/host/pci-host-common.c: In function 'gen_pci_init':
> > drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
> > return err;
> > ^
> > drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
> > return PTR_ERR(cfg);
> > ^
> > drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
> > return err;
> > ^
> >
> > Introduced by commit
> >
> > 3f8dcfc3fbba ("PCI: generic: Free resource list close to where it's allocated")
>
> Fixed, thanks a lot, Stephen!
Thanks. Unfortunately, I still get this warning:
drivers/pci/host/pci-host-common.c: In function 'gen_pci_init':
drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
return PTR_ERR(cfg);
^
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the arm-soc tree
From: Stephen Rothwell @ 2016-06-21 1:18 UTC (permalink / raw)
To: David Miller, netdev, Olof Johansson, Arnd Bergmann,
linux-arm-kernel
Cc: Florian Fainelli, Pramod Kumar, linux-kernel,
Yendapally Reddy Dhananjaya Reddy, linux-next, Jon Mason
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
arch/arm64/boot/dts/broadcom/ns2-svk.dts
arch/arm64/boot/dts/broadcom/ns2.dtsi
between commits:
97b1504a30b3 ("arm64: dts: enable pinctrl for Broadcom NS2 SoC")
5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support")
from the arm-soc tree and commit:
5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/boot/dts/broadcom/ns2-svk.dts
index b062a44a39c7,ea5603fd106a..000000000000
--- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts
+++ b/arch/arm64/boot/dts/broadcom/ns2-svk.dts
@@@ -161,11 -141,10 +169,19 @@@
};
};
+&pinctrl {
+ pinctrl-names = "default";
+ pinctrl-0 = <&nand_sel>;
+ nand_sel: nand_sel {
+ function = "nand";
+ groups = "nand_grp";
+ };
+};
++
+ &mdio_mux_iproc {
+ mdio@10 {
+ gphy0: eth-phy@10 {
+ reg = <0x10>;
+ };
+ };
+ };
diff --cc arch/arm64/boot/dts/broadcom/ns2.dtsi
index d1dc812daaab,46b78fa89f4c..000000000000
--- a/arch/arm64/boot/dts/broadcom/ns2.dtsi
+++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi
@@@ -279,26 -263,45 +279,65 @@@
IRQ_TYPE_LEVEL_HIGH)>;
};
+ cci@65590000 {
+ compatible = "arm,cci-400";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x65590000 0x1000>;
+ ranges = <0 0x65590000 0x10000>;
+
+ pmu@9000 {
+ compatible = "arm,cci-400-pmu,r1",
+ "arm,cci-400-pmu";
+ reg = <0x9000 0x4000>;
+ interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 345 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 346 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 347 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 348 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>;
+ };
+ };
+
+ mdio_mux_iproc: mdio-mux@6602023c {
+ compatible = "brcm,mdio-mux-iproc";
+ reg = <0x6602023c 0x14>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ mdio@0 {
+ reg = <0x0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pci_phy0: pci-phy@0 {
+ compatible = "brcm,ns2-pcie-phy";
+ reg = <0x0>;
+ #phy-cells = <0>;
+ status = "disabled";
+ };
+ };
+
+ mdio@7 {
+ reg = <0x7>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pci_phy1: pci-phy@0 {
+ compatible = "brcm,ns2-pcie-phy";
+ reg = <0x0>;
+ #phy-cells = <0>;
+ status = "disabled";
+ };
+ };
+
+ mdio@10 {
+ reg = <0x10>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
+
timer0: timer@66030000 {
compatible = "arm,sp804", "arm,primecell";
reg = <0x66030000 0x1000>;
^ permalink raw reply
* Re: linux-next: build warnings after merge of the pci tree
From: Bjorn Helgaas @ 2016-06-21 1:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Bjorn Helgaas, linux-next list, linux-kernel@vger.kernel.org
In-Reply-To: <20160621110838.4d4f1171@canb.auug.org.au>
On Mon, Jun 20, 2016 at 8:08 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> On Mon, 20 Jun 2016 14:11:36 -0500 Bjorn Helgaas <helgaas@kernel.org> wrote:
>>
>> On Mon, Jun 20, 2016 at 11:52:13AM +1000, Stephen Rothwell wrote:
>> > Hi Bjorn,
>> >
>> > After merging the pci tree, today's linux-next build (arm
>> > multi_v7_defconfig) produced these warnings:
>> >
>> > drivers/pci/host/pci-host-common.c: In function 'gen_pci_init':
>> > drivers/pci/host/pci-host-common.c:88:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
>> > return err;
>> > ^
>> > drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
>> > return PTR_ERR(cfg);
>> > ^
>> > drivers/pci/host/pci-host-common.c:108:9: warning: return makes pointer from integer without a cast [-Wint-conversion]
>> > return err;
>> > ^
>> >
>> > Introduced by commit
>> >
>> > 3f8dcfc3fbba ("PCI: generic: Free resource list close to where it's allocated")
>>
>> Fixed, thanks a lot, Stephen!
>
> Thanks. Unfortunately, I still get this warning:
>
> drivers/pci/host/pci-host-common.c: In function 'gen_pci_init':
> drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
> return PTR_ERR(cfg);
> ^
Crap, sorry, PTR_ERR/ERR_PTR confusion. I *think* I fixed it now.
Bjorn
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the arm-soc tree
From: Stephen Rothwell @ 2016-06-21 4:58 UTC (permalink / raw)
To: Andrew Morton, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Florian Fainelli, Prarit Bhargava
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/arm/configs/bcm_defconfig
between commit:
41463c3e6eae ("ARM: Remove bcm_defconfig")
from the arm-soc tree and commit:
c41079f16bf2 ("lib, switch CONFIG_PRINTK_TIME to int")
from the akpm-current tree.
I fixed it up (I just deleted the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Jun 21
From: Stephen Rothwell @ 2016-06-21 5:46 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160620:
The net-next tree gained conflicts against the arm-doc tree.
The akpm-current tree gained a conflict against the arm-soc tree.
Non-merge commits (relative to Linus' tree): 4462
4490 files changed, 203456 insertions(+), 78511 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 and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 234 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).
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 (67016f6cdfd0 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3)
Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (8550e2fa34f0 powerpc/mm/hash: Use the correct PPP mask when updating HPTE)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (ab522fd68bc7 Merge branch 'qed-fixes')
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (50219538ffc0 vmxnet3: segCnt can be 1 for LRO packets)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel)
Merging sound-current/for-linus (8198868f0a28 ALSA: hdac_regmap - fix the register access for runtime PM)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging tty.current/tty-linus (33688abb2802 Linux 4.7-rc4)
Merging usb.current/usb-linus (33688abb2802 Linux 4.7-rc4)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (33688abb2802 Linux 4.7-rc4)
Merging char-misc.current/char-misc-linus (e80dac114c63 Merge tag 'usb-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging input-current/for-linus (30172936eefb MAINTAINERS: add Pali Rohár as reviewer of ALPS PS/2 touchpad driver)
Merging crypto-current/master (19ced623db2f crypto: ux500 - memmove the right size)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (59461c018204 mfd: max77620: Fix FPS switch statements)
Merging drm-intel-fixes/for-linux-next-fixes (33688abb2802 Linux 4.7-rc4)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (5edb56491d48 Linux 4.7-rc3)
Merging arm/for-next (f07617e99523 Merge branches 'component', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (301c2be27a25 ARM: SoC: Document merges)
Merging amlogic/for-next (32535cf02be1 Merge branch 'v4.7/deps/external' into tmp/aml-reset)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (1a695a905c18 Linux 4.7-rc1)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (24c3004a3258 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a9015e7c9dd2 Merge branch 'for_4.8/keystone_config' into next)
Merging mvebu/for-next (56454a34f5d6 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (be5f1e3cfa86 Merge branch 'omap-for-v4.7/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (275804c07f41 firmware: qcom: scm: Peripheral Authentication Service)
Merging renesas/next (068fb78080df Merge branches 'heads/defconfig-for-v4.8' and 'heads/dt-for-v4.8' into next)
Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (28eded213510 Merge branch 'next/drivers' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (7c7a0b23a909 Merge branch for-4.8/arm64 into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (5edb56491d48 Linux 4.7-rc3)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (a43073900938 cxl: Make vPHB device node match adapter's)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (63bf903583d7 Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (ca768667d873 tile 32-bit big-endian: fix bugs in syscall argument order)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (8f4aa7bf64af Merge branch 'for-next-next-4.7-20160617' into for-next-20160617)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (40f0fd372a62 ecryptfs: fix spelling mistakes)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (a2481adac819 f2fs: avoid latency-critical readahead of node pages)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (507c552aa58f fuse: improve aio directIO write performance for size extending writes)
Merging gfs2/for-next (1e875f5a95a2 gfs2: Initialize iopen glock holder for new inodes)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (30e3c0071a1f Merge branch 'writeback')
Merging nfsd/nfsd-next (ee8f2a36a99c nfsd: allow nfsd to advertise multiple layout types)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (f920c41f047a ovl: move some common code in a function)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (61edc3f3b51d ubi: Don't bypass ->getattr())
Merging xfs/for-next (26f1fe858f27 xfs: reduce lock hold times in buffer writeback)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (970f335ef406 Merge branch 'pci/resource' into next)
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (a4d06823021a Merge branch 'for-4.8/alps' into for-next)
Merging i2c/i2c/for-next (d86a4c24d68e Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d4db8217f4b7 hwmon: (dell-smm) In debug mode log duration of SMM calls)
Merging v4l-dvb/master (2ed52999aaf3 Merge branch 'patchwork' into to_next)
Merging pm/linux-next (8fa3e03d9249 Merge branches 'pm-cpufreq-fixes' and 'acpica-fixes' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (f1faa4f5b460 Merge branch 'topic/tegra' into next)
Merging net-next/master (697666eac664 net: ethernet: bcmsysport: use phy_ethtool_{get|set}_link_ksettings)
CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile
CONFLICT (content): Merge conflict in net/rds/tcp_listen.c
CONFLICT (content): Merge conflict in net/rds/tcp_connect.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/qed/qed_hsi.h
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (1bb57c8a5e33 Merge ath-next from ath.git)
Merging bluetooth/master (a78c16e1b9ea mdio: mux: avoid 'maybe-uninitialized' warning)
Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle')
Merging rdma/for-next (61c78eea9516 IB/IPoIB: Don't update neigh validity for unresolved entries)
Merging rdma-leon/rdma-next (5edb56491d48 Linux 4.7-rc3)
Merging rdma-leon-test/testing/rdma-next (a5792590474b Merge branch 'topic/rxe' into testing/rdma-next)
Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings)
Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks)
Merging nand/nand/next (ba6f6d603b45 mtd: nandbiterrs: Support for NAND biterrors test on platforms without raw write)
Merging crypto/master (01ac94580ac2 crypto: drbg - fix an error code in drbg_init_sym_kernel())
Merging drm/drm-next (a0877f520352 Merge tag 'topic/drm-misc-2016-06-15' of git://anongit.freedesktop.org/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback)
Merging drm-intel/for-linux-next (aeecc9696aa0 drm/i915: use ORIGIN_CPU for frontbuffer invalidation on WC mmaps)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (ce833ba9693c drm: Mark set/drop master ioctl as unlocked.)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (b7e7559f439c Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/dt-for-4.8' and 'sunxi/fixes-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (3f306a53b571 Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (6b31814f0507 gcc-plugins: disable under COMPILE_TEST)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (65a003e5c0c9 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (3915bf294652 ALSA: seq_timer: use monotonic times internally)
Merging sound-asoc/for-next (1a7d46a9dfeb Merge remote-tracking branches 'asoc/topic/wm8731' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (9096a45d99d0 Input: psmouse - use same format for secondary devices as for primary)
Merging block/for-next (3cee5575153a Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in block/blk-lib.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (68c1c4d5eafc dm raid: don't use 'const' in function return)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (b28173343703 mmc: tmio: make a cast explicit)
Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (1cf9326d4c07 mfd: max14577: Allow driver to be built as a module)
Merging backlight/for-backlight-next (4db8c9572ce1 backlight: lp855x: Add enable regulator)
Merging battery/master (2e05b518c897 power_supply: bq27xxx_battery: Group register mappings into one table)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (1fc4aeb3d151 Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/pfuze100', 'regulator/topic/pwm', 'regulator/topic/qcom-smd' and 'regulator/topic/twl' into regulator-next)
Merging security/next (26703c636c1f um/ptrace: run seccomp after ptrace)
Merging integrity/next (848b134bf8e7 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (309c5fad5de4 selinux: fix type mismatch)
Merging tpmdd/next (3051e8c00764 tpm_crb: fix address space of the return pointer in crb_map_res())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (8d16cf6b773d Merge branches 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'arm/exynos' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (8569de68e79e docs: kernel-doc: Add "example" and "note" to the magic section types)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (66b12abc846d audit: fix some horrible switch statement style crimes)
Merging devicetree/for-next (06dfeef88573 drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch)
Merging mailbox/mailbox-for-next (9ef3c5112139 mailbox: mailbox-test: set tdev->signal to NULL after freeing)
Merging spi/for-next (10a340f4245c Merge remote-tracking branches 'spi/topic/rockchip' and 'spi/topic/sunxi' into spi-next)
Merging tip/auto-latest (b5bb8af4e79a Merge branch 'linus')
Merging clockevents/clockevents/next (5a634113ad0e Merge branch 'clockevents/compile-test' into clockevents/next)
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (bba142957e04 EDAC: Correct channel count limit)
Merging irqchip/irqchip/for-next (ebf63bb87f67 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (149f93308f57 rcutorture: Remove outdated config option description)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Applying: rcu: merge fix for kernel/rcu/tree_exp.h
Merging kvm/linux-next (64672c95ea4c kvm: vmx: hook preemption timer support)
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (4cb91a396757 KVM: s390: vsie: add module parameter "nested")
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (ea12c45f1b36 hsi: Only descend into hsi directory when CONFIG_HSI is set)
Merging leds/for-next (94b275f398af unicore32: use the new LED disk activity trigger)
Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg())
Merging driver-core/driver-core-next (5edb56491d48 Linux 4.7-rc3)
Merging tty/tty-next (33688abb2802 Linux 4.7-rc4)
Merging usb/usb-next (aa5e94a2e133 Revert "usb: ohci-at91: Forcibly suspend ports while USB suspend")
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (33688abb2802 Linux 4.7-rc4)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (af52739b922f Merge 4.7-rc4 into staging-next)
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (c0ff9019ee64 mei: drop wr_msg from the mei_dev structure)
Merging extcon/extcon-next (4239b7f76be3 Merge branch 'ib-extcon-powersupply-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into extcon-next)
Merging cgroup/for-next (44fa3a451ffe Merge branch 'for-4.8' into for-next)
Merging scsi/for-next (3236f0748964 Merge branch 'misc' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (da780c64d2b6 Merge branch 'for-4.7-fixes' into for-next)
Merging pinctrl/for-next (fe9f516997c6 Merge branch 'devel' into for-next)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (ef583d362047 Merge branch 'rproc-next' into for-next)
Merging gpio/for-next (c35285cb1570 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (318480569156 pwm: lpss: pci: Enable PWM module on Intel Edison)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (b6f4f1f2c6da Merge tag 'clk-samsung-4.8' of git://linuxtv.org/snawrocki/samsung into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1a695a905c18 Linux 4.7-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (d7005f22a2df coresight: add PM runtime calls to coresight_simple_func())
Merging rtc/rtc-next (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (dc87c36fac15 firmware-support-loading-into-a-pre-allocated-buffer-fix)
CONFLICT (content): Merge conflict in ipc/sem.c
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
Applying: mm: make optimistic check for swapin readahead fix
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Merging akpm/master (59ff404f3689 include/linux/bitmap.h: cleanup)
^ permalink raw reply
* Re: linux-next: Tree for Jun 21
From: Sudip Mukherjee @ 2016-06-21 7:01 UTC (permalink / raw)
To: Stephen Rothwell, linux-next, Peter Zijlstra (Intel), Ingo Molnar,
Chris Metcalf
Cc: linux-kernel, linux-arch
In-Reply-To: <20160621154638.1169904b@canb.auug.org.au>
On Tuesday 21 June 2016 06:46 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160620:
tilepro defconfig is failing while doing "make prepare" and bisect shows
the first bad commit as:
1af5de9af138 ("locking/atomic, arch/tile: Implement
atomic{,64}_fetch_{add,sub,and,or,xor}()")
You can find today's build log at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/139112570
Please do let me know if i can help in any way to debug/solve this.
regards
sudip
^ permalink raw reply
* Re: linux-next: Tree for Jun 21
From: Peter Zijlstra @ 2016-06-21 7:58 UTC (permalink / raw)
To: Sudip Mukherjee
Cc: Stephen Rothwell, linux-next, Ingo Molnar, Chris Metcalf,
linux-kernel, linux-arch
In-Reply-To: <5768E650.2080506@gmail.com>
On Tue, Jun 21, 2016 at 08:01:36AM +0100, Sudip Mukherjee wrote:
> tilepro defconfig is failing while doing "make prepare" and bisect shows the
> first bad commit as:
>
> 1af5de9af138 ("locking/atomic, arch/tile: Implement
> atomic{,64}_fetch_{add,sub,and,or,xor}()")
>
> You can find today's build log at:
> https://travis-ci.org/sudipm-mukherjee/parport/jobs/139112570
>
> Please do let me know if i can help in any way to debug/solve this.
I cannot reproduce, I tried both tip/master (which carries the patch you
fingered) and next/master.
My tilepro build ends in a vmlinux with just a single warning.
root@ivb-ep:/usr/src/linux-2.6# rm -rf tile-defconfig/ tile-tilepro_defconfig/
root@ivb-ep:/usr/src/linux-2.6# ./build-arch-defconfig.sh tilepro
make[1]: Entering directory `/usr/src/linux-2.6/tile-tilepro_defconfig'
HOSTCC scripts/basic/fixdep
GEN ./Makefile
HOSTCC scripts/kconfig/conf.o
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
#
# configuration written to .config
#
make[1]: Leaving directory `/usr/src/linux-2.6/tile-tilepro_defconfig'
../arch/tile/lib/cacheflush.c: In function 'finv_buffer_remote':
../arch/tile/lib/cacheflush.c:146:0: warning: ignoring #pragma unroll [-Wunknown-pragmas]
#pragma unroll 8
root@ivb-ep:/usr/src/linux-2.6# ls -la tile-tilepro_defconfig/vmlinux
vmlinux vmlinux.o
^ permalink raw reply
* next-20160621 build: 1 failures 6 warnings (next-20160621)
From: Build bot for Mark Brown @ 2016-06-21 8:39 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160621
Git describe: next-20160621
Commit: 10698aa18a Add linux-next specific files for 20160621
Build Time: 85 min 0 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 6
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
5 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-multi_v7_defconfig
69 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 ../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings Summary: 6
66 ../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
4 ../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
2 ../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 3 errors, 69 warnings, 0 section mismatches
Errors:
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings:
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/pci/host/pci-host-common.c:93:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Jun 21
From: Sudip Mukherjee @ 2016-06-21 8:55 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Stephen Rothwell, linux-next, Ingo Molnar, Chris Metcalf,
linux-kernel, linux-arch
In-Reply-To: <20160621075828.GL30154@twins.programming.kicks-ass.net>
On Tue, Jun 21, 2016 at 09:58:28AM +0200, Peter Zijlstra wrote:
> On Tue, Jun 21, 2016 at 08:01:36AM +0100, Sudip Mukherjee wrote:
>
> > tilepro defconfig is failing while doing "make prepare" and bisect shows the
> > first bad commit as:
> >
> > 1af5de9af138 ("locking/atomic, arch/tile: Implement
> > atomic{,64}_fetch_{add,sub,and,or,xor}()")
> >
> > You can find today's build log at:
> > https://travis-ci.org/sudipm-mukherjee/parport/jobs/139112570
> >
> > Please do let me know if i can help in any way to debug/solve this.
>
> I cannot reproduce, I tried both tip/master (which carries the patch you
> fingered) and next/master.
Thats strange.
The log I gave is for next-20160621.
BTW, I am using gcc-5.3.0
regards
sudip
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the arm-soc tree
From: Arnd Bergmann @ 2016-06-21 8:56 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Stephen Rothwell, David Miller, netdev, Olof Johansson,
Florian Fainelli, Pramod Kumar, linux-kernel,
Yendapally Reddy Dhananjaya Reddy, linux-next, Jon Mason
In-Reply-To: <20160621111839.34936836@canb.auug.org.au>
On Tuesday, June 21, 2016 11:18:39 AM CEST Stephen Rothwell wrote:
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm64/boot/dts/broadcom/ns2-svk.dts
> arch/arm64/boot/dts/broadcom/ns2.dtsi
>
> between commits:
>
> 97b1504a30b3 ("arm64: dts: enable pinctrl for Broadcom NS2 SoC")
> 5dcc9c7618df ("arm64: dts: NS2: Add CCI-400 PMU support")
>
> from the arm-soc tree and commit:
>
> 5f1a067bfa0a ("dt: mdio-mux: Add mdio multiplexer driver node")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Looks good to me, thanks!
I don't see a good way to resolve the conflict before the merge window,
but it's simple enough that we can just send it this way and let
Linus handle it.
Arnd
^ permalink raw reply
* RE: [Query] mwifiex: few observations to reduce number of endian conversions
From: Amitkumar Karwar @ 2016-06-21 10:17 UTC (permalink / raw)
To: Prasun Maiti, Nishant Sarmukadam
Cc: Linux Kernel, Linux Next, WiFi Mailing List, Johannes Berg
In-Reply-To: <CAEO8o4=aLbrwHka8X2h-YUCeuKoWzU0q7JWLuuaYsRW=69q_DQ@mail.gmail.com>
Hi Prasun,
> From: Prasun Maiti [mailto:prasunmaiti87@gmail.com]
> Sent: Friday, June 17, 2016 6:42 PM
> To: Amitkumar Karwar; Nishant Sarmukadam
> Cc: Linux Kernel; Linux Next; WiFi Mailing List; Johannes Berg
> Subject: [Query] mwifiex: few observations to reduce number of endian
> conversions
>
> Hi Amitkumar,
>
> I have two observations:
>
> 1. I have found that in the command response path for host command
> "HostCmd_CMD_802_11_EEPROM_ACCESS", a "0" value has been endian
> converted. It can only be a safe futuristic approach for any non-zero
> value there however! Otherwise, the endian conversion can be removed.
>
> 2. For multiple Host Commands (e.g HostCmd_CMD_802_11_EEPROM_ACCESS
> etc.) "cpu_to_leX"-converted values are saved to driver. So "leX_to_cpu"
> conversion is required too many times afterwards in driver.
> On the contrary, we can save the values to driver without any
> conversion, and only command buffer(s) are prepared with endian
> converted values. In this way we can gain some efficiency [code size /
> time] by reducing the number of endian conversion considerably.
>
I agree with your observations. We'll prepare a cleanup patch to address this.
Regards,
Amitkumar
^ permalink raw reply
* Re: [Query] mwifiex: few observations to reduce number of endian conversions
From: Prasun Maiti @ 2016-06-21 10:45 UTC (permalink / raw)
To: Amitkumar Karwar
Cc: Nishant Sarmukadam, Linux Kernel, Linux Next, WiFi Mailing List,
Johannes Berg
In-Reply-To: <ee79492a163d4b9baef75e28c7a93791-uAViF8V/CPOq90oVIqnETxL4W9x8LtSr@public.gmane.org>
Hi Amitkumar,
On Tue, Jun 21, 2016 at 3:47 PM, Amitkumar Karwar <akarwar-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> wrote:
> I agree with your observations. We'll prepare a cleanup patch to address this.
>
> Regards,
> Amitkumar
I have already made some changes. I will send you a patch for this.
--
Thanks,
Prasun
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: Tree for Jun 21
From: Chris Metcalf @ 2016-06-21 12:08 UTC (permalink / raw)
To: Sudip Mukherjee, Stephen Rothwell, linux-next,
Peter Zijlstra (Intel), Ingo Molnar
Cc: linux-kernel, linux-arch
In-Reply-To: <5768E650.2080506@gmail.com>
On 6/21/2016 3:01 AM, Sudip Mukherjee wrote:
> On Tuesday 21 June 2016 06:46 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20160620:
>
> tilepro defconfig is failing while doing "make prepare" and bisect shows the first bad commit as:
>
> 1af5de9af138 ("locking/atomic, arch/tile: Implement atomic{,64}_fetch_{add,sub,and,or,xor}()")
>
> You can find today's build log at:
> https://travis-ci.org/sudipm-mukherjee/parport/jobs/139112570
On inspection, I note that the arch/tile/include/atomic_32.h header has
ATOMIC64_OP(and)
ATOMIC64_OP(or)
ATOMIC64_OP(xor)
but these should be ATOMIC64_OPS, plural.
Peter, what toolchain were you using for tilepro build testing? You need to have a tilepro toolchain (not tilegx) and build with ARCH=tilepro.
--
Chris Metcalf, Mellanox Technologies
http://www.mellanox.com
^ permalink raw reply
* Re: linux-next: Tree for Jun 21
From: Peter Zijlstra @ 2016-06-21 12:42 UTC (permalink / raw)
To: Chris Metcalf
Cc: Sudip Mukherjee, Stephen Rothwell, linux-next, Ingo Molnar,
linux-kernel, linux-arch
In-Reply-To: <f43656af-050c-82b3-e10d-66be072be320@mellanox.com>
On Tue, Jun 21, 2016 at 08:08:29AM -0400, Chris Metcalf wrote:
>
> On inspection, I note that the arch/tile/include/atomic_32.h header has
>
> ATOMIC64_OP(and)
> ATOMIC64_OP(or)
> ATOMIC64_OP(xor)
>
> but these should be ATOMIC64_OPS, plural.
Bugger, I'll go fix. Clearly nobody has tilepro toolchains :/
> Peter, what toolchain were you using for tilepro build testing?
tilegx-linux-
> You need to have a tilepro toolchain (not tilegx)
Ah, should I go use TARGET=tilepro-linux ?
> and build with ARCH=tilepro.
tilepro)
ARCH=tile
CROSS_COMPILE=tilegx-linux-
if [ "$CONFIG" == "defconfig" ] ; then
CONFIG=tilepro_defconfig
fi
;;
So I suppose that too is wrong.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox