* linux-next: Tree for May 13
From: Stephen Rothwell @ 2016-05-13 5:44 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160512:
Dropped tree: rdma-leon (bad build and conflicts)
The rdma-leon tree gained a build failure so I dropped it for today.
The staging tree gained a build failure for which I applied a merge
fix patch.
The pinctrl tree lost its build failure.
Non-merge commits (relative to Linus' tree): 9975
8496 files changed, 436478 insertions(+), 184404 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 235 trees (counting Linus' and 35 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 (02c9c0e9b9d9 Merge tag 'keys-fixes-20160512' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging net/master (2073dbad172f net: mvneta: bm: fix dependencies again)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (84add303ef95 ALSA: usb-audio: Yet another Phoneix Audio device quirk)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7)
Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7)
Merging input-current/for-linus (c52c545ead97 Input: twl6040-vibra - fix DT node memory management)
Merging crypto-current/master (df27b26f04ed crypto: testmgr - Use kmalloc memory for RSA input)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2700818ac9f9 drm/i915: Bail out of pipe config compute loop on LPT)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (966657890e87 ARC: Add eznps platform to Kconfig and Makefile)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (83e0a1672eb5 Merge branch 'next/defconfig' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
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 (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (f6ec4147adc3 Merge branch 'v4.7-clk/next' 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 (05e8e9a8696c Merge branch 'fixes' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
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 (8cad489261c5 h8300: switch EARLYCON)
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 (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (096a8b6d5e7a metag: Fix atomic_*_return inline asm constraints)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (9ca0b767b011 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (a8950e49bd24 nios2: memset: use the right constraint modifier for the %4 output operand)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (1d4e89cf0a4e powerpc/powernv/npu: Add PE to PHB's list)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c53db5222b92 s390/vmem: remove unused function parameter)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
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 (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512)
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (004482ae9e6d Update cifs.ko version to 2.09)
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 (2a28900be206 udf: Export superblock magic to userspace)
Merging ext4/dev (816cd71b0c72 ext4: remove unmeetable inconsisteny check from ext4_find_extent())
Merging f2fs/dev (90e24cefa03c ext4 crypto: migrate into vfs's crypto engine)
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (44549e8f5eea Linux 4.6-rc7)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (bbb5d7fb1bb8 ovl: override creds with the ones from the superblock mounter)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (e09c58296624 Merge branch 'work.lookups' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
Merging pci/next (d9322d226f91 Merge branches 'pci/dpc', 'pci/resource' and 'pci/thunderbolt' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (95174f8a958c Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (71a9c23246fe hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (aff0d48680f1 Merge branch 'pm-cpufreq' into linux-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in MAINTAINERS
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
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 (7a9aa46f6f63 Merge branch 'topic/xilinx' into next)
Merging net-next/master (e7142c341c9c tipc: eliminate risk of double link_up events)
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
CONFLICT (content): Merge conflict in net/ipv4/ip_gre.c
CONFLICT (content): Merge conflict in include/linux/soc/qcom/smd.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Applying: soc: qcom: smd: fix for Qualcomm IPC router and callback API change
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (908578e7d5f6 Merge branch 'sh_eth-sw-reset')
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (94d7f1a255db Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7)
Merging rdma-leon/rdma-next (bd62b6b2deb3 Merge branch 'topic/srp' into rdma-next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/i40iw/i40iw_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/cm.c
$ git reset --hard HEAD^
Merging rdma-leon-test/testing/rdma-next (d9233ad6ef2f Merge branch 'topic/srp' into testing/rdma-next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/i40iw/i40iw_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/cm.c
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (e930c765ca5c crypto: caam - fix caam_jr_alloc() ret code)
Merging drm/drm-next (95306975e9dd Merge tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (9ecb549867d7 drm/atomic: Add drm_atomic_helper_best_encoder())
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 (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (d99c8a9355cf Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (639db5961657 ALSA: au88x0: Fix zero clear of stream->resources)
Merging sound-asoc/for-next (cf65f00f8a97 Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (d96caf8c33ca Input: rotary-encoder - fix bare use of 'unsigned')
Merging block/for-next (133582264100 Merge branch 'for-4.7/drivers' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (bf4ae7b44e64 dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (9140be54ab6e mmc: mmc: Fix partition switch timeout for some eMMCs)
Merging md/for-next (1fa9a1ad0a9d md-cluster: check the return value of process_recvd_msg)
Merging mfd/for-mfd-next (68b21094ef9b mfd: ab8500-debugfs: Trivial fix of spelling mistake on "between")
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ffe1b6c453ef video: AMBA CLCD: Remove unncessary include in amba-clcd.c)
Merging regulator/for-next (d4b122b5953e Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next)
Merging security/next (a6926cc989eb Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (c2316dbf1242 selinux: apply execstack check on thread stacks)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (44549e8f5eea Linux 4.6-rc7)
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 (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (5ed4aba1265f vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata)
Merging jc_docs/docs-next (2fd872bd84b3 Doc: correct the location of sysrq.c)
CONFLICT (content): Merge conflict in samples/Makefile
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (b6010770f332 drivers/of: Export of_detach_node())
CONFLICT (content): Merge conflict in drivers/iommu/arm-smmu.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (3072e1e712df Merge remote-tracking branches 'spi/topic/st-ssc4', 'spi/topic/xlp' and 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (0bf7ee3ef4a7 Merge branch 'perf/urgent')
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig
CONFLICT (content): Merge conflict in drivers/firmware/efi/arm-init.c
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (0fc1b09ff1ff tracing: Use temp buffer when filtering events)
Merging rcu/rcu/next (2ba259ab67a8 fixup! rcu: Make call_rcu_tasks() tolerate first call with irqs disabled)
Merging kvm/linux-next (14717e203186 kvm: Conditionally register IRQ bypass consumer)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic-v3.c
Merging kvm-arm/next (064850532444 kvm: arm64: Enable hardware updates of the Access Flag for Stage 2 page tables)
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 (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16)
CONFLICT (content): Merge conflict in drivers/xen/efi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Applying: xen: efi: merge fix patch
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (9a73a6895fc5 surfacepro3_button: Add a warning when switching to tablet mode)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (80d6737b27bb leds: gpio: Support the "panic-indicator" firmware property)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (c6e360a0d9d2 Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case")
Merging tty/tty-next (d20bb59af646 MAINTAINERS: 8250: remove website reference)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next (13069bd94d55 usb: Remove unnecessary space before operator ','.)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (ffc83a79b44e Staging: emxx_udc: emxx_udc: fixed coding style issue)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
Applying: staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes
Merging char-misc/char-misc-next (725d0123dfff Merge 4.6-rc7 into char-misc-testing)
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (02714f2c73a6 Merge branch 'misc' into for-next)
Merging target-updates/for-next (54a5e73f4d6e tcm_qla2xxx Add SCSI command jammer/discard capability)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (f0d4e2af15c1 Merge branch 'for-4.7-dw' into for-next)
Merging pinctrl/for-next (58d73d264a02 Merge branch 'devel' into for-next)
Merging vhost/linux-next (e00f7bd22129 virtio: Silence uninitialized variable warning)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (0259cd1b6496 Merge remote-tracking branches 'remoteproc/rpmsg-next' and 'remoteproc/rproc-next' into for-next)
Merging gpio/for-next (d30a2b47d4c2 MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (4295ada2fe87 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (9ffee1c4be7c clk: qcom: mmcc-8996: Remove clocks that should be controlled by RPM)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b47d6130232c KVM: halt_polling: provide a way to qualify wakeups during poll)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (545a6c33f4a8 coresight: Handle build path error)
Merging rtc/rtc-next (854ec813cc23 rtc: rename so the tps6586x-rtc module can be autoloaded at boot)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (e53f09825156 Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next)
Merging akpm-current/current (a758ba862244 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/efi.h
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/cris/Kconfig
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: mm: make mmap_sem for write waits killable for mm syscalls
Applying: mm: make vm_mmap killable
Applying: mm: make vm_munmap killable
Applying: mm, aout: handle vm_brk failures
Applying: mm, elf: handle vm_brk error
Applying: mm: make vm_brk killable
Applying: mm, proc: make clear_refs killable
Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable
Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable
Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
Applying: coredump: make coredump_wait wait for mmap_sem for write killable
Applying: aio: make aio_setup_ring killable
Applying: exec: make exec path waiting for mmap_sem killable
Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
Applying: uprobes: wait for mmap_sem for write killable
Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
Applying: kgdb: depends on VT
Merging akpm/master (35b44485a382 kgdb: depends on VT)
^ permalink raw reply
* arm build failures in -next due to 'sched/core: Add switch_mm_irqs_off() and use it in the scheduler'
From: Guenter Roeck @ 2016-05-13 4:22 UTC (permalink / raw)
To: Andy Lutomirski
Cc: linux-kernel, linux-next, linux-arm-kernel, Borislav Petkov,
Ingo Molnar
Hi Andy,
I see various arm build failures in -next. One example is spitz_defconfig.
Bisect points to commit 'sched/core: Add switch_mm_irqs_off() and use it
in the scheduler'. Reverting the commit fixes the problem.
In file included from include/linux/mmu_context.h:4:0,
from drivers/usb/gadget/legacy/inode.c:27:
./arch/arm/include/asm/mmu_context.h:
In function 'finish_arch_post_lock_switch':
./arch/arm/include/asm/mmu_context.h:88:3: error:
implicit declaration of function 'preempt_enable_no_resched'
This has been going on for a while, so maybe it has been reported already.
If so, sorry for the noise.
Bisect log is attached.
Guenter
---
# bad: [dd1071fe27ec200ddc49a494e1275a8269248843] x86/rwsem: Save and restore all callee-clobbered regs in 32-bit ____down_write()
# good: [44549e8f5eea4e0a41b487b63e616cb089922b99] Linux 4.6-rc7
git bisect start 'HEAD' 'v4.6-rc7'
# good: [b6cf27d48f370bf2d42888921632ae05340aaca9] Merge remote-tracking branch 'crypto/master'
git bisect good b6cf27d48f370bf2d42888921632ae05340aaca9
# bad: [607563e7793b7c4f3ab134dc200552a555ca5cb2] Merge remote-tracking branch 'tip/auto-latest'
git bisect bad 607563e7793b7c4f3ab134dc200552a555ca5cb2
# good: [05454bc3dd6d8c4cff684ea881d79db952030075] Merge remote-tracking branch 'block/for-next'
git bisect good 05454bc3dd6d8c4cff684ea881d79db952030075
# good: [3ed15da0d55d9147f6434fe57db60a5b4059cbfd] Merge remote-tracking branch 'spi/for-next'
git bisect good 3ed15da0d55d9147f6434fe57db60a5b4059cbfd
# good: [25ea4e608611c03ad9829a727f6cc198db952d06] Merge branch 'perf/core'
git bisect good 25ea4e608611c03ad9829a727f6cc198db952d06
# bad: [df9f17497431a073c33aea6994f3b5b53fd89806] manual merge of x86/asm
git bisect bad df9f17497431a073c33aea6994f3b5b53fd89806
# bad: [d10c98b20678fb22506d6c712d7a0af6885001a1] Merge branch 'timers/core'
git bisect bad d10c98b20678fb22506d6c712d7a0af6885001a1
# bad: [b52fad2db5d792d89975cebf2fe1646a7af28ed0] sched/fair: Update rq clock before updating nohz CPU load
git bisect bad b52fad2db5d792d89975cebf2fe1646a7af28ed0
# good: [1f41906a6fda1114debd3898668bd7ab6470ee41] sched/fair: Correctly handle nohz ticks CPU load accounting
git bisect good 1f41906a6fda1114debd3898668bd7ab6470ee41
# bad: [64b7aad5798478ffff52e110878ccaae4c3aaa34] Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new changes
git bisect bad 64b7aad5798478ffff52e110878ccaae4c3aaa34
# good: [8efd755ac2fe262d4c8d5c9bbe054bb67dae93da] mm/mmu_context, sched/core: Fix mmu_context.h assumption
git bisect good 8efd755ac2fe262d4c8d5c9bbe054bb67dae93da
# bad: [e1074888c326038340a1ada9129d679e661f2ea6] x86/mm: Build arch/x86/mm/tlb.c even on !SMP
git bisect bad e1074888c326038340a1ada9129d679e661f2ea6
# bad: [f98db6013c557c216da5038d9c52045be55cd039] sched/core: Add switch_mm_irqs_off() and use it in the scheduler
git bisect bad f98db6013c557c216da5038d9c52045be55cd039
# first bad commit: [f98db6013c557c216da5038d9c52045be55cd039] sched/core: Add switch_mm_irqs_off() and use it in the scheduler
^ permalink raw reply
* Re: next: fuloong2e qemu boot failure due to 'MIPS: Loongson: AddLoongson-3A R2 basic support'
From: Guenter Roeck @ 2016-05-13 3:46 UTC (permalink / raw)
To: Huacai Chen; +Cc: Ralf Baechle, linux-mips, linux-next, linux-kernel
In-Reply-To: <CAAhV-H6Br2r0yMX2+2gCqjY=+LxSh4Pf9pwvZhDu4MYx5b_jZQ@mail.gmail.com>
On 04/19/2016 10:41 PM, Huacai Chen wrote:
> This is a kernel bug, I'll send a patch.
>
Did you ever send a patch to fix this problem ? It is still broken in next-20160512.
Guenter
> Huacai
>
> On Wed, Apr 20, 2016 at 12:43 PM, Guenter Roeck <linux@roeck-us.net> wrote:
>> On 04/19/2016 08:37 PM, 陈华才 wrote:
>>>
>>> Hi,
>>>
>>> Could you please remove the line "#define cpu_hwrena_impl_bits
>>> 0xc0000000" in arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
>>> and try again?Thanks.
>>>
>>
>> That fixes the problem.
>>
>> Does this need to be addressed in qemu or in the Linux kernel ?
>>
>> Thanks,
>> Guenter
>>
>>
>>> Huacai
>>>
>>> ------------------ Original ------------------
>>> From: "Guenter Roeck"<linux@roeck-us.net>;
>>> Date: Wed, Apr 20, 2016 10:54 AM
>>> To: "Huacai Chen"<chenhc@lemote.com>;
>>> Cc: "Ralf Baechle"<ralf@linux-mips.org>;
>>> "linux-mips"<linux-mips@linux-mips.org>;
>>> "linux-next"<linux-next@vger.kernel.org>;
>>> "linux-kernel"<linux-kernel@vger.kernel.org>;
>>> Subject: next: fuloong2e qemu boot failure due to 'MIPS: Loongson:
>>> AddLoongson-3A R2 basic support'
>>>
>>> Hi,
>>>
>>> qemu fails to boot in -next for machine fulong2e with configuration
>>> fuloong2e_defconfig. Bisect points to commit 'MIPS: Loongson: Add
>>> Loongson-3A R2 basic support'. qemu hangs in boot, after displaying
>>> "Inode-cache hash table entries: 16384 (order: 3, 131072 bytes)".
>>>
>>> Bisect log is attached.
>>>
>>> Guenter
>>>
>>> ---
>>> # bad: [1bd7a2081d2c7b096f75aa934658e404ccaba5fd] Add linux-next specific
>>> files for 20160418
>>> # good: [bf16200689118d19de1b8d2a3c314fc21f5dc7bb] Linux 4.6-rc3
>>> git bisect start 'HEAD' 'v4.6-rc3'
>>> # bad: [493ac92ff65ec4c4cd4c43870e778760a012951d] Merge remote-tracking
>>> branch 'ipvs-next/master'
>>> git bisect bad 493ac92ff65ec4c4cd4c43870e778760a012951d
>>> # bad: [20ca3ae9c517eee9b2f1bd0fb2a06e2d14153792] Merge remote-tracking
>>> branch 'btrfs-kdave/for-next'
>>> git bisect bad 20ca3ae9c517eee9b2f1bd0fb2a06e2d14153792
>>> # good: [c454e65fb9ade11d0f84718d06a6888e2c92804d] Merge remote-tracking
>>> branch 'omap/for-next'
>>> git bisect good c454e65fb9ade11d0f84718d06a6888e2c92804d
>>> # good: [6f5c70fb9b4fc0534157bfa40cea9b402e6f2506] Merge remote-tracking
>>> branch 'microblaze/next'
>>> git bisect good 6f5c70fb9b4fc0534157bfa40cea9b402e6f2506
>>> # bad: [7f053cd68fd14243c8f202b4086d7dd75c409e6f] MIPS: Loongson-3:
>>> Introduce CONFIG_LOONGSON3_ENHANCEMENT
>>> git bisect bad 7f053cd68fd14243c8f202b4086d7dd75c409e6f
>>> # good: [e9aacdd7f0b66c4ace17e5950c48e7cc61a253c8] MIPS: Allow RIXI to be
>>> used on non-R2 or R6 cores
>>> git bisect good e9aacdd7f0b66c4ace17e5950c48e7cc61a253c8
>>> # good: [d1e8b9a8dc6c7fa9add5dfa7083e035ce037e56d] MAINTAINERS: add
>>> Loongson1 architecture entry
>>> git bisect good d1e8b9a8dc6c7fa9add5dfa7083e035ce037e56d
>>> # good: [13ff6275bb389c3669082d3ef8483592a31eb0ea] MIPS: Fix siginfo.h to
>>> use strict posix types
>>> git bisect good 13ff6275bb389c3669082d3ef8483592a31eb0ea
>>> # good: [66e74bdd51e617023fa2e79a807b704fb3eed8aa] MIPS: Enable ptrace hw
>>> watchpoints on MIPS R6
>>> git bisect good 66e74bdd51e617023fa2e79a807b704fb3eed8aa
>>> # good: [f7cabc2dac8adf5986dbc700584bc3b8fe493d4d] MIPS: Loongson-3:
>>> Adjust irq dispatch to speedup processing
>>> git bisect good f7cabc2dac8adf5986dbc700584bc3b8fe493d4d
>>> # bad: [4978c8477e96fb9e9d870d8f42328dcabf1a65e9] MIPS: Loongson-3: Set
>>> cache flush handlers to cache_noop
>>> git bisect bad 4978c8477e96fb9e9d870d8f42328dcabf1a65e9
>>> # bad: [04a35922c1dac1b4864b8b366a37474e9e51d8c0] MIPS: Loongson: Add
>>> Loongson-3A R2 basic support
>>> git bisect bad 04a35922c1dac1b4864b8b366a37474e9e51d8c0
>>> # first bad commit: [04a35922c1dac1b4864b8b366a37474e9e51d8c0] MIPS:
>>> Loongson: Add Loongson-3A R2 basic support
>>>
>>
>>
>
^ permalink raw reply
* linux-next: build failure after merge of the staging tree
From: Stephen Rothwell @ 2016-05-13 3:15 UTC (permalink / raw)
To: Greg KH, Leon Romanovsky
Cc: linux-next, linux-kernel, Dmitry Eremin, Li Dongyang,
James Simmons, Christoph Hellwig, Bart Van Assche
Hi Greg,
After merging the staging tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:1706:9:
error: too few arguments to function 'ib_map_mr_sg'
n = ib_map_mr_sg(mr, tx->tx_frags,
^
In file included from /home/sfr/next/next/include/rdma/ib_addr.h:47:0,
from /home/sfr/next/next/include/rdma/rdma_cm.h:39,
from /home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h:63,
from /home/sfr/next/next/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c:43:
/home/sfr/next/next/include/rdma/ib_verbs.h:3147:5: note: declared here
int ib_map_mr_sg(struct ib_mr *mr, struct scatterlist *sg, int sg_nents,
^
Caused by commit
80e05b34f882 ("staging: lustre: o2iblnd: Add Fast Reg memory registration support")
interacting with commits
aa42d65b5e20 ("IB/core: allow passing mapping an offset into the SG in ib_map_mr_sg")
f0cf99be3251 ("IB/core: Enhance ib_map_mr_sg()")
from the rdma-leon-test tree.
I added the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 May 2016 13:10:47 +1000
Subject: [PATCH] staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index d99b4fac0c39..6c59f2ff2220 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1704,7 +1704,7 @@ int kiblnd_fmr_pool_map(kib_fmr_poolset_t *fps, kib_tx_t *tx,
}
n = ib_map_mr_sg(mr, tx->tx_frags,
- tx->tx_nfrags, PAGE_SIZE);
+ tx->tx_nfrags, NULL, PAGE_SIZE);
if (unlikely(n != tx->tx_nfrags)) {
CERROR("Failed to map mr %d/%d elements\n",
n, tx->tx_nfrags);
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: [PATCH] x86/rwsem: Save and restore all callee-clobbered regs in 32-bit ____down_write()
From: Guenter Roeck @ 2016-05-13 2:49 UTC (permalink / raw)
To: Borislav Petkov, Ingo Molnar, Peter Zijlstra
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160512172938.GB14245@pd.tnic>
On 05/12/2016 10:29 AM, Borislav Petkov wrote:
> Anyway, here's an actual patch with a commit message. Guenter, can you
> give it a run please?
>
> It does fix the issue here with your .config but I'd appreciate a
> confirmation.
>
> Thanks.
>
> ---
> From: Borislav Petkov <bp@suse.de>
>
> ____down_write() calls a function to handle the slow path when the lock
> is contended. But in order to be able to call a C function, one has to
> stash all callee-clobbered registers. The 32-bit path saves only %ecx
> for a reason unknown to me. However, after
>
> 71c01930b42e ("locking/rwsem, x86: Clean up ____down_write()")
>
> the useless dependency on edx was removed and this caused the following
> splat:
>
> BUG: unable to handle kernel NULL pointer dereference at 00000015
> IP: [<c185e094>] down_write+0x24/0x30
> *pde = 00000000
> Oops: 0002 [#1] PREEMPT SMP
> Modules linked in:
> CPU: 0 PID: 1 Comm: swapper/0 Tainted: G S W 4.6.0-rc7-next-20160511-yocto-standard #1
> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
> task: f4d00000 ti: f4d08000 task.ti: f4d08000
> EIP: 0060:[<c185e094>] EFLAGS: 00210282 CPU: 0
> EIP is at down_write+0x24/0x30
> EAX: f4d00000 EBX: f4f6d600 ECX: ffff0001 EDX: 00000001
> ESI: 00000168 EDI: c1c2eb68 EBP: f4d09ef4 ESP: f4d09eec
> DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
> CR0: 80050033 CR2: 00000015 CR3: 01ccb000 CR4: 000406d0
>
> This happens because gcc decided to stash the pointer to @sem in edx (it
> is not used in the inline asm anymore, thus free):
>
> movl %eax, %edx # sem, sem
>
> lock; xadd %ecx,(%eax) # tmp91, sem
> test ...
>
> call call_rwsem_down_write_failed
>
> mov %eax,0x14(%edx)
>
> *before* the slow path happens and if we hit it on 32-bit, it can
> clobber edx and we're staring at garbage value at deref time.
>
> The simple fix is to save/restore edx too, around the slow path. We
> don't need to stash eax because it is used in the slow path as the @sem
> arg.
>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: x86@kernel.org
> Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Guenter
> ---
> arch/x86/lib/rwsem.S | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
> index a37462a23546..02240807e97a 100644
> --- a/arch/x86/lib/rwsem.S
> +++ b/arch/x86/lib/rwsem.S
> @@ -33,10 +33,12 @@
> * value or just clobbered..
> */
>
> -#define save_common_regs \
> - pushl %ecx
> +#define save_common_regs \
> + pushl %ecx; \
> + pushl %edx
>
> -#define restore_common_regs \
> +#define restore_common_regs \
> + popl %edx; \
> popl %ecx
>
> /* Avoid uglifying the argument copying x86-64 needs to do. */
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma-leon tree
From: Stephen Rothwell @ 2016-05-13 0:33 UTC (permalink / raw)
To: Leon Romanovsky, Doug Ledford; +Cc: linux-next, linux-kernel
In-Reply-To: <20160513100807.05177f21@canb.auug.org.au>
Hi Leon,
On Fri, 13 May 2016 10:08:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the rdma-leon tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ERROR: ".rdma_addr_size" [drivers/infiniband/core/rdma_ucm.ko] undefined!
> ERROR: ".rdma_addr_register_client" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_addr_size" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_addr_unregister_client" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_translate_ip" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_copy_addr" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_resolve_ip" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_addr_cancel" [drivers/infiniband/core/rdma_cm.ko] undefined!
> ERROR: ".rdma_resolve_ip_route" [drivers/infiniband/core/ib_sa.ko] undefined!
> ERROR: ".addr_init" [drivers/infiniband/core/ib_core.ko] undefined!
> ERROR: ".rdma_addr_find_l2_eth_by_grh" [drivers/infiniband/core/ib_core.ko] undefined!
> ERROR: ".addr_cleanup" [drivers/infiniband/core/ib_core.ko] undefined!
>
> I don't know what has caused this, but the rdma-leon tree shares a lot
> of patches (but not commits) with the rdma tree and so needs to be
> cleaned up. Please sort out your work flow.
>
> I have dropped the rdma-leon tree for today.
Note that the following merge of the rdma-leon-testing tree compiled
fine and there is only one commit in there that is not in the rdma-leon
tree ... (though there are also several merge commits).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the rdma-leon tree
From: Stephen Rothwell @ 2016-05-13 0:08 UTC (permalink / raw)
To: Leon Romanovsky, Doug Ledford; +Cc: linux-next, linux-kernel
Hi Leon,
After merging the rdma-leon tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
ERROR: ".rdma_addr_size" [drivers/infiniband/core/rdma_ucm.ko] undefined!
ERROR: ".rdma_addr_register_client" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_addr_size" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_addr_unregister_client" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_translate_ip" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_copy_addr" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_resolve_ip" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_addr_cancel" [drivers/infiniband/core/rdma_cm.ko] undefined!
ERROR: ".rdma_resolve_ip_route" [drivers/infiniband/core/ib_sa.ko] undefined!
ERROR: ".addr_init" [drivers/infiniband/core/ib_core.ko] undefined!
ERROR: ".rdma_addr_find_l2_eth_by_grh" [drivers/infiniband/core/ib_core.ko] undefined!
ERROR: ".addr_cleanup" [drivers/infiniband/core/ib_core.ko] undefined!
I don't know what has caused this, but the rdma-leon tree shares a lot
of patches (but not commits) with the rdma tree and so needs to be
cleaned up. Please sort out your work flow.
I have dropped the rdma-leon tree for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* [PATCH] x86/rwsem: Save and restore all callee-clobbered regs in 32-bit ____down_write()
From: Borislav Petkov @ 2016-05-12 17:29 UTC (permalink / raw)
To: Guenter Roeck, Ingo Molnar, Peter Zijlstra
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160512144657.GA14245@pd.tnic>
Anyway, here's an actual patch with a commit message. Guenter, can you
give it a run please?
It does fix the issue here with your .config but I'd appreciate a
confirmation.
Thanks.
---
From: Borislav Petkov <bp@suse.de>
____down_write() calls a function to handle the slow path when the lock
is contended. But in order to be able to call a C function, one has to
stash all callee-clobbered registers. The 32-bit path saves only %ecx
for a reason unknown to me. However, after
71c01930b42e ("locking/rwsem, x86: Clean up ____down_write()")
the useless dependency on edx was removed and this caused the following
splat:
BUG: unable to handle kernel NULL pointer dereference at 00000015
IP: [<c185e094>] down_write+0x24/0x30
*pde = 00000000
Oops: 0002 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Tainted: G S W 4.6.0-rc7-next-20160511-yocto-standard #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
task: f4d00000 ti: f4d08000 task.ti: f4d08000
EIP: 0060:[<c185e094>] EFLAGS: 00210282 CPU: 0
EIP is at down_write+0x24/0x30
EAX: f4d00000 EBX: f4f6d600 ECX: ffff0001 EDX: 00000001
ESI: 00000168 EDI: c1c2eb68 EBP: f4d09ef4 ESP: f4d09eec
DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
CR0: 80050033 CR2: 00000015 CR3: 01ccb000 CR4: 000406d0
This happens because gcc decided to stash the pointer to @sem in edx (it
is not used in the inline asm anymore, thus free):
movl %eax, %edx # sem, sem
lock; xadd %ecx,(%eax) # tmp91, sem
test ...
call call_rwsem_down_write_failed
mov %eax,0x14(%edx)
*before* the slow path happens and if we hit it on 32-bit, it can
clobber edx and we're staring at garbage value at deref time.
The simple fix is to save/restore edx too, around the slow path. We
don't need to stash eax because it is used in the slow path as the @sem
arg.
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: x86@kernel.org
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/lib/rwsem.S | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
index a37462a23546..02240807e97a 100644
--- a/arch/x86/lib/rwsem.S
+++ b/arch/x86/lib/rwsem.S
@@ -33,10 +33,12 @@
* value or just clobbered..
*/
-#define save_common_regs \
- pushl %ecx
+#define save_common_regs \
+ pushl %ecx; \
+ pushl %edx
-#define restore_common_regs \
+#define restore_common_regs \
+ popl %edx; \
popl %ecx
/* Avoid uglifying the argument copying x86-64 needs to do. */
--
2.7.3
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
^ permalink raw reply related
* Re: next: Crashes in x86 images due to 'locking/rwsem, x86: Clean up ____down_write()'
From: Borislav Petkov @ 2016-05-12 14:46 UTC (permalink / raw)
To: Guenter Roeck, Ingo Molnar, Peter Zijlstra
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160512135131.GA7803@pd.tnic>
On Thu, May 12, 2016 at 03:51:31PM +0200, Borislav Petkov wrote:
> On Thu, May 12, 2016 at 06:34:29AM -0700, Guenter Roeck wrote:
> > Borislav,
> >
> > your patch 'locking/rwsem, x86: Clean up ____down_write()' causes various
> > crashes in x86 qemu tests.
>
> Thanks for the report, let me take a look.
>
> @Ingo: can you please back this one out of the lineup for the merge
> window until I've sorted out the issue?
Ok, I was able to reproduce:
BUG: unable to handle kernel NULL pointer dereference at 00000015
IP: [<c185e094>] down_write+0x24/0x30
*pde = 00000000
Oops: 0002 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Tainted: G S W 4.6.0-rc7-next-20160511-yocto-standard #1
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
task: f4d00000 ti: f4d08000 task.ti: f4d08000
EIP: 0060:[<c185e094>] EFLAGS: 00210282 CPU: 0
EIP is at down_write+0x24/0x30
EAX: f4d00000 EBX: f4f6d600 ECX: ffff0001 EDX: 00000001
ESI: 00000168 EDI: c1c2eb68 EBP: f4d09ef4 ESP: f4d09eec
DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
CR0: 80050033 CR2: 00000015 CR3: 01ccb000 CR4: 000406d0
We fault here:
c185e070 <down_write>:
c185e070: 55 push %ebp
c185e071: 89 e5 mov %esp,%ebp
c185e073: e8 20 2b 00 00 call c1860b98 <mcount>
c185e078: b9 01 00 ff ff mov $0xffff0001,%ecx
c185e07d: 89 c2 mov %eax,%edx
c185e07f: f0 0f c1 08 lock xadd %ecx,(%eax)
c185e083: 66 85 c9 test %cx,%cx
c185e086: 74 05 je c185e08d <down_write+0x1d>
c185e088: e8 f7 31 b7 ff call c13d1284 <call_rwsem_down_write_failed>
c185e08d: 64 a1 48 59 cb c1 mov %fs:0xc1cb5948,%eax
c185e093: 5d pop %ebp
c185e094: 89 42 14 mov %eax,0x14(%edx) <--- HERE
c185e097: c3 ret
c185e098: 90 nop
c185e099: 8d b4 26 00 00 00 00 lea 0x0(%esi,%eiz,1),%esi
and %edx is 1 (+ 0x14 gives the 00000015 deref addr).
But edx should contain sem. The code does:
.loc 1 47 0
movl %eax, %edx # sem, sem
lock; xadd %ecx,(%eax) # tmp91, sem
call call_rwsem_down_write_failed
mov %eax,0x14(%edx)
and if something in that call clobbers %edx, boom! Now I need to think
about how to make gcc reload sem after
LOCK_CONTENDED(sem, __down_write_trylock, __down_write);
for
rwsem_set_owner(sem);
Btw, the hunk below seems to fix it. And the comment above those
{save,restore}_common_regs talk about "Save the C-clobbered registers
(%eax, %edx and %ecx)" but the only reg we're stashing is ecx.
Why aren't we stashing edx too?
Ingo, Peter?
---
diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
index a37462a23546..02240807e97a 100644
--- a/arch/x86/lib/rwsem.S
+++ b/arch/x86/lib/rwsem.S
@@ -33,10 +33,12 @@
* value or just clobbered..
*/
-#define save_common_regs \
- pushl %ecx
+#define save_common_regs \
+ pushl %ecx; \
+ pushl %edx
-#define restore_common_regs \
+#define restore_common_regs \
+ popl %edx; \
popl %ecx
/* Avoid uglifying the argument copying x86-64 needs to do. */
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
^ permalink raw reply related
* Re: next: Crashes in x86 images due to 'locking/rwsem, x86: Clean up ____down_write()'
From: Borislav Petkov @ 2016-05-12 13:51 UTC (permalink / raw)
To: Guenter Roeck, Ingo Molnar
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <57348665.3050301@roeck-us.net>
On Thu, May 12, 2016 at 06:34:29AM -0700, Guenter Roeck wrote:
> Borislav,
>
> your patch 'locking/rwsem, x86: Clean up ____down_write()' causes various
> crashes in x86 qemu tests.
Thanks for the report, let me take a look.
@Ingo: can you please back this one out of the lineup for the merge
window until I've sorted out the issue?
Thanks.
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Linus Walleij @ 2016-05-12 13:39 UTC (permalink / raw)
To: Stephen Rothwell, Laxman Dewangan
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Stephen Warren
In-Reply-To: <20160512141411.731ba5c4@canb.auug.org.au>
Laxman, this must be due to one of the two top commits for tegra:
commit 1d18a3f0f0809f6c71f1f6e9e268ee904ce0b588
"pinctrl: tegra: avoid parked_reg and parked_bank"
commit b22ef2a0979f2b91cfeeabb086e4d665183a93a1
"pinctrl: tegra: Correctly check the supported configuration"
Is it something you can fix quickly or should I just revert both patches
for the time being?
Yours,
Linus Walleij
On Thu, May 12, 2016 at 6:14 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Linus,
>
> After merging the pinctrl tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from include/linux/thread_info.h:11:0,
> from include/asm-generic/preempt.h:4,
> from arch/arm/include/generated/asm/preempt.h:1,
> from include/linux/preempt.h:59,
> from include/linux/spinlock.h:50,
> from include/linux/seqlock.h:35,
> from include/linux/time.h:5,
> from include/linux/stat.h:18,
> from include/linux/module.h:10,
> from drivers/pinctrl/tegra/pinctrl-tegra20.c:20:
> include/linux/bug.h:34:45: error: unknown field 'parked_reg' specified in initializer
> #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
> ^
> include/linux/compiler-gcc.h:64:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
> #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
> ^
> include/linux/kernel.h:54:59: note: in expansion of macro '__must_be_array'
> #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
> ^
> drivers/pinctrl/tegra/pinctrl-tegra20.c:2027:12: note: in expansion of macro 'ARRAY_SIZE'
> .npins = ARRAY_SIZE(drive_##pg_name##_pins), \
> ^
> drivers/pinctrl/tegra/pinctrl-tegra20.c:2050:2: note: in expansion of macro 'DRV_PG_EXT'
> DRV_PG_EXT(pg_name, r, 2, 3, 4, 12, 20, 28, 2, 30, 2)
> ^
> drivers/pinctrl/tegra/pinctrl-tegra20.c:2178:2: note: in expansion of macro 'DRV_PG'
> DRV_PG(ao1, 0x868),
> ^
>
> and many more.
>
> I cannot figure out what caused it, but using the pinctrl tree from
> next-20160511 makes it build again.
>
> I am using gcc 5.2.0 hosted on powerpcle, if that matters.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the gpio tree with the mips tree
From: Linus Walleij @ 2016-05-12 13:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ralf Baechle, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Huacai Chen
In-Reply-To: <20160512141746.11db6bd3@canb.auug.org.au>
On Thu, May 12, 2016 at 6:17 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
Yeah this is trivial and ACKed by the MIPS mainatainer so should be
safe, thanks!
Yours,
Linus Walleij
^ permalink raw reply
* next: Crashes in x86 images due to 'locking/rwsem, x86: Clean up ____down_write()'
From: Guenter Roeck @ 2016-05-12 13:34 UTC (permalink / raw)
To: Borislav Petkov, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Borislav,
your patch 'locking/rwsem, x86: Clean up ____down_write()' causes various
crashes in x86 qemu tests.
BUG: unable to handle kernel paging request at 80000015
IP: [<c1846353>] down_write+0x23/0x30
Call Trace:
[<c1374cd5>] crypto_larval_kill+0x15/0x70
[<c13761c6>] crypto_wait_for_test+0x46/0x70
[<c137660c>] crypto_register_alg+0x5c/0x70
[<c1376655>] crypto_register_algs+0x35/0x80
[<c1c1e815>] ? hmac_module_init+0xf/0xf
[<c1c1e828>] crypto_null_mod_init+0x13/0x41
[<c100047b>] do_one_initcall+0x3b/0x150
[ ... ]
BUG: unable to handle kernel paging request at 80000015
IP: [<c1848e43>] down_write+0x23/0x30
Call Trace:
[<c10530d5>] copy_process.part.52+0xba5/0x15c0
[<c184a458>] ? _raw_spin_unlock_bh+0x18/0x20
[<c1053c9d>] _do_fork+0xcd/0x380
[<c105403c>] SyS_clone+0x2c/0x30
[<c100174a>] do_int80_syscall_32+0x5a/0xa0
[<c184ac5e>] entry_INT80_32+0x2a/0x2a
BUG: unable to handle kernel paging request at 80000015
IP: [<c1848e43>] down_write+0x23/0x30
Call Trace:
[<c1155f30>] unlink_file_vma+0x30/0x50
[<c1150ed3>] free_pgtables+0x33/0xc0
[<c115719e>] exit_mmap+0x8e/0xe0
[<c105220b>] mmput+0x2b/0xa0
[<c117f452>] flush_old_exec+0x312/0x650
[<c11c3c0d>] load_elf_binary+0x2ad/0x1080
[<c114f00c>] ? __get_user_pages+0x3c/0x60
[<c114f08f>] ? get_user_pages_remote+0x5f/0x70
[<c13c6a11>] ? _copy_from_user+0x31/0x50
[<c117f00c>] search_binary_handler+0x7c/0x1b0
[<c118059b>] do_execveat_common+0x4bb/0x650
[<c1180754>] do_execve+0x24/0x30
[<c118094b>] SyS_execve+0x1b/0x20
[<c100174a>] do_int80_syscall_32+0x5a/0xa0
[<c184ac5e>] entry_INT80_32+0x2a/0x2a
Reverting the patch fixes the problem.
Complete logs are available at http://kerneltests.org/builders/qemu-x86-next.
Scripts, configuration, and root file system used are available at
https://github.com/groeck/linux-build-test/tree/master/rootfs/x86
Bisect log is attached.
Guenter
---
Bisect log:
# bad: [13425f1bf7f9f28fcef53057303319d5afb907f7] Add linux-next specific files for 20160511
# good: [44549e8f5eea4e0a41b487b63e616cb089922b99] Linux 4.6-rc7
git bisect start 'HEAD' 'v4.6-rc7'
# good: [b6cf27d48f370bf2d42888921632ae05340aaca9] Merge remote-tracking branch 'crypto/master'
git bisect good b6cf27d48f370bf2d42888921632ae05340aaca9
# bad: [607563e7793b7c4f3ab134dc200552a555ca5cb2] Merge remote-tracking branch 'tip/auto-latest'
git bisect bad 607563e7793b7c4f3ab134dc200552a555ca5cb2
# good: [05454bc3dd6d8c4cff684ea881d79db952030075] Merge remote-tracking branch 'block/for-next'
git bisect good 05454bc3dd6d8c4cff684ea881d79db952030075
# good: [3ed15da0d55d9147f6434fe57db60a5b4059cbfd] Merge remote-tracking branch 'spi/for-next'
git bisect good 3ed15da0d55d9147f6434fe57db60a5b4059cbfd
# bad: [25ea4e608611c03ad9829a727f6cc198db952d06] Merge branch 'perf/core'
git bisect bad 25ea4e608611c03ad9829a727f6cc198db952d06
# good: [f127fa098d76444c7a47b2f009356979492d77cd] perf/x86/intel/pt: Add IP filtering register/CPUID bits
git bisect good f127fa098d76444c7a47b2f009356979492d77cd
# good: [13a00bc35b2a9f8b750a292dcc84111bdfb1edd4] Merge branch 'efi/core'
git bisect good 13a00bc35b2a9f8b750a292dcc84111bdfb1edd4
# bad: [0b749d9316aa32dc3fe67d7c0b4fb650873709aa] Merge branch 'locking/rwsem'
git bisect bad 0b749d9316aa32dc3fe67d7c0b4fb650873709aa
# good: [a1cc5bcfcfca0b99f009b117785142dbdc3b87a3] locking/atomics: Flip atomic_fetch_or() arguments
git bisect good a1cc5bcfcfca0b99f009b117785142dbdc3b87a3
# good: [00fb16e26ac8559e69c3bb14284f4a548d28ee0d] locking/rwsem, x86: Add frame annotation for call_rwsem_down_write_failed_killable()
git bisect good 00fb16e26ac8559e69c3bb14284f4a548d28ee0d
# good: [e3825ba1af3a27d7522c9f5f929f5a13b8b138ae] irqchip/gic-v3: Add support for partitioned PPIs
git bisect good e3825ba1af3a27d7522c9f5f929f5a13b8b138ae
# good: [5e4c588054d52d1b25633c6074c5f3c6228e26ed] Merge branch 'irq/core'
git bisect good 5e4c588054d52d1b25633c6074c5f3c6228e26ed
# bad: [71c01930b42e5dd65d4820dea116bcbe95a0b768] locking/rwsem, x86: Clean up ____down_write()
git bisect bad 71c01930b42e5dd65d4820dea116bcbe95a0b768
# first bad commit: [71c01930b42e5dd65d4820dea116bcbe95a0b768] locking/rwsem, x86: Clean up ____down_write()
^ permalink raw reply
* Re: next-20160512 build: 0 failures 18 warnings (next-20160512)
From: Mark Brown @ 2016-05-12 10:55 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linaro-kernel, kernel-build-reports, linux-next
In-Reply-To: <6651930.C0tGb7p3a4@wuerfel>
[-- Attachment #1: Type: text/plain, Size: 1144 bytes --]
On Thu, May 12, 2016 at 11:14:35AM +0200, Arnd Bergmann wrote:
> On Thursday 12 May 2016 09:38:52 Build bot for Mark Brown wrote:
> > ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
> > ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' 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]
> I should check these all, these may have been uncovered by my change to not
> set CONFIG_CC_OPTIMIZE_FOR_SIZE for allmodconfig, which dropped the
> -Wno-maybe-uninitialized.
> Which compiler version are you using?
For v8 it's currently aarch64-linux-gnu-gcc (Linaro GCC 5.1-2015.08)
5.1.1 20150608.
> > ../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
> Mark, are you planning to remove the definition for 4.7 when we get there?
> If not, maybe do a change so we don't get a warning for the EXPORT_SYMBOL?
Once the users are gone the function will go.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160512 build: 0 failures 18 warnings (next-20160512)
From: Arnd Bergmann @ 2016-05-12 9:14 UTC (permalink / raw)
To: linaro-kernel; +Cc: Build bot for Mark Brown, kernel-build-reports, linux-next
In-Reply-To: <E1b0m8y-0002hK-8Y@optimist>
On Thursday 12 May 2016 09:38:52 Build bot for Mark Brown wrote:
> -------------------------------------------------------------------------------
> arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
>
> Warnings:
> ../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
I sent a patch, and a better one was done subsequently.
> -------------------------------------------------------------------------------
> arm64-allmodconfig : PASS, 0 errors, 15 warnings, 0 section mismatches
>
> Warnings:
> ../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
> ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
> ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' 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]
I should check these all, these may have been uncovered by my change to not
set CONFIG_CC_OPTIMIZE_FOR_SIZE for allmodconfig, which dropped the
-Wno-maybe-uninitialized.
Which compiler version are you using?
> ../include/acpi/video.h:74:12: warning: 'acpi_video_get_levels' defined but not used [-Wunused-function]
> ../include/acpi/video.h:74:12: warning: 'acpi_video_get_levels' defined but not used [-Wunused-function]
Should be easy to fix. I never saw this so far, as it's only on arm64, not arm32.
> ../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
> ../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
> ../drivers/soc/mediatek/mtk-pmic-wrap.c:1062:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
> ../drivers/soc/mediatek/mtk-pmic-wrap.c:1074:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
> ../drivers/soc/mediatek/mtk-pmic-wrap.c:1086:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
Probably a regression that shows up on all 64-bit builds, will take a look
> ../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
I sent a patch
> -------------------------------------------------------------------------------
> arm-multi_v5_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
>
> Warnings:
> ../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
My patch should be merged tomorrow.
> ../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
> ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
> -------------------------------------------------------------------------------
> arm-allmodconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
>
> Warnings:
> ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
> ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
> ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
Only omapdrm remains using this. Peter Ujfalusi sent a patch for it
and Tomi Valkeinen applied it and sent a pull request to dri-devel
this Monday, but it has not yet shown up in linux-next, see
http://permalink.gmane.org/gmane.linux.kernel/2210499
http://lkml.iu.edu/hypermail/linux/kernel/1604.3/05431.html
http://www.spinics.net/lists/dri-devel/msg106847.html
I assume it's going to be there in -rc1.
Mark, are you planning to remove the definition for 4.7 when we get there?
If not, maybe do a change so we don't get a warning for the EXPORT_SYMBOL?
Arnd
^ permalink raw reply
* next-20160512 build: 0 failures 18 warnings (next-20160512)
From: Build bot for Mark Brown @ 2016-05-12 8:38 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160512
Git describe: next-20160512
Commit: c6c0402127 Add linux-next specific files for 20160512
Build Time: 78 min 16 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 18
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allnoconfig
15 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-multi_v5_defconfig
3 warnings 0 mismatches : arm-multi_v7_defconfig
1 warnings 0 mismatches : x86_64-defconfig
6 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : x86_64-allnoconfig
4 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 18
6 ../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/acpi/video.h:74:12: warning: 'acpi_video_get_levels' defined but not used [-Wunused-function]
2 ../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
1 ../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/soc/mediatek/mtk-pmic-wrap.c:1086:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/soc/mediatek/mtk-pmic-wrap.c:1074:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/soc/mediatek/mtk-pmic-wrap.c:1062:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 15 warnings, 0 section mismatches
Warnings:
../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/acpi/video.h:74:12: warning: 'acpi_video_get_levels' defined but not used [-Wunused-function]
../include/acpi/video.h:74:12: warning: 'acpi_video_get_levels' defined but not used [-Wunused-function]
../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/soc/mediatek/mtk-pmic-wrap.c:1062:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/soc/mediatek/mtk-pmic-wrap.c:1074:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/soc/mediatek/mtk-pmic-wrap.c:1086:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../kernel/cgroup.c:1634:15: warning: unused variable 'ret' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
^ permalink raw reply
* linux-next: Tree for May 12
From: Stephen Rothwell @ 2016-05-12 5:49 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160511:
The net-next tree gained a conflict against the net tree.
The sound-asoc tree lost its build failure.
The tip tree gained conflicts against the arc and amr64 trees.
The kvm tree gained conflicts against the tip tree.
The pinctrl tree gained a build failure so I used the version from
next-20160511.
The gpio tree gained a conflict against the mips tree.
Non-merge commits (relative to Linus' tree): 9676
8370 files changed, 419862 insertions(+), 179824 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 235 trees (counting Linus' and 35 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 (685764b108a7 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging net/master (e271c7b4420d gre: do not keep the GRE header around in collect medata mode)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (84add303ef95 ALSA: usb-audio: Yet another Phoneix Audio device quirk)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7)
Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7)
Merging input-current/for-linus (c52c545ead97 Input: twl6040-vibra - fix DT node memory management)
Merging crypto-current/master (df27b26f04ed crypto: testmgr - Use kmalloc memory for RSA input)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2700818ac9f9 drm/i915: Bail out of pipe config compute loop on LPT)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (966657890e87 ARC: Add eznps platform to Kconfig and Makefile)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (520c53d9b0c6 arm-soc: document merges)
Merging at91/at91-next (1fa57588a484 Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
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 (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (b6b7098786c3 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (f6ec4147adc3 Merge branch 'v4.7-clk/next' 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 (05e8e9a8696c Merge branch 'fixes' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (61462c8a6b14 arm64: kernel: Fix incorrect brk randomization)
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
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 (8cad489261c5 h8300: switch EARLYCON)
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 (44549e8f5eea Linux 4.6-rc7)
Merging metag/for-next (096a8b6d5e7a metag: Fix atomic_*_return inline asm constraints)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (a40e1414f77a Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (a8950e49bd24 nios2: memset: use the right constraint modifier for the %4 output operand)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (b5cb9ab1a00b powerpc/powernv/npu: Enable NVLink pass through)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c53db5222b92 s390/vmem: remove unused function parameter)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
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 (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (e3c89819855b Merge branch 'for-next-next-4.7-20160510' into for-next-20160510)
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (004482ae9e6d Update cifs.ko version to 2.09)
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 (2a28900be206 udf: Export superblock magic to userspace)
Merging ext4/dev (816cd71b0c72 ext4: remove unmeetable inconsisteny check from ext4_find_extent())
Merging f2fs/dev (90e24cefa03c ext4 crypto: migrate into vfs's crypto engine)
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (44549e8f5eea Linux 4.6-rc7)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (bbb5d7fb1bb8 ovl: override creds with the ones from the superblock mounter)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (e09c58296624 Merge branch 'work.lookups' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
Merging pci/next (d9322d226f91 Merge branches 'pci/dpc', 'pci/resource' and 'pci/thunderbolt' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (95174f8a958c Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (71a9c23246fe hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (29f8c925b8db Merge branch 'acpi-video' into linux-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
CONFLICT (content): Merge conflict in MAINTAINERS
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
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 (dabb2414d1fd Merge branch 'topic/mv_xor' into next)
Merging net-next/master (ca4aa976f04d ipv6: fix 4in6 tunnel receive path)
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
CONFLICT (content): Merge conflict in net/ipv4/ip_gre.c
CONFLICT (content): Merge conflict in include/linux/soc/qcom/smd.h
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Applying: soc: qcom: smd: fix for Qualcomm IPC router and callback API change
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (908578e7d5f6 Merge branch 'sh_eth-sw-reset')
Merging mac80211-next/master (866daf6eaae3 wext: remove a/b/g/n from SIOCGIWNAME)
Merging rdma/for-next (94d7f1a255db Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7)
Merging rdma-leon/rdma-next (44549e8f5eea Linux 4.6-rc7)
Merging rdma-leon-test/testing/rdma-next (40b995119c77 Merge branch 'topic/ipoib-device-address' into testing/rdma-next)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (e930c765ca5c crypto: caam - fix caam_jr_alloc() ret code)
Merging drm/drm-next (2e726dc4b4e2 Merge tag 'mediatek-drm-2016-05-09' of git://git.pengutronix.de/git/pza/linux into drm-next)
Merging drm-panel/drm/panel/for-next (69b34766668e drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (9ecb549867d7 drm/atomic: Add drm_atomic_helper_best_encoder())
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 (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (d99c8a9355cf Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (ff38e0c70adc ALSA: firewire-lib: drop skip argument from helper functions to queue a packet)
Merging sound-asoc/for-next (cf65f00f8a97 Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (d96caf8c33ca Input: rotary-encoder - fix bare use of 'unsigned')
Merging block/for-next (133582264100 Merge branch 'for-4.7/drivers' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (c408552c0398 dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (9140be54ab6e mmc: mmc: Fix partition switch timeout for some eMMCs)
Merging md/for-next (1fa9a1ad0a9d md-cluster: check the return value of process_recvd_msg)
Merging mfd/for-mfd-next (68b21094ef9b mfd: ab8500-debugfs: Trivial fix of spelling mistake on "between")
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ffe1b6c453ef video: AMBA CLCD: Remove unncessary include in amba-clcd.c)
Merging regulator/for-next (d4b122b5953e Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next)
Merging security/next (a6926cc989eb Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/selinux into next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (c2316dbf1242 selinux: apply execstack check on thread stacks)
Merging tpmdd/next (1191ef663913 tpm: fix for typo in tpm/tpm_ibmvtpm.c)
Merging watchdog/master (44549e8f5eea Linux 4.6-rc7)
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 (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (5ed4aba1265f vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata)
Merging jc_docs/docs-next (2fd872bd84b3 Doc: correct the location of sysrq.c)
CONFLICT (content): Merge conflict in samples/Makefile
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (b6010770f332 drivers/of: Export of_detach_node())
CONFLICT (content): Merge conflict in drivers/iommu/arm-smmu.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (3072e1e712df Merge remote-tracking branches 'spi/topic/st-ssc4', 'spi/topic/xlp' and 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (de763cee0866 Merge branch 'WIP.futex')
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig
CONFLICT (content): Merge conflict in drivers/firmware/efi/arm-init.c
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (0fc1b09ff1ff tracing: Use temp buffer when filtering events)
Merging rcu/rcu/next (2ba259ab67a8 fixup! rcu: Make call_rcu_tasks() tolerate first call with irqs disabled)
Merging kvm/linux-next (14717e203186 kvm: Conditionally register IRQ bypass consumer)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic-v3.c
Merging kvm-arm/next (064850532444 kvm: arm64: Enable hardware updates of the Access Flag for Stage 2 page tables)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (07f8ab255fcc KVM: PPC: Book3S HV: Fix build error in book3s_hv.c)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16)
CONFLICT (content): Merge conflict in drivers/xen/efi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Applying: xen: efi: merge fix patch
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (e55c35cf41c9 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (9a73a6895fc5 surfacepro3_button: Add a warning when switching to tablet mode)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (80d6737b27bb leds: gpio: Support the "panic-indicator" firmware property)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (c6e360a0d9d2 Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case")
Merging tty/tty-next (d20bb59af646 MAINTAINERS: 8250: remove website reference)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next (13069bd94d55 usb: Remove unnecessary space before operator ','.)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (ffc83a79b44e Staging: emxx_udc: emxx_udc: fixed coding style issue)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
Merging char-misc/char-misc-next (725d0123dfff Merge 4.6-rc7 into char-misc-testing)
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (1e0959addb61 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (02714f2c73a6 Merge branch 'misc' into for-next)
Merging target-updates/for-next (54a5e73f4d6e tcm_qla2xxx Add SCSI command jammer/discard capability)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (628ec2bde0df Merge branch 'for-4.7-dw' into for-next)
Merging pinctrl/for-next (3def2676e5d6 Merge branch 'devel' into for-next)
$ git reset --hard HEAD^
Merging next-20160511 version of pinctrl
Merging vhost/linux-next (e00f7bd22129 virtio: Silence uninitialized variable warning)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (4560bcfc9b17 Merge remote-tracking branch 'remoteproc/rproc-next' into for-next)
Merging gpio/for-next (d30a2b47d4c2 MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (4295ada2fe87 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (e08bed0f1138 clk: ingenic: Allow divider value to be divided)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b47d6130232c KVM: halt_polling: provide a way to qualify wakeups during poll)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (545a6c33f4a8 coresight: Handle build path error)
Merging rtc/rtc-next (854ec813cc23 rtc: rename so the tps6586x-rtc module can be autoloaded at boot)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (e53f09825156 Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next)
Merging akpm-current/current (4d165763f23d ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/efi.h
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/cris/Kconfig
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: mm: make mmap_sem for write waits killable for mm syscalls
Applying: mm: make vm_mmap killable
Applying: mm: make vm_munmap killable
Applying: mm, aout: handle vm_brk failures
Applying: mm, elf: handle vm_brk error
Applying: mm: make vm_brk killable
Applying: mm, proc: make clear_refs killable
Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable
Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable
Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
Applying: coredump: make coredump_wait wait for mmap_sem for write killable
Applying: aio: make aio_setup_ring killable
Applying: exec: make exec path waiting for mmap_sem killable
Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
Applying: uprobes: wait for mmap_sem for write killable
Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
Applying: kgdb: depends on VT
Merging akpm/master (108811172040 kgdb: depends on VT)
^ permalink raw reply
* linux-next: manual merge of the gpio tree with the mips tree
From: Stephen Rothwell @ 2016-05-12 4:17 UTC (permalink / raw)
To: Linus Walleij, Ralf Baechle; +Cc: linux-next, linux-kernel, Huacai Chen
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/mips/Kconfig
between commit:
cec47c182286 ("MIPS: Loongson: Add Loongson-3A R2 basic support")
from the mips tree and commit:
d30a2b47d4c2 ("MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/mips/Kconfig
index ac9bfad794eb,512b5def854d..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -1354,8 -1340,7 +1352,8 @@@ config CPU_LOONGSON
select CPU_SUPPORTS_HUGEPAGES
select WEAK_ORDERING
select WEAK_REORDERING_BEYOND_LLSC
+ select MIPS_PGD_C0_CONTEXT
- select ARCH_REQUIRE_GPIOLIB
+ select GPIOLIB
help
The Loongson 3 processor implements the MIPS64R2 instruction
set with many extensions.
^ permalink raw reply
* linux-next: build failure after merge of the pinctrl tree
From: Stephen Rothwell @ 2016-05-12 4:14 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel
Hi Linus,
After merging the pinctrl tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from include/linux/thread_info.h:11:0,
from include/asm-generic/preempt.h:4,
from arch/arm/include/generated/asm/preempt.h:1,
from include/linux/preempt.h:59,
from include/linux/spinlock.h:50,
from include/linux/seqlock.h:35,
from include/linux/time.h:5,
from include/linux/stat.h:18,
from include/linux/module.h:10,
from drivers/pinctrl/tegra/pinctrl-tegra20.c:20:
include/linux/bug.h:34:45: error: unknown field 'parked_reg' specified in initializer
#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
^
include/linux/compiler-gcc.h:64:28: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
^
include/linux/kernel.h:54:59: note: in expansion of macro '__must_be_array'
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
^
drivers/pinctrl/tegra/pinctrl-tegra20.c:2027:12: note: in expansion of macro 'ARRAY_SIZE'
.npins = ARRAY_SIZE(drive_##pg_name##_pins), \
^
drivers/pinctrl/tegra/pinctrl-tegra20.c:2050:2: note: in expansion of macro 'DRV_PG_EXT'
DRV_PG_EXT(pg_name, r, 2, 3, 4, 12, 20, 28, 2, 30, 2)
^
drivers/pinctrl/tegra/pinctrl-tegra20.c:2178:2: note: in expansion of macro 'DRV_PG'
DRV_PG(ao1, 0x868),
^
and many more.
I cannot figure out what caused it, but using the pinctrl tree from
next-20160511 makes it build again.
I am using gcc 5.2.0 hosted on powerpcle, if that matters.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the kvm tree with the tip tree
From: Stephen Rothwell @ 2016-05-12 2:54 UTC (permalink / raw)
To: Marcelo Tosatti, Gleb Natapov, kvm
Cc: linux-next, linux-kernel, Julien Grall, Christoffer Dall,
Jon Hunter, Marc Zyngier
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
drivers/irqchip/irq-gic.c
between commits:
dc9722cc57eb ("irqchip/gic: Return an error if GIC initialisation fails")
f673b9b5cb54 ("irqchip/gic: Store GIC configuration parameters")
d6490461a102 ("irqchip/gic: Add helper functions for GIC setup and teardown")
from the tip tree and commits:
bafa9193d00c ("irqchip/gic-v2: Gather ACPI specific data in a single structure")
502d6df11ae3 ("irqchip/gic-v2: Parse and export virtual GIC information")
from the kvm tree.
I fixed it up (hopefully - 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 drivers/irqchip/irq-gic.c
index 1de20e14a721,3f1d9fd3a462..000000000000
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -1248,30 -1191,29 +1250,53 @@@ static bool gic_check_eoimode(struct de
return true;
}
+static int gic_of_setup(struct gic_chip_data *gic, struct device_node *node)
+{
+ if (!gic || !node)
+ return -EINVAL;
+
+ gic->raw_dist_base = of_iomap(node, 0);
+ if (WARN(!gic->raw_dist_base, "unable to map gic dist registers\n"))
+ goto error;
+
+ gic->raw_cpu_base = of_iomap(node, 1);
+ if (WARN(!gic->raw_cpu_base, "unable to map gic cpu registers\n"))
+ goto error;
+
+ if (of_property_read_u32(node, "cpu-offset", &gic->percpu_offset))
+ gic->percpu_offset = 0;
+
+ return 0;
+
+error:
+ gic_teardown(gic);
+
+ return -ENOMEM;
+}
+
+ static void __init gic_of_setup_kvm_info(struct device_node *node)
+ {
+ int ret;
+ struct resource *vctrl_res = &gic_v2_kvm_info.vctrl;
+ struct resource *vcpu_res = &gic_v2_kvm_info.vcpu;
+
+ gic_v2_kvm_info.type = GIC_V2;
+
+ gic_v2_kvm_info.maint_irq = irq_of_parse_and_map(node, 0);
+ if (!gic_v2_kvm_info.maint_irq)
+ return;
+
+ ret = of_address_to_resource(node, 2, vctrl_res);
+ if (ret)
+ return;
+
+ ret = of_address_to_resource(node, 3, vcpu_res);
+ if (ret)
+ return;
+
+ gic_set_kvm_info(&gic_v2_kvm_info);
+ }
+
int __init
gic_of_init(struct device_node *node, struct device_node *parent)
{
@@@ -1294,17 -1235,18 +1319,19 @@@
* Disable split EOI/Deactivate if either HYP is not available
* or the CPU interface is too small.
*/
- if (gic_cnt == 0 && !gic_check_eoimode(node, &cpu_base))
+ if (gic_cnt == 0 && !gic_check_eoimode(node, &gic->raw_cpu_base))
static_key_slow_dec(&supports_deactivate);
- if (of_property_read_u32(node, "cpu-offset", &percpu_offset))
- percpu_offset = 0;
+ ret = __gic_init_bases(gic, -1, &node->fwnode);
+ if (ret) {
+ gic_teardown(gic);
+ return ret;
+ }
- if (!gic_cnt)
- __gic_init_bases(gic_cnt, -1, dist_base, cpu_base, percpu_offset,
- &node->fwnode);
+ if (!gic_cnt) {
gic_init_physaddr(node);
+ gic_of_setup_kvm_info(node);
+ }
if (parent) {
irq = irq_of_parse_and_map(node, 0);
@@@ -1401,8 -1391,8 +1476,8 @@@ static int __init gic_v2_acpi_init(stru
return -EINVAL;
}
- gic->raw_cpu_base = ioremap(cpu_phy_base, ACPI_GIC_CPU_IF_MEM_SIZE);
- cpu_base = ioremap(acpi_data.cpu_phys_base, ACPI_GIC_CPU_IF_MEM_SIZE);
- if (!cpu_base) {
++ gic->raw_cpu_base = ioremap(acpi_data.cpu_phys_base, ACPI_GIC_CPU_IF_MEM_SIZE);
+ if (!gic->raw_cpu_base) {
pr_err("Unable to map GICC registers\n");
return -ENOMEM;
}
^ permalink raw reply
* linux-next: manual merge of the tip tree with the arm64 tree
From: Stephen Rothwell @ 2016-05-12 2:00 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Catalin Marinas
Cc: linux-next, linux-kernel, Marc Zyngier, Will Deacon, Jon Hunter
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/irqchip/irq-gic.c
between commit:
25fc11aead38 ("irqchip/gic: Restore CPU interface checking")
from the arm64 tree and commit:
dc9722cc57eb ("irqchip/gic: Return an error if GIC initialisation fails")
f673b9b5cb54 ("irqchip/gic: Store GIC configuration parameters")
from the tip 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 drivers/irqchip/irq-gic.c
index 095bb5b5c3f2,113e2d02c812..000000000000
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -489,8 -486,9 +486,10 @@@ static int gic_cpu_init(struct gic_chip
/*
* Get what the GIC says our CPU mask is.
*/
- BUG_ON(cpu >= NR_GIC_CPU_IF);
+ if (WARN_ON(cpu >= NR_GIC_CPU_IF))
+ return -EINVAL;
+
+ gic_check_cpu_features();
cpu_mask = gic_get_cpumask(gic);
gic_cpu_map[cpu] = cpu_mask;
@@@ -1012,24 -1029,28 +1030,26 @@@ static const struct irq_domain_ops gic_
.unmap = gic_irq_domain_unmap,
};
- static void __init __gic_init_bases(unsigned int gic_nr, int irq_start,
- void __iomem *dist_base, void __iomem *cpu_base,
- u32 percpu_offset, struct fwnode_handle *handle)
+ static int __init __gic_init_bases(struct gic_chip_data *gic, int irq_start,
+ struct fwnode_handle *handle)
{
irq_hw_number_t hwirq_base;
- struct gic_chip_data *gic;
- int gic_irqs, irq_base, i;
-
- BUG_ON(gic_nr >= CONFIG_ARM_GIC_MAX_NR);
+ int gic_irqs, irq_base, i, ret;
- gic = &gic_data[gic_nr];
+ if (WARN_ON(!gic || gic->domain))
+ return -EINVAL;
- gic_check_cpu_features();
-
/* Initialize irq_chip */
- if (static_key_true(&supports_deactivate) && gic_nr == 0) {
- gic->chip = gic_eoimode1_chip;
+ gic->chip = gic_chip;
+
+ if (static_key_true(&supports_deactivate) && gic == &gic_data[0]) {
+ gic->chip.irq_mask = gic_eoimode1_mask_irq;
+ gic->chip.irq_eoi = gic_eoimode1_eoi_irq;
+ gic->chip.irq_set_vcpu_affinity = gic_irq_set_vcpu_affinity;
+ gic->chip.name = kasprintf(GFP_KERNEL, "GICv2");
} else {
- gic->chip = gic_chip;
- gic->chip.name = kasprintf(GFP_KERNEL, "GIC-%d", gic_nr);
+ gic->chip.name = kasprintf(GFP_KERNEL, "GIC-%d",
+ (int)(gic - &gic_data[0]));
}
#ifdef CONFIG_SMP
^ permalink raw reply
* linux-next: manual merge of the tip tree with the arc tree
From: Stephen Rothwell @ 2016-05-12 1:54 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Vineet Gupta
Cc: linux-next, linux-kernel, Noam Camus
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/irqchip/Kconfig
drivers/irqchip/Makefile
between commit:
44df427c894a ("irqchip: add nps Internal and external irqchips")
from the arc tree and commit:
b8f3ebe630a4 ("irqchip: Add Layerscape SCFG MSI controller support")
from the tip 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 drivers/irqchip/Kconfig
index 1ab632a94db3,81f88ada3a61..000000000000
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@@ -245,8 -246,10 +246,16 @@@ config MVEBU_ODM
bool
select GENERIC_MSI_IRQ_DOMAIN
+config EZNPS_GIC
+ bool "NPS400 Global Interrupt Manager (GIM)"
+ select IRQ_DOMAIN
+ help
+ Support the EZchip NPS400 global interrupt controller
++
+ config LS_SCFG_MSI
+ def_bool y if SOC_LS1021A || ARCH_LAYERSCAPE
+ depends on PCI && PCI_MSI
+ select PCI_MSI_IRQ_DOMAIN
+
+ config PARTITION_PERCPU
+ bool
diff --cc drivers/irqchip/Makefile
index 9d54d53fe223,f828244b44c2..000000000000
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -65,4 -67,4 +67,5 @@@ obj-$(CONFIG_INGENIC_IRQ) += irq-ingen
obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o
obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o
obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
+obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o
+ obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-05-11 23:56 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jiri Benc
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/ip_gre.c
between commit:
e271c7b4420d ("gre: do not keep the GRE header around in collect medata mode")
from the net tree and commit:
244a797bdcf1 ("gre: move iptunnel_pull_header down to ipgre_rcv")
from the net-next tree.
I fixed it up (hopefully - 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/ipv4/ip_gre.c
index 4cc84212cce1,2b267e71ebf5..4d1030739efa
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@@ -398,10 -272,11 +272,14 @@@ static int __ipgre_rcv(struct sk_buff *
iph->saddr, iph->daddr, tpi->key);
if (tunnel) {
+ if (__iptunnel_pull_header(skb, hdr_len, tpi->proto,
+ raw_proto, false) < 0)
+ goto drop;
+
- skb_pop_mac_header(skb);
+ if (tunnel->dev->type != ARPHRD_NONE)
+ skb_pop_mac_header(skb);
+ else
+ skb_reset_mac_header(skb);
if (tunnel->collect_md) {
__be16 flags;
__be64 tun_id;
^ permalink raw reply
* Re: linux-next: suspect commits in the vfs tree
From: Al Viro @ 2016-05-11 22:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Miklos Szeredi
In-Reply-To: <20160512073153.4132026e@canb.auug.org.au>
On Thu, May 12, 2016 at 07:31:53AM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> I noticed these commits in today's vfs tree:
>
> 38b78a5f1858 ovl: ignore permissions on underlying lookup
> 3c9fe8cdff1b vfs: add lookup_hash() helper
> 9409e22acdfc vfs: rename: check backing inode being equal
> 54d5ca871e72 vfs: add vfs_select_inode() helper
>
> They are all committed by you , but have no Signed-off-by from you.
>
> These commits are also in the overlayfs tree (since that has been rebased
> on top of them).
That's a branch from Miklos with a fixup folded into the first of four;
I didn't want to bother with extra roundtrip and folded the fixup in-place.
Hadn't noticed the lack of S-o-b until after I'd pushed, TBH...
^ permalink raw reply
* linux-next: suspect commits in the vfs tree
From: Stephen Rothwell @ 2016-05-11 21:31 UTC (permalink / raw)
To: Al Viro; +Cc: linux-next, linux-kernel, Miklos Szeredi
Hi Al,
I noticed these commits in today's vfs tree:
38b78a5f1858 ovl: ignore permissions on underlying lookup
3c9fe8cdff1b vfs: add lookup_hash() helper
9409e22acdfc vfs: rename: check backing inode being equal
54d5ca871e72 vfs: add vfs_select_inode() helper
They are all committed by you , but have no Signed-off-by from you.
These commits are also in the overlayfs tree (since that has been rebased
on top of them).
--
Cheers,
Stephen Rothwell
^ 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