* 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
* linux-next: manual merge of the staging tree with the drm tree
From: Stephen Rothwell @ 2016-06-20 4:33 UTC (permalink / raw)
To: Greg KH, Dave Airlie
Cc: linux-next, linux-kernel, Christian König, Daniel Vetter,
Gustavo Padovan
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/android/sync.h
between commit:
76bf0db55439 ("dma-buf/fence: make fence context 64 bit v2")
from the drm tree and commits:
342952d3a5c4 ("staging/android: remove 'destroyed' member from struct sync_timeline")
1fe82e2e1486 ("staging/android: rename sync.h to sync_debug.h")
from the staging tree.
I fixed it up (I removed the file and applied the following fix patch)
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.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Jun 2016 14:28:29 +1000
Subject: [PATCH] staging/android: merge fix up for sync.h renaming
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/android/sync_debug.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/android/sync_debug.h b/drivers/staging/android/sync_debug.h
index 425ebc5c32aa..fab66396d421 100644
--- a/drivers/staging/android/sync_debug.h
+++ b/drivers/staging/android/sync_debug.h
@@ -34,7 +34,8 @@ struct sync_timeline {
char name[32];
/* protected by child_list_lock */
- int context, value;
+ u64 context;
+ int value;
struct list_head child_list_head;
spinlock_t child_list_lock;
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the iommu tree with the arm tree
From: Stephen Rothwell @ 2016-06-20 3:20 UTC (permalink / raw)
To: Joerg Roedel, Russell King; +Cc: linux-next, linux-kernel
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.
These are clearly 2 versions of the same patch.
I fixed it up (I assumed that tha iommu tree version was newer and used
that) 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: manual merge of the tpmdd tree with Linus' tree
From: Stephen Rothwell @ 2016-06-20 3:13 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: linux-next, linux-kernel, Srinivas Kandagatla, Rob Herring,
Christophe Ricard, Fabio Estevam
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.
--
Cheers,
Stephen Rothwell
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
* linux-next: manual merge of the block tree with the f2fs tree
From: Stephen Rothwell @ 2016-06-20 2:37 UTC (permalink / raw)
To: Jens Axboe, Jaegeuk Kim; +Cc: linux-next, linux-kernel
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
fs/f2fs/data.c
between commit:
6d63ed97a1f2 ("f2fs: detect host-managed SMR by feature flag")
from the f2fs tree and commit:
04d328defd06 ("f2fs: use bio op accessors")
from the block 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 fs/f2fs/data.c
index ba4963f51bee,8769e8349dff..000000000000
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@@ -97,16 -97,11 +97,16 @@@ static struct bio *__bio_alloc(struct f
return bio;
}
- static inline void __submit_bio(struct f2fs_sb_info *sbi, int rw,
- struct bio *bio, enum page_type type)
-static inline void __submit_bio(struct f2fs_sb_info *sbi, struct bio *bio)
++static inline void __submit_bio(struct f2fs_sb_info *sbi, struct bio *bio,
++ enum page_type type)
{
- if (!is_read_io(rw)) {
- if (!is_read_io(bio_op(bio)))
++ if (!is_read_io(bio_op(bio))) {
atomic_inc(&sbi->nr_wb_bios);
+ if (f2fs_sb_mounted_hmsmr(sbi->sb) &&
+ current->plug && (type == DATA || type == NODE))
+ blk_finish_plug(current->plug);
+ }
- submit_bio(rw, bio);
+ submit_bio(bio);
}
static void __submit_merged_bio(struct f2fs_bio_info *io)
@@@ -121,7 -116,9 +121,9 @@@
else
trace_f2fs_submit_write_bio(io->sbi->sb, fio, io->bio);
- __submit_bio(io->sbi, fio->rw, io->bio, fio->type);
+ bio_set_op_attrs(io->bio, fio->op, fio->op_flags);
+
- __submit_bio(io->sbi, io->bio);
++ __submit_bio(io->sbi, io->bio, fio->type);
io->bio = NULL;
}
@@@ -238,8 -237,10 +242,10 @@@ int f2fs_submit_page_bio(struct f2fs_io
bio_put(bio);
return -EFAULT;
}
+ bio->bi_rw = fio->op_flags;
+ bio_set_op_attrs(bio, fio->op, fio->op_flags);
- __submit_bio(fio->sbi, fio->rw, bio, fio->type);
- __submit_bio(fio->sbi, bio);
++ __submit_bio(fio->sbi, bio, fio->type);
return 0;
}
@@@ -1044,7 -1057,7 +1051,7 @@@ got_it
*/
if (bio && (last_block_in_bio != block_nr - 1)) {
submit_and_realloc:
- __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
- __submit_bio(F2FS_I_SB(inode), bio);
++ __submit_bio(F2FS_I_SB(inode), bio, DATA);
bio = NULL;
}
if (bio == NULL) {
@@@ -1087,7 -1101,7 +1095,7 @@@ set_error_page
goto next_page;
confused:
if (bio) {
- __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
- __submit_bio(F2FS_I_SB(inode), bio);
++ __submit_bio(F2FS_I_SB(inode), bio, DATA);
bio = NULL;
}
unlock_page(page);
@@@ -1097,7 -1111,7 +1105,7 @@@ next_page
}
BUG_ON(pages && !list_empty(pages));
if (bio)
- __submit_bio(F2FS_I_SB(inode), READ, bio, DATA);
- __submit_bio(F2FS_I_SB(inode), bio);
++ __submit_bio(F2FS_I_SB(inode), bio, DATA);
return 0;
}
^ permalink raw reply
* linux-next: build warnings after merge of the pci tree
From: Stephen Rothwell @ 2016-06-20 1:52 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-next, linux-kernel
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")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-06-20 1:28 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Sowmini Varadhan
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/rds/tcp_listen.c
between commit:
3bb549ae4c51 ("RDS: TCP: rds_tcp_accept_one() should transition socket from RESETTING to UP")
from the net tree and commit:
0cb43965d42a ("RDS: split out connection specific state from rds_connection to rds_conn_path")
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 net/rds/tcp_listen.c
index 245542ca4718,22d9bb15f731..000000000000
--- a/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@@ -136,9 -137,10 +137,10 @@@ int rds_tcp_accept_one(struct socket *s
goto rst_nsk;
} else {
rds_tcp_reset_callbacks(new_sock, conn);
- conn->c_outgoing = 0;
+ conn->c_path[0].cp_outgoing = 0;
/* rds_connect_path_complete() marks RDS_CONN_UP */
- rds_connect_path_complete(conn, RDS_CONN_RESETTING);
+ rds_connect_path_complete(&conn->c_path[0],
- RDS_CONN_DISCONNECTING);
++ RDS_CONN_RESETTING);
}
} else {
rds_tcp_set_callbacks(new_sock, conn);
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-06-20 1:25 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Joshua Houghton, Sowmini Varadhan
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/rds/tcp_connect.c
between commit:
5c3da57d70f1 ("net: rds: fix coding style issues")
from the net tree and commit:
0cb43965d42a ("RDS: split out connection specific state from rds_connection to rds_conn_path")
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 net/rds/tcp_connect.c
index f6e95d60db54,ba9ec67f4e41..000000000000
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@@ -54,19 -55,20 +55,20 @@@ void rds_tcp_state_change(struct sock *
rdsdebug("sock %p state_change to %d\n", tc->t_sock, sk->sk_state);
- switch(sk->sk_state) {
- /* ignore connecting sockets as they make progress */
- case TCP_SYN_SENT:
- case TCP_SYN_RECV:
- break;
- case TCP_ESTABLISHED:
- rds_connect_path_complete(&conn->c_path[0],
- RDS_CONN_CONNECTING);
- break;
- case TCP_CLOSE_WAIT:
- case TCP_CLOSE:
- rds_conn_drop(conn);
- default:
- break;
+ switch (sk->sk_state) {
+ /* ignore connecting sockets as they make progress */
+ case TCP_SYN_SENT:
+ case TCP_SYN_RECV:
+ break;
+ case TCP_ESTABLISHED:
- rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
++ rds_connect_path_complete(&conn->c_path[0],
++ RDS_CONN_CONNECTING);
+ break;
+ case TCP_CLOSE_WAIT:
+ case TCP_CLOSE:
+ rds_conn_drop(conn);
+ default:
+ break;
}
out:
read_unlock_bh(&sk->sk_callback_lock);
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-06-20 1:20 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Yuval Mintz
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/qlogic/qed/qed_hsi.h
between commit:
b639f197210d ("qed: Add missing port-mode")
from the net tree and commit:
351a4dedb34c ("qed: Utilize FW 8.10.3.0")
from the net-next tree.
I fixed it up (the net-next tree version is a superset of the net tree
version) 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
* Re: linux-next: manual merge of the staging tree with the staging.current tree
From: Jonathan Cameron @ 2016-06-19 20:17 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH; +Cc: linux-next, linux-kernel, Crestez Dan Leonard
In-Reply-To: <20160614150422.66d652de@canb.auug.org.au>
On 14/06/16 06:04, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/industrialio-trigger.c
>
> between commit:
>
> 995438233579 ("iio: Fix error handling in iio_trigger_attach_poll_func")
>
> from the staging.current tree and commit:
>
> ef2d71d6b7fb ("iio: triggers: Make trigger ops structure explicitly non optional.")
>
> from the staging 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.
>
Thanks Stephen,
Looks great.
Jonathan
^ permalink raw reply
* Re: [PATCH] i2c: remove __init from i2c_register_board_info()
From: Wolfram Sang @ 2016-06-19 12:15 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: linux-i2c, linux-kernel, feng.tang, linux-next
In-Reply-To: <1465343547-19974-1-git-send-email-mcgrof@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 1484 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* [PATCH 2/2] ipc/sem: sem_lock with hysteresis
From: Manfred Spraul @ 2016-06-18 20:02 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Andrew Morton
Cc: LKML, linux-next, 1vier1, Davidlohr Bueso, felixh, Manfred Spraul
In-Reply-To: <1466280142-19741-1-git-send-email-manfred@colorfullife.com>
sysv sem has two lock modes: One with per-semaphore locks, one lock mode
with a single big lock for the whole array.
When switching from the per-semaphore locks to the big lock, all
per-semaphore locks must be scanned for ongoing operations.
The patch adds a hysteresis for switching from the big lock to the per
semaphore locks. This reduces how often the per-semaphore locks must
be scanned.
Passed stress testing with sem-scalebench.
Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
---
include/linux/sem.h | 2 +-
ipc/sem.c | 91 ++++++++++++++++++++++++++++-------------------------
2 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/include/linux/sem.h b/include/linux/sem.h
index d0efd6e..6fb3227 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -21,7 +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 */
- bool complex_mode; /* no parallel simple ops */
+ int complex_mode; /* >0: no parallel simple ops */
};
#ifdef CONFIG_SYSVIPC
diff --git a/ipc/sem.c b/ipc/sem.c
index 11d9e60..1f43fb8 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -161,6 +161,13 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
#define SEMOPM_FAST 64 /* ~ 372 bytes on stack */
/*
+ * Switching from the mode suitable for simple ops
+ * to the mode for complex ops is costly. Therefore:
+ * use some hysteresis
+ */
+#define COMPLEX_MODE_ENTER 10
+
+/*
* Locking:
* a) global sem_lock() for read/write
* sem_undo.id_next,
@@ -279,17 +286,25 @@ static void sem_rcu_free(struct rcu_head *head)
/*
* Enter the mode suitable for non-simple operations:
* Caller must own sem_perm.lock.
+ * Note:
+ * There is no leave complex mode function. Leaving
+ * happens in sem_lock, with some hysteresis.
*/
static void complexmode_enter(struct sem_array *sma)
{
int i;
struct sem *sem;
- if (sma->complex_mode) {
- /* We are already in complex_mode. Nothing to do */
+ if (sma->complex_mode > 0) {
+ /*
+ * We are already in complex_mode.
+ * Nothing to do, just increase
+ * counter until we return to simple mode
+ */
+ WRITE_ONCE(sma->complex_mode, COMPLEX_MODE_ENTER);
return;
}
- WRITE_ONCE(sma->complex_mode, true);
+ WRITE_ONCE(sma->complex_mode, COMPLEX_MODE_ENTER);
/* We need a full barrier:
* The write to complex_mode must be visible
@@ -305,29 +320,6 @@ static void complexmode_enter(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);
-}
-
-/*
* 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
@@ -383,27 +375,42 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
ipc_lock_object(&sma->sem_perm);
if (sma->complex_count == 0) {
- /* False alarm:
- * There is no complex operation, thus we can switch
- * back to the fast path.
- */
- spin_lock(&sem->lock);
- ipc_unlock_object(&sma->sem_perm);
- return sops->sem_num;
- } else {
- /* Not a false alarm, thus complete the sequence for a
- * full lock.
+ /*
+ * Check if fast path is possible:
+ * There is no complex operation, check hysteresis
+ * If 0, switch back to the fast path.
*/
- complexmode_enter(sma);
- return -1;
+ if (sma->complex_mode > 0) {
+ /* Note:
+ * Immediately after setting complex_mode to 0,
+ * a simple op could start.
+ * The data it would access was written by the
+ * previous owner of sem->sem_perm.lock, i.e
+ * a release and an acquire memory barrier ago.
+ * No need for another barrier.
+ */
+ WRITE_ONCE(sma->complex_mode, sma->complex_mode-1);
+ }
+ if (sma->complex_mode == 0) {
+ spin_lock(&sem->lock);
+ ipc_unlock_object(&sma->sem_perm);
+ return sops->sem_num;
+ }
}
+ /*
+ * Not a false alarm, full lock is required.
+ * Since we are already in complex_mode (either because of waiting
+ * complex ops or due to hysteresis), there is not need for a
+ * complexmode_enter().
+ */
+ WARN_ON(sma->complex_mode == 0);
+ return -1;
}
static inline void sem_unlock(struct sem_array *sma, int locknum)
{
if (locknum == -1) {
unmerge_queues(sma);
- complexmode_tryleave(sma);
ipc_unlock_object(&sma->sem_perm);
} else {
struct sem *sem = sma->sem_base + locknum;
@@ -555,7 +562,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
}
sma->complex_count = 0;
- sma->complex_mode = true; /* dropped by sem_unlock below */
+ WRITE_ONCE(sma->complex_mode, COMPLEX_MODE_ENTER);
INIT_LIST_HEAD(&sma->pending_alter);
INIT_LIST_HEAD(&sma->pending_const);
INIT_LIST_HEAD(&sma->list_id);
@@ -2212,7 +2219,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
* The proc interface isn't aware of sem_lock(), it calls
* ipc_lock_object() directly (in sysvipc_find_ipc).
* In order to stay compatible with sem_lock(), we must
- * enter / leave complex_mode.
+ * enter complex_mode.
*/
complexmode_enter(sma);
@@ -2231,8 +2238,6 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
sem_otime,
sma->sem_ctime);
- complexmode_tryleave(sma);
-
return 0;
}
#endif
--
2.5.5
^ permalink raw reply related
* [PATCH 1/2] ipc/sem.c: Fix complex_count vs. simple op race
From: Manfred Spraul @ 2016-06-18 20:02 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Andrew Morton
Cc: LKML, linux-next, 1vier1, Davidlohr Bueso, felixh, Manfred Spraul,
stable
In-Reply-To: <20160615152318.164b1ebd@canb.auug.org.au>
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?)
The alternative is to revert the patch that introduced the race.
Background:
Here is the race of the current implementation:
Thread A: (simple op)
- does the first "sma->complex_count == 0" test
Thread B: (complex op)
- does sem_lock(): This includes an array scan. But the scan can't
find Thread A, because Thread A does not own sem->lock yet.
- the thread does the operation, increases complex_count,
drops sem_lock, sleeps
Thread A:
- spin_lock(&sem->lock), spin_is_locked(sma->sem_perm.lock)
- sleeps before the complex_count test
Thread C: (complex op)
- does sem_lock (no array scan, complex_count==1)
- wakes up Thread B.
- decrements complex_count
Thread A:
- does the complex_count test
Bug:
Now both thread A and thread C operate on the same array, without
any synchronization.
Fixes: 6d07b68ce16a ("ipc/sem.c: optimize sem_lock()")
Reported-by: felixh@informatik.uni-bremen.de
Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
Cc: <stable@vger.kernel.org>
---
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 */
+ bool complex_mode; /* no parallel simple ops */
};
#ifdef CONFIG_SYSVIPC
diff --git a/ipc/sem.c b/ipc/sem.c
index ae72b3c..db2e6fc 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -162,14 +162,21 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
/*
* Locking:
+ * a) global sem_lock() for read/write
* sem_undo.id_next,
* sem_array.complex_count,
- * sem_array.pending{_alter,_cont},
- * sem_array.sem_undo: global sem_lock() for read/write
- * sem_undo.proc_next: only "current" is allowed to read/write that field.
+ * sem_array.complex_mode
+ * sem_array.pending{_alter,_const},
+ * sem_array.sem_undo
*
+ * b) global or semaphore sem_lock() for read/write:
* sem_array.sem_base[i].pending_{const,alter}:
- * global or semaphore sem_lock() for read/write
+ * sem_array.complex_mode (for read)
+ *
+ * c) special:
+ * sem_undo_list.list_proc:
+ * * undo_list->lock for write
+ * * rcu for read
*/
#define sc_semmsl sem_ctls[0]
@@ -260,23 +267,25 @@ static void sem_rcu_free(struct rcu_head *head)
}
/*
- * 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 */
return;
}
+ 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);
+}
+
+/*
* 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)) {
/*
* It appears that no complex operation is around.
* Acquire the per-semaphore lock.
*/
spin_lock(&sem->lock);
- /* Then check that the global lock is free */
- if (!spin_is_locked(&sma->sem_perm.lock)) {
- /*
- * We need a memory barrier with acquire semantics,
- * otherwise we can race with another thread that does:
- * complex_count++;
- * spin_unlock(sem_perm.lock);
- */
- smp_acquire__after_ctrl_dep();
-
- /*
- * Now repeat the test of complex_count:
- * It can't change anymore until we drop sem->lock.
- * Thus: if is now 0, then it will stay 0.
- */
- if (sma->complex_count == 0) {
- /* fast path successful! */
- return sops->sem_num;
- }
+ /* Now repeat the test for complex_mode.
+ * A memory barrier is provided by the spin_lock()
+ * above.
+ */
+ if (!READ_ONCE(sma->complex_mode)) {
+ /* fast path successful! */
+ return sops->sem_num;
}
spin_unlock(&sem->lock);
}
@@ -369,7 +383,7 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
/* Not a false alarm, thus complete the sequence for a
* full lock.
*/
- sem_wait_array(sma);
+ complexmode_enter(sma);
return -1;
}
}
@@ -378,6 +392,7 @@ static inline void sem_unlock(struct sem_array *sma, int locknum)
{
if (locknum == -1) {
unmerge_queues(sma);
+ complexmode_tryleave(sma);
ipc_unlock_object(&sma->sem_perm);
} else {
struct sem *sem = sma->sem_base + locknum;
@@ -529,6 +544,7 @@ static int newary(struct ipc_namespace *ns, struct ipc_params *params)
}
sma->complex_count = 0;
+ sma->complex_mode = true; /* dropped by sem_unlock below */
INIT_LIST_HEAD(&sma->pending_alter);
INIT_LIST_HEAD(&sma->pending_const);
INIT_LIST_HEAD(&sma->list_id);
@@ -2184,10 +2200,10 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
/*
* The proc interface isn't aware of sem_lock(), it calls
* ipc_lock_object() directly (in sysvipc_find_ipc).
- * In order to stay compatible with sem_lock(), we must wait until
- * all simple semop() calls have left their critical regions.
+ * In order to stay compatible with sem_lock(), we must
+ * enter / leave complex_mode.
*/
- sem_wait_array(sma);
+ complexmode_enter(sma);
sem_otime = get_semotime(sma);
@@ -2204,6 +2220,8 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
sem_otime,
sma->sem_ctime);
+ complexmode_tryleave(sma);
+
return 0;
}
#endif
^ permalink raw reply related
* Re: linux-next: manual merge of the akpm-current tree with the tip tree
From: Manfred Spraul @ 2016-06-18 19:39 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel
In-Reply-To: <20160615152318.164b1ebd@canb.auug.org.au>
Hi,
On 06/15/2016 07:23 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> ipc/sem.c
>
> between commit:
>
> 33ac279677dc ("locking/barriers: Introduce smp_acquire__after_ctrl_dep()")
>
> from the tip tree and commit:
>
> a1c58ea067cb ("ipc/sem.c: Fix complex_count vs. simple op race")
>
> from the akpm-current tree.
Just in case, I have created a rediff of my patch against -tip.
And the patch with hysteresis would be ready as well.
I will send both patches.
More testers would be welcome, I can only test it on my laptop.
--
Manfred
^ permalink raw reply
* Re: [PATCH v5 2/4] gpio: Allow PC/104 devices on X86_64
From: Greg KH @ 2016-06-18 3:47 UTC (permalink / raw)
To: William Breathitt Gray
Cc: Thorsten Leemhuis, Linus Walleij, Andrew Morton,
x86-DgEjT+Ai2ygdnm+yROfE0A,
linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, Stephen Rothwell,
Guenter Roeck, Alexandre Courbot,
sasha.levin-QHcLZuEGTsvQT0dZR+AlfA,
xiaolong.ye-ral2JQCrhuEAvxtiuMwx3w
In-Reply-To: <20160618033812.GA20596@sophia>
On Fri, Jun 17, 2016 at 11:39:04PM -0400, William Breathitt Gray wrote:
> On Fri, Jun 17, 2016 at 08:18:10PM -0700, Greg KH wrote:
> >On Fri, Jun 17, 2016 at 10:49:59PM -0400, William Breathitt Gray wrote:
> >> The PC/104 drivers were changed to utilize the ISA bus driver as part of
> >> the original patchset which attempted to decouple the X86_32 dependency
> >> from the ISA Kconfig option; these drivers were updated with the
> >> intention of building on X86_64 in addition to X86_32.
> >>
> >> However, the respective patches were merged without the decoupling
> >> changes (since decoupling was the wrong approach), resulting in an
> >> unintentional regression: the PC/104 drivers are now restricted to
> >> X86_32 due to the ISA Kconfig option dependency, while they were capable
> >> of building for X86_64 in previous kernel versions.
> >>
> >> This patchset should fix this regression by introducing the ISA_BUS_API
> >> Kconfig option, and the respective Kconfig dependency changes for the
> >> drivers, in order to allow them to build for both X86_64 and X86_32 as
> >> originally capable.
> >
> >Ah, ok, that makes more sense, thanks. I'll go queue these up now.
> >
> >greg k-h
>
> Greg K-H,
>
> Please also consider picking up the following two patches which fix bugs
> discovered during the ISA bus driver utilization conversion:
>
> 1. https://patchwork.kernel.org/patch/9046831/
> 2. https://patchwork.kernel.org/patch/9074641/
>
> The second patch in particular fixes a kernel BUG which prevents some
> drivers that call isa_register_driver from being built-in. This was
> first reported by Sasha Levin (https://lkml.org/lkml/2016/5/11/719), and
> the patch was later tested by Ye Xiaolong
> (https://lkml.org/lkml/2016/5/31/164).
Now queued up, thanks for the prompt, they were still setting in my
queue.
greg k-h
^ permalink raw reply
* Re: [PATCH v5 2/4] gpio: Allow PC/104 devices on X86_64
From: William Breathitt Gray @ 2016-06-18 3:39 UTC (permalink / raw)
To: Greg KH
Cc: Thorsten Leemhuis, Linus Walleij, Andrew Morton, x86,
linux-next@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-watchdog, Stephen Rothwell, Guenter Roeck,
Alexandre Courbot, sasha.levin, xiaolong.ye
In-Reply-To: <20160618031810.GA29160@kroah.com>
On Fri, Jun 17, 2016 at 08:18:10PM -0700, Greg KH wrote:
>On Fri, Jun 17, 2016 at 10:49:59PM -0400, William Breathitt Gray wrote:
>> The PC/104 drivers were changed to utilize the ISA bus driver as part of
>> the original patchset which attempted to decouple the X86_32 dependency
>> from the ISA Kconfig option; these drivers were updated with the
>> intention of building on X86_64 in addition to X86_32.
>>
>> However, the respective patches were merged without the decoupling
>> changes (since decoupling was the wrong approach), resulting in an
>> unintentional regression: the PC/104 drivers are now restricted to
>> X86_32 due to the ISA Kconfig option dependency, while they were capable
>> of building for X86_64 in previous kernel versions.
>>
>> This patchset should fix this regression by introducing the ISA_BUS_API
>> Kconfig option, and the respective Kconfig dependency changes for the
>> drivers, in order to allow them to build for both X86_64 and X86_32 as
>> originally capable.
>
>Ah, ok, that makes more sense, thanks. I'll go queue these up now.
>
>greg k-h
Greg K-H,
Please also consider picking up the following two patches which fix bugs
discovered during the ISA bus driver utilization conversion:
1. https://patchwork.kernel.org/patch/9046831/
2. https://patchwork.kernel.org/patch/9074641/
The second patch in particular fixes a kernel BUG which prevents some
drivers that call isa_register_driver from being built-in. This was
first reported by Sasha Levin (https://lkml.org/lkml/2016/5/11/719), and
the patch was later tested by Ye Xiaolong
(https://lkml.org/lkml/2016/5/31/164).
Thanks,
William Breathitt Gray
^ permalink raw reply
* Re: [PATCH v5 2/4] gpio: Allow PC/104 devices on X86_64
From: Greg KH @ 2016-06-18 3:18 UTC (permalink / raw)
To: William Breathitt Gray
Cc: Thorsten Leemhuis, Linus Walleij, Andrew Morton, x86,
linux-next@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-watchdog, Stephen Rothwell, Guenter Roeck,
Alexandre Courbot
In-Reply-To: <20160618024959.GA4702@sophia>
On Fri, Jun 17, 2016 at 10:49:59PM -0400, William Breathitt Gray wrote:
> On Fri, Jun 17, 2016 at 07:36:07PM -0700, Greg KH wrote:
> >On Fri, Jun 17, 2016 at 12:47:14PM +0200, Thorsten Leemhuis wrote:
> >> On 31.05.2016 17:25, Greg KH wrote:
> >> > On Tue, May 31, 2016 at 07:23:06AM -0400, William Breathitt Gray wrote:
> >> >> On Tue, May 31, 2016 at 10:41:49AM +0200, Linus Walleij wrote:
> >> >>> On Sat, May 28, 2016 at 12:08 AM, William Breathitt Gray
> >> >>> <vilhelm.gray@gmail.com> wrote:
> >> >>>> With the introduction of the ISA_BUS_API Kconfig option, ISA-style
> >> >>>> drivers may be built for X86_64 architectures. This patch changes the
> >> >>>> ISA Kconfig option dependency of the PC/104 drivers to ISA_BUS_API, thus
> >> >>>> allowing them to build for X86_64 as they are expected to.
> >> > […]
> >> >> Greg K-H,
> >> >>
> >> >> Would you be able to pick up this entire patchset via driver-core; I
> >> >> figure that tree is the most appropriate to receive any core ISA bus
> >> >> driver changes (unless you see a more fitting path to take).
> >> > […]
> >> > Yes, I can take this through the driver core tree as that's where the
> >> > original series came from...
> >>
> >> Was this series merged or did it fell through the cracks? I currently
> >> assume the latter, as I can't see it in neither mainline nor linux-next
> >> (but maybe I'm missing something). Just wondering, because I have this
> >> issue on my regression list for 4.7.
> >>
> >> For the whole context see:
> >> http://thread.gmane.org/gmane.linux.kernel.gpio/17016/
> >>
> >> Sincerely, your regression tracker for Linux 4.7 (http://bit.ly/28JRmJo)
> >
> >I don't think this is a regression, I was going to queue these up for
> >4.8-rc1. As it is now, 4.7-rc is working just fine in this regards,
> >right?
> >
> >Or am I missing something?
>
> The PC/104 drivers were changed to utilize the ISA bus driver as part of
> the original patchset which attempted to decouple the X86_32 dependency
> from the ISA Kconfig option; these drivers were updated with the
> intention of building on X86_64 in addition to X86_32.
>
> However, the respective patches were merged without the decoupling
> changes (since decoupling was the wrong approach), resulting in an
> unintentional regression: the PC/104 drivers are now restricted to
> X86_32 due to the ISA Kconfig option dependency, while they were capable
> of building for X86_64 in previous kernel versions.
>
> This patchset should fix this regression by introducing the ISA_BUS_API
> Kconfig option, and the respective Kconfig dependency changes for the
> drivers, in order to allow them to build for both X86_64 and X86_32 as
> originally capable.
Ah, ok, that makes more sense, thanks. I'll go queue these up now.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH v5 2/4] gpio: Allow PC/104 devices on X86_64
From: William Breathitt Gray @ 2016-06-18 2:49 UTC (permalink / raw)
To: Greg KH
Cc: Thorsten Leemhuis, Linus Walleij, Andrew Morton, x86,
linux-next@vger.kernel.org, linux-gpio@vger.kernel.org,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-watchdog, Stephen Rothwell, Guenter Roeck,
Alexandre Courbot
In-Reply-To: <20160618023607.GA7390@kroah.com>
On Fri, Jun 17, 2016 at 07:36:07PM -0700, Greg KH wrote:
>On Fri, Jun 17, 2016 at 12:47:14PM +0200, Thorsten Leemhuis wrote:
>> On 31.05.2016 17:25, Greg KH wrote:
>> > On Tue, May 31, 2016 at 07:23:06AM -0400, William Breathitt Gray wrote:
>> >> On Tue, May 31, 2016 at 10:41:49AM +0200, Linus Walleij wrote:
>> >>> On Sat, May 28, 2016 at 12:08 AM, William Breathitt Gray
>> >>> <vilhelm.gray@gmail.com> wrote:
>> >>>> With the introduction of the ISA_BUS_API Kconfig option, ISA-style
>> >>>> drivers may be built for X86_64 architectures. This patch changes the
>> >>>> ISA Kconfig option dependency of the PC/104 drivers to ISA_BUS_API, thus
>> >>>> allowing them to build for X86_64 as they are expected to.
>> > […]
>> >> Greg K-H,
>> >>
>> >> Would you be able to pick up this entire patchset via driver-core; I
>> >> figure that tree is the most appropriate to receive any core ISA bus
>> >> driver changes (unless you see a more fitting path to take).
>> > […]
>> > Yes, I can take this through the driver core tree as that's where the
>> > original series came from...
>>
>> Was this series merged or did it fell through the cracks? I currently
>> assume the latter, as I can't see it in neither mainline nor linux-next
>> (but maybe I'm missing something). Just wondering, because I have this
>> issue on my regression list for 4.7.
>>
>> For the whole context see:
>> http://thread.gmane.org/gmane.linux.kernel.gpio/17016/
>>
>> Sincerely, your regression tracker for Linux 4.7 (http://bit.ly/28JRmJo)
>
>I don't think this is a regression, I was going to queue these up for
>4.8-rc1. As it is now, 4.7-rc is working just fine in this regards,
>right?
>
>Or am I missing something?
The PC/104 drivers were changed to utilize the ISA bus driver as part of
the original patchset which attempted to decouple the X86_32 dependency
from the ISA Kconfig option; these drivers were updated with the
intention of building on X86_64 in addition to X86_32.
However, the respective patches were merged without the decoupling
changes (since decoupling was the wrong approach), resulting in an
unintentional regression: the PC/104 drivers are now restricted to
X86_32 due to the ISA Kconfig option dependency, while they were capable
of building for X86_64 in previous kernel versions.
This patchset should fix this regression by introducing the ISA_BUS_API
Kconfig option, and the respective Kconfig dependency changes for the
drivers, in order to allow them to build for both X86_64 and X86_32 as
originally capable.
William Breathitt Gray
^ permalink raw reply
* Re: [PATCH v5 2/4] gpio: Allow PC/104 devices on X86_64
From: Greg KH @ 2016-06-18 2:36 UTC (permalink / raw)
To: Thorsten Leemhuis
Cc: William Breathitt Gray, Linus Walleij, Andrew Morton,
x86-DgEjT+Ai2ygdnm+yROfE0A,
linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-gpio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, Stephen Rothwell,
Guenter Roeck, Alexandre Courbot
In-Reply-To: <057d8c0b-074c-609a-35da-5a01f07b6d31-rCxcAJFjeRkk+I/owrrOrA@public.gmane.org>
On Fri, Jun 17, 2016 at 12:47:14PM +0200, Thorsten Leemhuis wrote:
> On 31.05.2016 17:25, Greg KH wrote:
> > On Tue, May 31, 2016 at 07:23:06AM -0400, William Breathitt Gray wrote:
> >> On Tue, May 31, 2016 at 10:41:49AM +0200, Linus Walleij wrote:
> >>> On Sat, May 28, 2016 at 12:08 AM, William Breathitt Gray
> >>> <vilhelm.gray-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> >>>> With the introduction of the ISA_BUS_API Kconfig option, ISA-style
> >>>> drivers may be built for X86_64 architectures. This patch changes the
> >>>> ISA Kconfig option dependency of the PC/104 drivers to ISA_BUS_API, thus
> >>>> allowing them to build for X86_64 as they are expected to.
> > […]
> >> Greg K-H,
> >>
> >> Would you be able to pick up this entire patchset via driver-core; I
> >> figure that tree is the most appropriate to receive any core ISA bus
> >> driver changes (unless you see a more fitting path to take).
> > […]
> > Yes, I can take this through the driver core tree as that's where the
> > original series came from...
>
> Was this series merged or did it fell through the cracks? I currently
> assume the latter, as I can't see it in neither mainline nor linux-next
> (but maybe I'm missing something). Just wondering, because I have this
> issue on my regression list for 4.7.
>
> For the whole context see:
> http://thread.gmane.org/gmane.linux.kernel.gpio/17016/
>
> Sincerely, your regression tracker for Linux 4.7 (http://bit.ly/28JRmJo)
I don't think this is a regression, I was going to queue these up for
4.8-rc1. As it is now, 4.7-rc is working just fine in this regards,
right?
Or am I missing something?
thanks,
greg k-h
^ permalink raw reply
* [Query] mwifiex: few observations to reduce number of endian conversions
From: Prasun Maiti @ 2016-06-17 13:11 UTC (permalink / raw)
To: Amitkumar Karwar, Nishant Sarmukadam
Cc: Linux Kernel, Linux Next, WiFi Mailing List, Johannes Berg
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.
Please let me know your opinion on the above.
--
Thanks,
Prasun
^ permalink raw reply
* Re: [PATCH v5 2/4] gpio: Allow PC/104 devices on X86_64
From: Thorsten Leemhuis @ 2016-06-17 10:47 UTC (permalink / raw)
To: Greg KH, William Breathitt Gray
Cc: Linus Walleij, Andrew Morton, x86, linux-next@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-watchdog, Stephen Rothwell,
Guenter Roeck, Alexandre Courbot
In-Reply-To: <20160531152541.GB13304@kroah.com>
On 31.05.2016 17:25, Greg KH wrote:
> On Tue, May 31, 2016 at 07:23:06AM -0400, William Breathitt Gray wrote:
>> On Tue, May 31, 2016 at 10:41:49AM +0200, Linus Walleij wrote:
>>> On Sat, May 28, 2016 at 12:08 AM, William Breathitt Gray
>>> <vilhelm.gray@gmail.com> wrote:
>>>> With the introduction of the ISA_BUS_API Kconfig option, ISA-style
>>>> drivers may be built for X86_64 architectures. This patch changes the
>>>> ISA Kconfig option dependency of the PC/104 drivers to ISA_BUS_API, thus
>>>> allowing them to build for X86_64 as they are expected to.
> […]
>> Greg K-H,
>>
>> Would you be able to pick up this entire patchset via driver-core; I
>> figure that tree is the most appropriate to receive any core ISA bus
>> driver changes (unless you see a more fitting path to take).
> […]
> Yes, I can take this through the driver core tree as that's where the
> original series came from...
Was this series merged or did it fell through the cracks? I currently
assume the latter, as I can't see it in neither mainline nor linux-next
(but maybe I'm missing something). Just wondering, because I have this
issue on my regression list for 4.7.
For the whole context see:
http://thread.gmane.org/gmane.linux.kernel.gpio/17016/
Sincerely, your regression tracker for Linux 4.7 (http://bit.ly/28JRmJo)
Thorsten
^ permalink raw reply
* next-20160617 build: 1 failures 8 warnings (next-20160617)
From: Build bot for Mark Brown @ 2016-06-17 9:23 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160617
Git describe: next-20160617
Commit: ce24ed9ec7 Add linux-next specific files for 20160617
Build Time: 138 min 55 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 8
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):
7 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-multi_v7_defconfig
70 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 ../include/linux/compiler-gcc.h:243:38: error: impossible constraint in 'asm'
Warnings Summary: 8
66 ../include/linux/compiler-gcc.h:243:38: warning: asm operand 0 probably doesn't match constraints
4 ../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
2 ../net/rxrpc/peer_object.c:57:15: warning: 'p' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/linux/kfifo.h:403:39: warning: 'ge.id' 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 : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
../include/linux/kernel.h:743:17: warning: comparison of distinct pointer types lacks a cast
../include/linux/kfifo.h:403:39: warning: 'ge.id' may be used uninitialized in this function [-Wmaybe-uninitialized]
../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/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, 1 warnings, 0 section mismatches
Warnings:
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 3 errors, 70 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:
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
../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/staging/ks7010/ks7010_config.c:263:8: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/clk/sunxi/clk-sun4i-tcon-ch1.c:82:6: warning: unused variable 'num_parents' [-Wunused-variable]
../include/linux/kfifo.h:403:39: warning: 'ge.id' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Jun 17
From: Stephen Rothwell @ 2016-06-17 4:19 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160616:
Non-merge commits (relative to Linus' tree): 3866
3847 files changed, 179431 insertions(+), 67790 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 (d325ea859490 Merge tag 'drm-fixes-for-v4.7-rc4' of git://people.freedesktop.org/~airlied/linux)
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 (a547224dceed mlx4e: Do not attempt to offload VXLAN ports that are unrecognized)
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 (35639a0e9839 ALSA: hda - Add PCI ID for Kabylake)
Merging pci-current/for-linus (96381c04ef9b PCI: hv: Handle all pending messages in hv_pci_onchannelcallback())
Merging driver-core.current/driver-core-linus (7e1b1fc4dabd base: make module_create_drivers_dir race-free)
Merging tty.current/tty-linus (5edb56491d48 Linux 4.7-rc3)
Merging usb.current/usb-linus (1c4bf5ac6a16 usb: musb: sunxi: Remove bogus "Frees glue" comment)
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 (a9cc4006155a staging: lustre: lnet: Don't access NULL NI on failure path)
Merging char-misc.current/char-misc-linus (5014e904681d coresight: Handle build path error)
Merging input-current/for-linus (540c26087bfb Input: xpad - fix rumble on Xbox One controllers with 2015 firmware)
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 (c524c9d378f8 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 (ec0776a212c1 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 (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 (f823934678b5 Merge tag 'omap-for-v4.7/fixes-powedomain' 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 (652dd6217c3d 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 (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
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 (6e45273eacc8 powerpc/pseries: Fix trivial typo in function name)
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 (085024a4d714 Merge branch 'for-next-next-4.7-20160615' into for-next-20160615)
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 (b9d8905e4a75 reiserfs: check kstrdup failure)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (4c18edbeae18 f2fs: detect host-managed SMR by feature flag)
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 (36e4ad0316c0 GFS2: don't set rgrp gl_object until it's inserted into rgrp tree)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (a12a4fc64de7 Merge branch 'writeback')
Merging nfsd/nfsd-next (7c6e929350a0 nfsd: allow nfsd to advertise multiple layout types)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (994cb2193588 ovl: store ovl_entry in inode->i_private for all inodes)
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 (af8c34ce6ae3 Linux 4.7-rc2)
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (9037766900ff Merge branch 'for-4.8/i2c-hid' into for-next)
Merging i2c/i2c/for-next (33c77abcf4aa i2c: robotfuzz-osif: Constify osif_table)
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 (6bd8de90309e hwmon: Add support for INA3221 Triple Current/Voltage Monitors)
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 (93cd3a393aeb 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 (40309d26549e net: tlan: don't set unused function argument)
CONFLICT (content): Merge conflict in tools/virtio/ringtest/Makefile
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 (29477269a27d brcmfmac: include required headers in cfg80211.h)
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 (b0f8a122a6df Merge branch 'topic/xrq-api' 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 (ee042aa40b66 drm/i915: Use atomic commits for legacy page_flips)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (2a6ae85a3830 drm: rockchip: select DRM_GEM_CMA_HELPER)
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 (ac17bf0c25e3 Merge branches 'sunxi/clk-fixes-for-4.7' and 'sunxi/dt-for-4.8' 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 (76f64b24e692 ALSA: seq_oss: Change structure initialisation to C99 style)
Merging sound-asoc/for-next (54e5ab0ab224 Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx', 'asoc/topic/twl6040' 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 (1afca2b66aac Input: add Pegasus Notetaker tablet driver)
Merging block/for-next (9b541feb4dd3 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 (d04b674e1887 power/reset: make syscon_poweroff() static)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (9e8cb76c328d 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 (40d273782ff1 security: tomoyo: simplify the gc kthread creation)
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 (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (1a695a905c18 Linux 4.7-rc1)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' 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 (2237b1962b67 Merge branch 'locking/arch-atomic')
Merging clockevents/clockevents/next (ba7b4f7acecb 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 (ab564cb51ee6 EDAC, altera: Handle Arria10 SDRAM child node)
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 (4a4c3137ae37 rcu: Fix soft lockup for rcu_nocb_kthread)
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 (ed7bdf5c9c15 staging: lustre: hide call to Posix ACL in ifdef)
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 (content): Merge conflict in drivers/iio/industrialio-trigger.c
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c
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 (8fa3b8d689a5 cgroup: set css->id to -1 during init)
Merging scsi/for-next (4d8e355acc29 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 (a9bfd8b4ed48 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 (0f1e74e9ab03 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 (72ad679aa718 clk: nxp: Select MFD_SYSCON for creg driver)
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 (b04e8ad6c0ee coresight: access conn->child_name only if it's initialised)
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 (5c26fb1bbb99 include/linux/bitmap.h: cleanup)
^ permalink raw reply
* Re: linux-next: Tree for Jun 16 (linux/firmware.h)
From: Stephen Boyd @ 2016-06-16 18:12 UTC (permalink / raw)
To: Randy Dunlap, Andrew Morton
Cc: linux-kernel, Greg Kroah-Hartman, Stephen Rothwell, linux-next
In-Reply-To: <5762D7F3.50802@infradead.org>
Quoting Randy Dunlap (2016-06-16 09:46:43)
> [adding Stephen Boyd]
>
> On 06/16/16 08:02, Randy Dunlap wrote:
> > On 06/15/16 22:49, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Changes since 20160615:
> >>
> >
> > on i386 and/or x86_64:
> >
> > In file included from ../drivers/fpga/fpga-mgr.c:21:0:
> > ../include/linux/firmware.h:82:1: error: expected identifier or ( before { token
> > {
> > ^
> >
> >
>
> See:
>
> static inline int request_firmware_into_buf(const struct firmware **firmware_p,
> const char *name, struct device *device, void *buf, size_t size);
> {
> return -EINVAL;
> }
>
Urgh sorry about that. The semicolon should go away. Andrew can you
squash this in? I tested compilation without this config enabled.
---8<---
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index bdc24ee92823..b1f9f0ccb8ac 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -78,7 +78,7 @@ static inline int request_firmware_direct(const struct firmware **fw,
}
static inline int request_firmware_into_buf(const struct firmware **firmware_p,
- const char *name, struct device *device, void *buf, size_t size);
+ const char *name, struct device *device, void *buf, size_t size)
{
return -EINVAL;
}
^ permalink raw reply related
* Re: linux-next: Tree for Jun 16 (linux/firmware.h)
From: Randy Dunlap @ 2016-06-16 16:46 UTC (permalink / raw)
To: Stephen Rothwell, linux-next
Cc: linux-kernel, Greg Kroah-Hartman, Stephen Boyd
In-Reply-To: <5762BF6D.2070604@infradead.org>
[adding Stephen Boyd]
On 06/16/16 08:02, Randy Dunlap wrote:
> On 06/15/16 22:49, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20160615:
>>
>
> on i386 and/or x86_64:
>
> In file included from ../drivers/fpga/fpga-mgr.c:21:0:
> ../include/linux/firmware.h:82:1: error: expected identifier or ( before { token
> {
> ^
>
>
See:
static inline int request_firmware_into_buf(const struct firmware **firmware_p,
const char *name, struct device *device, void *buf, size_t size);
{
return -EINVAL;
}
--
~Randy
^ 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