* linux-next: Tree for Feb 10
From: Stephen Rothwell @ 2016-02-10 6:12 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160209:
The xfs tree lost its build failure.
The drm-misc tree gained a build failure so I used the version from
next-20160209.
The aio tree still had a build failure so I used the version from
next-20160111.
The akpm-current tree gained a conflict against the xfs tree and a build
failure that was fixed by a patch from the akpm tree.
Non-merge commits (relative to Linus' tree): 3906
3418 files changed, 126446 insertions(+), 60349 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 239 trees (counting Linus' and 36 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 (7cf91adc0d38 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (5070fb14a015 ARM: 8517/1: ICST: avoid arithmetic overflow in icst_hz())
Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (168a20bb3512 powerpc/pseries: Don't trace hcalls on offline CPUs)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (461547f31589 flow_dissector: Fix unaligned access in __skb_flow_dissector when used by eth_get_headlen)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (b16c29191dc8 netfilter: nf_conntrack: use safer way to lock all buckets)
Merging wireless-drivers/master (d76d65fd2695 rtlwifi: fix broken VHT support)
Merging mac80211/master (212c5a5e6ba6 mac80211: minstrel: Change expected throughput unit back to Kbps)
Merging sound-current/for-linus (397da2d0ab0d Merge branch 'topic/core-fixes' into for-linus)
Merging pci-current/for-linus (0cf1337e0b83 PCI: rcar: Add device tree support for r8a7793)
Merging driver-core.current/driver-core-linus (00cd29b799e3 klist: fix starting point removed bug in klist iterators)
Merging tty.current/tty-linus (c8053b587627 Revert "8250: uniphier: allow modular build with 8250 console")
Merging usb.current/usb-linus (89140fdaf11a xhci: harden xhci_find_next_ext_cap against device removal)
Merging usb-gadget-fixes/fixes (6a4290cc28be usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.)
Merging usb-serial-fixes/usb-linus (4152b387da81 USB: option: fix Cinterion AHxx enumeration)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (388f7b1d6e8c Linux 4.5-rc3)
Merging char-misc.current/char-misc-linus (3b2b9ead3214 nvmem: qfprom: Specify LE device endianness)
Merging input-current/for-linus (d4f1b06d685d Input: vmmouse - fix absolute device registration)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
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 (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
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 (e2e407dc093f drm/i915: Pretend cursor is always on for ILK-style WM calculations (v2))
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (4d0cb15fccd1 ARCv2: Check for LL-SC livelock only if LLSC is enabled)
Merging arm/for-next (f2c5e7deee7f Merge branches 'component', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (92e963f50fc7 Linux 4.5-rc1)
Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
Merging at91/at91-next (8129febb508f ARM: dts: at91: at91sam9n12ek: fix panel compatible string)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (5ec6f2cd8ec4 ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.)
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 (92e963f50fc7 Linux 4.5-rc1)
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 (5a2565fb7d09 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (84127e66ef4a Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (d56817ce2533 Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (2ccea21d797f ARM: qcom: Drop ARCH_MSM* configs)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (74eb2716fe71 Merge branches 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6', 'heads/dt-for-v4.6' and 'heads/soc-for-v4.6' into next)
Merging rockchip/for-next (d35a94d9cdc9 Merge branch 'v4.6-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (3a9cb5f4a9a7 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (06902a8895d5 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (025e08f78501 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (f87d7146b487 asm-generic: make __set_fixmap_offset a macro again)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
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 (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
Merging m68knommu/for-next (9d4c9e5064d7 m68knommu: fix FEC platform device registration when driver is modular)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (a13d2abd8e61 MIPS: highmem: Turn flush_cache_kmaps into a no-op.)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (388f7b1d6e8c Linux 4.5-rc3)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (684c4c448637 s390/pci: remove pdev pointer from arch data)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging btrfs-kdave/for-next (4c9aeec066dd Merge branch 'for-next-4.6-20160203' into for-next-20160203)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
Merging cifs/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (5a9530e498ed ocfs2: Implement get_next_id())
Merging ext4/dev (6df2762f3f76 ext4 crypto: move context consistency check to ext4_file_open())
Merging f2fs/dev (108daea1bd02 f2fs: increase i_size to avoid missing data)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (50ab8ec74a15 nfs: fix nfs_size_to_loff_t)
Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (6ebcc3fcdac1 Orangefs: added a couple of WARN_ONs, perhaps just temporarily.)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (4faac780f4b9 Merge branch 'xfs-gut-icdinode-4.6' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
Merging hid/for-next (0f25a4f8ac31 Merge branch 'for-4.6/upstream' into for-next)
Merging i2c/i2c/for-next (36f90b0a2ddd Linux 4.5-rc2)
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 (972d7d17b6bb hwmon: Add LTC2990 sensor driver)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (f6f756ddd65f Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (8eee1d3ed5b6 libata: fix sff host state machine locking while polling)
Merging pm/linux-next (74504aa2506e Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
Merging thermal-soc/next (26716ce124fc thermal: allow u8500-thermal driver to be a module)
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (64509b4ad81c Merge branch 'topic/pl330' into next)
Merging net-next/master (ef5c0e253d0b Merge branch 'tpacket-gso-csum-offload')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (6709d1f4ece5 netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers-next/master (11e70824e75f mwifiex: firmware dump support for w8997 chipset)
Merging bluetooth/master (9a6a1c77e1fc Bluetooth: Use managed version of led_trigger_register in LED trigger)
Merging mac80211-next/master (94106d26c380 mac80211: fix VHT MU-MIMO frame processing)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging l2-mtd/master (ed4eeba7338b driver/memory: Removal of deprecated NO_IRQ)
Merging crypto/master (f75516a81548 crypto: keys - Revert "convert public key to akcipher api")
Merging drm/drm-next (10c1b6183a16 drm/tegra: drop unused variable.)
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (af3997b569db drm/i915: Skip DDI PLL selection for DSI)
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (4c61716c2bfa drm: Add drm_format_plane_width() and drm_format_plane_height())
$ git reset --hard HEAD^
Merging next-20160209 version of drm-misc
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 (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (40eb4e27aa20 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (9b88daa5137f Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (7088fa7594f3 Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (1261d013daea Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB)
Merging block/for-next (028a80d2bc0a Merge branch 'for-4.6/drivers' into for-next)
Merging device-mapper/for-next (aa8c484be790 dm thin metadata: remove needless newline from subtree_dec() DMERR message)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (7d9e20d2be0d Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fc2561ec0afc md-cluster: delete useless code)
Merging mfd/for-mfd-next (5ae2c86a88fb mfd: lpss: Add PCI IDs for Intel Broxton B-Step platform)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (cd3f87e363d2 Merge remote-tracking branch 'regulator/topic/mt6397' into regulator-next)
Merging security/next (388f7b1d6e8c Linux 4.5-rc3)
Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (388f7b1d6e8c Linux 4.5-rc3)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (df8a0dde7306 Remove "arch" usage in Documentation/features/list-arch.sh)
Merging trivial/for-next (e9bf1d57f0a0 drivers/rtc: broken link fix)
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (b8c15a91f1fe Merge branches 'dt/next' and 'dt/linus' into for-next)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (f5ec5bea103c Merge remote-tracking branch 'spi/topic/pxa2xx' into spi-next)
Merging tip/auto-latest (f864fe9a9259 Merge branch 'x86/mm')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (f2b59ac66f98 EDAC, mpc85xx: Silence unused variable warning)
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
Merging kvm/linux-next (bce87cce88c7 KVM: x86: consolidate different ways to test for in-kernel LAPIC)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support)
Merging kvms390/next (9fc684e9cc59 KVM: s390: allow sync of fp registers via vregs)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (23d11a58a9a6 workqueue: skip flush dependency checks for legacy workqueues)
Merging drivers-x86/for-next (9df7fc9a9657 toshiba_acpi: Add a module parameter to disable hotkeys registration)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (bf6153edb7ba Merge remote-tracking branch 'regmap/topic/doc' into regmap-next)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (ee2e1c2d18a4 leds: leds-gpio: Fix return value check in create_gpio_led())
Merging ipmi/for-next (7f8df84ecba8 ipmi_si: Avoid a wrong long timeout on transaction done)
Merging driver-core/driver-core-next (94e1dec7a9c1 debugfs: Add stub function for debugfs_create_automount().)
Merging tty/tty-next (98cb4ab09e77 tty: serial: jsm_tty: fixed redundant variable issue.)
CONFLICT (content): Merge conflict in drivers/tty/tty_io.c
Merging usb/usb-next (b1249ab51301 usb: r8a66597: add locking to r8a66597_check_detect_child)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (92e963f50fc7 Linux 4.5-rc1)
Merging usb-chipidea-next/ci-for-usb-next (6b8bc9c6fb26 usb: chipidea: udc: remove unused value assignment)
Merging staging/staging-next (c75955d1ee43 staging: emxx_udc: Alligned to match '(')
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
$ git rm -f drivers/staging/dgap/dgap.c
Merging char-misc/char-misc-next (10a3fbf18d99 firmware: Change the page arrary alloc to vmalloc)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (9a2ddda572a0 Documentation: cgroup: Fix 'cgroup-legacy' -> 'cgroup-v1')
Merging scsi/for-next (1440a6835981 Merge branch 'misc' into for-next)
Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (f6af8e62cd21 Merge branch 'devel' into for-next)
Merging vhost/linux-next (481eaec37e91 tools/virtio: add ringtest utilities)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (8d68bb842800 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (4db9a9ba602b clk: lpc32xx: do not register clock "0")
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (92e963f50fc7 Linux 4.5-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
Merging rtc/rtc-next (9d4be765c76d drivers: rtc: allow compilation of sun6i RTC for all sunxi SoCs)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
Merging akpm-current/current (234d02a19863 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
Applying: kernel/memremap: fix up dev_WARN invocation
$ git checkout -b akpm remotes/origin/akpm/master
Applying: kernel/memremap.c: add new arg to dev_WARN
CONFLICT (content): Merge conflict in kernel/memremap.c
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (099af7a1e22f drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm-misc tree
From: Daniel Vetter @ 2016-02-10 6:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, dri-devel, linux-next, linux-kernel,
Lukas Wunner, Darren Hart
In-Reply-To: <20160210122451.55391e43@canb.auug.org.au>
On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> include/linux/apple-gmux.h: In function 'apple_gmux_present':
> include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> ^
>
> Caused by commit
>
> 2413306c2566 ("apple-gmux: Add helper for presence detect")
>
> I have used the drm-misc tree from next-20160209 for today.
Can you pls attach your .config? The function is there, I suspect we're
just missing some depends in Kconfig.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm-misc tree
From: Lukas Wunner @ 2016-02-10 8:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, Rafael J. Wysocki, linux-kernel,
dri-devel, linux-acpi, linux-next, Darren Hart
In-Reply-To: <20160210122451.55391e43@canb.auug.org.au>
[cc += Rafael J. Wysocki, linux-acpi]
Hi Stephen,
On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> include/linux/apple-gmux.h: In function 'apple_gmux_present':
> include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> ^
>
> Caused by commit
>
> 2413306c2566 ("apple-gmux: Add helper for presence detect")
>
> I have used the drm-misc tree from next-20160209 for today.
Ugh, apologies, I didn't have a non-ACPI platform available to test
this on.
Solution is to either add to include/linux/acpi.h
static inline bool acpi_dev_present(const char *hid)
{
return false;
}
somewhere below
#else /* !CONFIG_ACPI */
or alternatively to add to include/linux/apple-gmux.h
IS_ENABLED(CONFIG_ACPI)
in apple_gmux_present().
I'll check the other users of acpi_dev_present() to see which of
these two solutions is more appropriate and will post a fix shortly.
Thanks a lot for reporting this.
Lukas
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* next-20160210 build: 2 failures 4 warnings (next-20160210)
From: Build bot for Mark Brown @ 2016-02-10 9:12 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160210
Git describe: next-20160210
Commit: b613c2bfa3 Add linux-next specific files for 20160210
Build Time: 73 min 31 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 2
Warnings: 4
Section Mismatches: 1
Failed defconfigs:
arm64-allmodconfig
arm-multi_v5_defconfig
Errors:
arm64-allmodconfig
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
arm-multi_v5_defconfig
../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
0 warnings 1 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 2
5 ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
1 ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
Warnings Summary: 4
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Section Mismatch Summary: 1
1 WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 5 errors, 0 warnings, 1 section mismatches
Errors:
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
Section Mismatches:
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches
Errors:
../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm64-defconfig
^ permalink raw reply
* Re: next-20160210 build: 2 failures 4 warnings (next-20160210)
From: Mark Brown @ 2016-02-10 9:52 UTC (permalink / raw)
To: Rafael J. Wysocki, Viresh Kumar, Gautham R. Shenoy
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-pm
In-Reply-To: <E1aTQoy-0005cH-Tr@optimist>
[-- Attachment #1: Type: text/plain, Size: 625 bytes --]
On Wed, Feb 10, 2016 at 09:12:25AM +0000, Build bot for Mark Brown wrote:
Today's -next fails to build on non-SMP configurations due to:
> arm-multi_v5_defconfig
> ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
caused by 0144fa03ef4606ae (cpufreq: governor: Replace timers with
utilization update callbacks). IS_ENABLED() in an if statement doesn't
do a good job of making things conditional here since the code still has
to compile cleanly in both cases and there is no definition at all of
irq_work_queue_on() for !SMP.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160210 build: 2 failures 4 warnings (next-20160210)
From: Mark Brown @ 2016-02-10 10:08 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Andrew Pinski
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <E1aTQoy-0005cH-Tr@optimist>
[-- Attachment #1: Type: text/plain, Size: 643 bytes --]
On Wed, Feb 10, 2016 at 09:12:25AM +0000, Build bot for Mark Brown wrote:
Today's -next fails to build an arm64 allmodconfig due to:
> arm64-allmodconfig
> ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
due to 52e662326e1e915 (arm64: prefetch: don't provide
spin_lock_prefetch with LSE) which adds use of ARM64_LSE_ATOMIC_INSN but
does not add an inclusion of asm/lse.h which defines it. Most files
have an implicit include so build fine but a few don't which causes the
failure. It does add an inclusion of asm/alternative.h which may be the
best place to add the inclusion.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160210 build: 2 failures 4 warnings (next-20160210)
From: Will Deacon @ 2016-02-10 10:12 UTC (permalink / raw)
To: Mark Brown
Cc: Catalin Marinas, Andrew Pinski, kernel-build-reports,
linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <20160210100837.GT13270@sirena.org.uk>
On Wed, Feb 10, 2016 at 10:08:37AM +0000, Mark Brown wrote:
> On Wed, Feb 10, 2016 at 09:12:25AM +0000, Build bot for Mark Brown wrote:
>
> Today's -next fails to build an arm64 allmodconfig due to:
>
> > arm64-allmodconfig
> > ../arch/arm64/include/asm/processor.h:183:15: error: expected string literal before 'ARM64_LSE_ATOMIC_INSN'
>
> due to 52e662326e1e915 (arm64: prefetch: don't provide
> spin_lock_prefetch with LSE) which adds use of ARM64_LSE_ATOMIC_INSN but
> does not add an inclusion of asm/lse.h which defines it. Most files
> have an implicit include so build fine but a few don't which causes the
> failure. It does add an inclusion of asm/alternative.h which may be the
> best place to add the inclusion.
I just sent a fix to the list.
Will
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm-misc tree
From: Lukas Wunner @ 2016-02-10 13:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, intel-gfx, Rafael J. Wysocki, linux-kernel,
dri-devel, linux-acpi, linux-next, Darren Hart
In-Reply-To: <20160210084138.GA15392@wunner.de>
Hi,
On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the drm-misc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> > ^
> >
> > Caused by commit
> >
> > 2413306c2566 ("apple-gmux: Add helper for presence detect")
> >
> > I have used the drm-misc tree from next-20160209 for today.
>
> Ugh, apologies, I didn't have a non-ACPI platform available to test
> this on.
>
> Solution is to either add to include/linux/acpi.h
>
> static inline bool acpi_dev_present(const char *hid)
> {
> return false;
> }
>
> somewhere below
>
> #else /* !CONFIG_ACPI */
>
> or alternatively to add to include/linux/apple-gmux.h
>
> IS_ENABLED(CONFIG_ACPI)
>
> in apple_gmux_present().
>
> I'll check the other users of acpi_dev_present() to see which of
> these two solutions is more appropriate and will post a fix shortly.
The patch included below fixes the build if CONFIG_ACPI is not set.
@Daniel Vetter: Would it be possible to squash this with 2413306c2566
("apple-gmux: Add helper for presence detect") on topic/drm-misc so
as to avoid build breakage for anyone trying to bisect between that
commit and this fix?
I checked all other users of acpi_dev_present() and all of them are
only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
<linux/apple-gmux.h> rather than in <linux/acpi.h>.
Thanks again Stephen for reporting this at such an early stage,
though doubtlessly it would have been better if I had thought of
this possibility when preparing the original patch, or if I had
compile-tested without CONFIG_ACPI. :-(
Lukas
-- >8 --
Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI
The DRM drivers i915, nouveau and radeon may be compiled with
CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.
Add a no-op stub for apple_gmux_present() which is used if
CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
(CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
---
include/linux/apple-gmux.h | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
index feebc28..b2d32e0 100644
--- a/include/linux/apple-gmux.h
+++ b/include/linux/apple-gmux.h
@@ -22,6 +22,8 @@
#define GMUX_ACPI_HID "APP000B"
+#if IS_ENABLED(CONFIG_APPLE_GMUX)
+
/**
* apple_gmux_present() - detect if gmux is built into the machine
*
@@ -33,7 +35,16 @@
*/
static inline bool apple_gmux_present(void)
{
- return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
+ return acpi_dev_present(GMUX_ACPI_HID);
}
+#else /* !CONFIG_APPLE_GMUX */
+
+static inline bool apple_gmux_present(void)
+{
+ return false;
+}
+
+#endif /* !CONFIG_APPLE_GMUX */
+
#endif /* LINUX_APPLE_GMUX_H */
--
1.8.5.2 (Apple Git-48)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related
* Re: linux-next: build failure after merge of the drm-misc tree
From: Daniel Vetter @ 2016-02-10 13:37 UTC (permalink / raw)
To: Lukas Wunner
Cc: Stephen Rothwell, Daniel Vetter, intel-gfx, Rafael J. Wysocki,
linux-kernel, dri-devel, linux-acpi, linux-next, Darren Hart
In-Reply-To: <20160210131741.GA15492@wunner.de>
On Wed, Feb 10, 2016 at 02:17:41PM +0100, Lukas Wunner wrote:
> Hi,
>
> On Wed, Feb 10, 2016 at 09:41:38AM +0100, Lukas Wunner wrote:
> > On Wed, Feb 10, 2016 at 12:24:51PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the drm-misc tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > In file included from drivers/gpu/drm/nouveau/nouveau_drm.c:25:0:
> > > include/linux/apple-gmux.h: In function 'apple_gmux_present':
> > > include/linux/apple-gmux.h:36:42: error: implicit declaration of function 'acpi_dev_present' [-Werror=implicit-function-declaration]
> > > return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> > > ^
> > >
> > > Caused by commit
> > >
> > > 2413306c2566 ("apple-gmux: Add helper for presence detect")
> > >
> > > I have used the drm-misc tree from next-20160209 for today.
> >
> > Ugh, apologies, I didn't have a non-ACPI platform available to test
> > this on.
> >
> > Solution is to either add to include/linux/acpi.h
> >
> > static inline bool acpi_dev_present(const char *hid)
> > {
> > return false;
> > }
> >
> > somewhere below
> >
> > #else /* !CONFIG_ACPI */
> >
> > or alternatively to add to include/linux/apple-gmux.h
> >
> > IS_ENABLED(CONFIG_ACPI)
> >
> > in apple_gmux_present().
> >
> > I'll check the other users of acpi_dev_present() to see which of
> > these two solutions is more appropriate and will post a fix shortly.
>
> The patch included below fixes the build if CONFIG_ACPI is not set.
>
> @Daniel Vetter: Would it be possible to squash this with 2413306c2566
> ("apple-gmux: Add helper for presence detect") on topic/drm-misc so
> as to avoid build breakage for anyone trying to bisect between that
> commit and this fix?
>
> I checked all other users of acpi_dev_present() and all of them are
> only compiled if CONFIG_ACPI is set. Hence I opted to fix this in
> <linux/apple-gmux.h> rather than in <linux/acpi.h>.
>
> Thanks again Stephen for reporting this at such an early stage,
> though doubtlessly it would have been better if I had thought of
> this possibility when preparing the original patch, or if I had
> compile-tested without CONFIG_ACPI. :-(
Since !ACPI and enabling APPLE_GMUX is a bit a fringe config I don't think
this will hurt bisectability at all on a real system. So just applied this
one on top of drm-misc.
Thanks, Daniel
>
> Lukas
>
> -- >8 --
> Subject: [PATCH] apple-gmux: Fix build breakage if !CONFIG_ACPI
>
> The DRM drivers i915, nouveau and radeon may be compiled with
> CONFIG_ACPI not set, in which case acpi_dev_present() is undefined.
>
> Add a no-op stub for apple_gmux_present() which is used if
> CONFIG_APPLE_GMUX is not enabled to avoid build breakage.
> (CONFIG_APPLE_GMUX depends on CONFIG_ACPI.)
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> ---
> include/linux/apple-gmux.h | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/apple-gmux.h b/include/linux/apple-gmux.h
> index feebc28..b2d32e0 100644
> --- a/include/linux/apple-gmux.h
> +++ b/include/linux/apple-gmux.h
> @@ -22,6 +22,8 @@
>
> #define GMUX_ACPI_HID "APP000B"
>
> +#if IS_ENABLED(CONFIG_APPLE_GMUX)
> +
> /**
> * apple_gmux_present() - detect if gmux is built into the machine
> *
> @@ -33,7 +35,16 @@
> */
> static inline bool apple_gmux_present(void)
> {
> - return IS_ENABLED(CONFIG_APPLE_GMUX) && acpi_dev_present(GMUX_ACPI_HID);
> + return acpi_dev_present(GMUX_ACPI_HID);
> }
>
> +#else /* !CONFIG_APPLE_GMUX */
> +
> +static inline bool apple_gmux_present(void)
> +{
> + return false;
> +}
> +
> +#endif /* !CONFIG_APPLE_GMUX */
> +
> #endif /* LINUX_APPLE_GMUX_H */
> --
> 1.8.5.2 (Apple Git-48)
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* Re: next-20160210 build: 2 failures 4 warnings (next-20160210)
From: Rafael J. Wysocki @ 2016-02-10 14:27 UTC (permalink / raw)
To: Mark Brown
Cc: Rafael J. Wysocki, Viresh Kumar, Gautham R. Shenoy,
kernel-build-reports, Lists linaro-kernel, linux-next,
linux-pm@vger.kernel.org
In-Reply-To: <20160210095252.GS13270@sirena.org.uk>
On Wed, Feb 10, 2016 at 10:52 AM, Mark Brown <broonie@kernel.org> wrote:
> On Wed, Feb 10, 2016 at 09:12:25AM +0000, Build bot for Mark Brown wrote:
>
> Today's -next fails to build on non-SMP configurations due to:
>
>> arm-multi_v5_defconfig
>> ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
>
> caused by 0144fa03ef4606ae (cpufreq: governor: Replace timers with
> utilization update callbacks). IS_ENABLED() in an if statement doesn't
> do a good job of making things conditional here since the code still has
> to compile cleanly in both cases and there is no definition at all of
> irq_work_queue_on() for !SMP.
Thanks for the report!
OK, I'll change it to #ifdef/#else then.
Thanks,
Rafael
^ permalink raw reply
* Re: next-20160210 build: 2 failures 4 warnings (next-20160210)
From: Arnd Bergmann @ 2016-02-10 15:04 UTC (permalink / raw)
To: linaro-kernel
Cc: Rafael J. Wysocki, Mark Brown, Gautham R. Shenoy,
kernel-build-reports, Viresh Kumar, linux-pm@vger.kernel.org,
Rafael J. Wysocki, linux-next
In-Reply-To: <CAJZ5v0iamr-b5h=eS1SWo6WMj_NNOqnXoxnC6R03VmtLBG5dEA@mail.gmail.com>
On Wednesday 10 February 2016 15:27:48 Rafael J. Wysocki wrote:
> On Wed, Feb 10, 2016 at 10:52 AM, Mark Brown <broonie@kernel.org> wrote:
> > On Wed, Feb 10, 2016 at 09:12:25AM +0000, Build bot for Mark Brown wrote:
> >
> > Today's -next fails to build on non-SMP configurations due to:
> >
> >> arm-multi_v5_defconfig
> >> ../drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
> >
> > caused by 0144fa03ef4606ae (cpufreq: governor: Replace timers with
> > utilization update callbacks). IS_ENABLED() in an if statement doesn't
> > do a good job of making things conditional here since the code still has
> > to compile cleanly in both cases and there is no definition at all of
> > irq_work_queue_on() for !SMP.
>
> Thanks for the report!
>
> OK, I'll change it to #ifdef/#else then.
>
I have a better idea, patch follows.
Arnd
^ permalink raw reply
* [PATCH] irq_work: unhide irq_work_queue_on declaration on non-SMP
From: Arnd Bergmann @ 2016-02-10 15:07 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar
Cc: linaro-kernel, Rafael J. Wysocki, Mark Brown, Gautham R. Shenoy,
kernel-build-reports, Viresh Kumar, linux-pm@vger.kernel.org,
Rafael J. Wysocki, linux-next, Frederic Weisbecker,
Thomas Gleixner, linux-kernel
In-Reply-To: <CAJZ5v0iamr-b5h=eS1SWo6WMj_NNOqnXoxnC6R03VmtLBG5dEA@mail.gmail.com>
The cpufreq code uses 'if (IS_ENABLED(CONFIG_SMP))' to check
whether it should queue a task on the local CPU or a remote
one, however the irq_work_queue_on() function is not declared
when CONFIG_SMP is not set:
drivers/cpufreq/cpufreq_governor.c: In function 'gov_queue_irq_work':
drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
irq_work_queue_on(&policy_dbs->irq_work, smp_processor_id());
This changes the conditional declaration so that irq_work_queue_on
just queues the irq work on the only available CPU when CONFIG_SMP
is not set, which is presumably what most people need anyway.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 0144fa03ef46 ("cpufreq: governor: Replace timers with utilization update callbacks")
diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
index 47b9ebd4a74f..c9bde50ef317 100644
--- a/include/linux/irq_work.h
+++ b/include/linux/irq_work.h
@@ -33,9 +33,13 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *))
#define DEFINE_IRQ_WORK(name, _f) struct irq_work name = { .func = (_f), }
bool irq_work_queue(struct irq_work *work);
-
#ifdef CONFIG_SMP
bool irq_work_queue_on(struct irq_work *work, int cpu);
+#else
+static inline bool irq_work_queue_on(struct irq_work *work, int cpu)
+{
+ return irq_work_queue(work);
+}
#endif
void irq_work_tick(void);
^ permalink raw reply related
* Re: [PATCH] irq_work: unhide irq_work_queue_on declaration on non-SMP
From: Rafael J. Wysocki @ 2016-02-10 15:27 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Peter Zijlstra, Ingo Molnar, Lists linaro-kernel,
Rafael J. Wysocki, Mark Brown, Gautham R. Shenoy,
kernel-build-reports, Viresh Kumar, linux-pm@vger.kernel.org,
Rafael J. Wysocki, linux-next, Frederic Weisbecker,
Thomas Gleixner, Linux Kernel Mailing List
In-Reply-To: <4447865.IoQjlk8ngP@wuerfel>
On Wed, Feb 10, 2016 at 4:07 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> The cpufreq code uses 'if (IS_ENABLED(CONFIG_SMP))' to check
> whether it should queue a task on the local CPU or a remote
> one, however the irq_work_queue_on() function is not declared
> when CONFIG_SMP is not set:
>
> drivers/cpufreq/cpufreq_governor.c: In function 'gov_queue_irq_work':
> drivers/cpufreq/cpufreq_governor.c:251:3: error: implicit declaration of function 'irq_work_queue_on' [-Werror=implicit-function-declaration]
> irq_work_queue_on(&policy_dbs->irq_work, smp_processor_id());
>
> This changes the conditional declaration so that irq_work_queue_on
> just queues the irq work on the only available CPU when CONFIG_SMP
> is not set, which is presumably what most people need anyway.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 0144fa03ef46 ("cpufreq: governor: Replace timers with utilization update callbacks")
>
> diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
> index 47b9ebd4a74f..c9bde50ef317 100644
> --- a/include/linux/irq_work.h
> +++ b/include/linux/irq_work.h
> @@ -33,9 +33,13 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *))
> #define DEFINE_IRQ_WORK(name, _f) struct irq_work name = { .func = (_f), }
>
> bool irq_work_queue(struct irq_work *work);
> -
> #ifdef CONFIG_SMP
> bool irq_work_queue_on(struct irq_work *work, int cpu);
> +#else
> +static inline bool irq_work_queue_on(struct irq_work *work, int cpu)
> +{
> + return irq_work_queue(work);
> +}
> #endif
>
> void irq_work_tick(void);
I was thinking about this too, but then cpufreq will be the only user of it.
In any case can do it at any time later. :-)
Thanks,
Rafael
^ permalink raw reply
* Re: [PATCH] irq_work: unhide irq_work_queue_on declaration on non-SMP
From: Mark Brown @ 2016-02-10 18:10 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Arnd Bergmann, Peter Zijlstra, Ingo Molnar, Lists linaro-kernel,
Gautham R. Shenoy, kernel-build-reports, Viresh Kumar,
linux-pm@vger.kernel.org, Rafael J. Wysocki, linux-next,
Frederic Weisbecker, Thomas Gleixner, Linux Kernel Mailing List
In-Reply-To: <CAJZ5v0h41Xm4LAZB_XiDjZih6g7W5aJjA-t3f=HFo1zGkAPSgA@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
On Wed, Feb 10, 2016 at 04:27:42PM +0100, Rafael J. Wysocki wrote:
> > +#else
> > +static inline bool irq_work_queue_on(struct irq_work *work, int cpu)
> > +{
> > + return irq_work_queue(work);
> > +}
> > #endif
> I was thinking about this too, but then cpufreq will be the only user of it.
> In any case can do it at any time later. :-)
Well, there's currently only two other users of irq_work_queue_on()
anyway so that's a third of the userbase and it does seem the obvious
way to support any other future users that want to scale down to !SMP
cases painlessly.
Reviwed-by: Mark Brown <broonie@kernel.org>
FWIW.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Andrew Morton @ 2016-02-10 19:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dan Williams
In-Reply-To: <20160210165514.412992a5@canb.auug.org.au>
On Wed, 10 Feb 2016 16:55:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from arch/x86/include/asm/bug.h:35:0,
> from include/linux/bug.h:4,
> from include/linux/thread_info.h:11,
> from arch/x86/include/asm/preempt.h:6,
> from include/linux/preempt.h:59,
> from include/linux/radix-tree.h:25,
> from kernel/memremap.c:13:
> kernel/memremap.c: In function 'devm_memremap_pages_release':
> kernel/memremap.c:230:54: error: expected ')' before '__func__'
> dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
> ^
> include/asm-generic/bug.h:74:69: note: in definition of macro '__WARN_printf'
> #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
> ^
> include/linux/device.h:1312:2: note: in expansion of macro 'WARN'
> WARN(condition, "%s %s: " format, \
> ^
> kernel/memremap.c:230:3: note: in expansion of macro 'dev_WARN'
> dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
> ^
> include/linux/device.h:1312:18: warning: format '%s' expects a matching 'char *' argument [-Wformat=]
> WARN(condition, "%s %s: " format, \
> ^
> include/asm-generic/bug.h:74:69: note: in definition of macro '__WARN_printf'
> #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
> ^
> include/linux/device.h:1312:2: note: in expansion of macro 'WARN'
> WARN(condition, "%s %s: " format, \
> ^
> kernel/memremap.c:230:3: note: in expansion of macro 'dev_WARN'
> dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
> ^
>
> Probably exposed by commit
>
> 27ffb3827ac7 ("mm: CONFIG_NR_ZONES_EXTENDED")
>
> originally caused by commit
>
> 5c2c2587b132 ("mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup")
>
> which was added in v4.5-rc1.
>
> I added the below patch for today but then discovered the waiting patch
> in the akpm tree ("kernel/memremap.c: add new arg to dev_WARN") which
> should be sent to Linus ASAP (and should have appeared much earlier in
> the series).
kernel-memremapc-add-new-arg-to-dev_warn.patch fixes ee49ac85bc24b946
("treewide: let dev_WARN() accept a condition") which is only in
linux-next?
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-02-10 20:51 UTC (permalink / raw)
To: Andrew Morton, Jiri Kosina
Cc: linux-next, linux-kernel, Dan Williams, Felipe Balbi,
Greg Kroah-Hartman
In-Reply-To: <20160210115507.f1521e162a8489c18b02048b@linux-foundation.org>
Hi Andrew,
On Wed, 10 Feb 2016 11:55:07 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 10 Feb 2016 16:55:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Andrew,
> >
> > After merging the akpm-current tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from arch/x86/include/asm/bug.h:35:0,
> > from include/linux/bug.h:4,
> > from include/linux/thread_info.h:11,
> > from arch/x86/include/asm/preempt.h:6,
> > from include/linux/preempt.h:59,
> > from include/linux/radix-tree.h:25,
> > from kernel/memremap.c:13:
> > kernel/memremap.c: In function 'devm_memremap_pages_release':
> > kernel/memremap.c:230:54: error: expected ')' before '__func__'
> > dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
> > ^
> > include/asm-generic/bug.h:74:69: note: in definition of macro '__WARN_printf'
> > #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
> > ^
> > include/linux/device.h:1312:2: note: in expansion of macro 'WARN'
> > WARN(condition, "%s %s: " format, \
> > ^
> > kernel/memremap.c:230:3: note: in expansion of macro 'dev_WARN'
> > dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
> > ^
> > include/linux/device.h:1312:18: warning: format '%s' expects a matching 'char *' argument [-Wformat=]
> > WARN(condition, "%s %s: " format, \
> > ^
> > include/asm-generic/bug.h:74:69: note: in definition of macro '__WARN_printf'
> > #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
> > ^
> > include/linux/device.h:1312:2: note: in expansion of macro 'WARN'
> > WARN(condition, "%s %s: " format, \
> > ^
> > kernel/memremap.c:230:3: note: in expansion of macro 'dev_WARN'
> > dev_WARN(dev, "%s: page mapping is still live!\n", __func__);
> > ^
> >
> > Probably exposed by commit
> >
> > 27ffb3827ac7 ("mm: CONFIG_NR_ZONES_EXTENDED")
> >
> > originally caused by commit
> >
> > 5c2c2587b132 ("mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup")
> >
> > which was added in v4.5-rc1.
> >
> > I added the below patch for today but then discovered the waiting patch
> > in the akpm tree ("kernel/memremap.c: add new arg to dev_WARN") which
> > should be sent to Linus ASAP (and should have appeared much earlier in
> > the series).
>
> kernel-memremapc-add-new-arg-to-dev_warn.patch fixes ee49ac85bc24b946
> ("treewide: let dev_WARN() accept a condition") which is only in
> linux-next?
Yes, indeed, I guess I was a bit tired by that point :-(
However, I am not sure I would ever call an API change trivial i.e. I
wonder what that patch is doing the the trivial tree ... I guess that
patch is needed as part of the merge of the trivial tree. Or the
trivial tree should be based on v4.5-rc1 not v4.3 (in which case this
patch belongs as part of ee49ac85bc24b946 (and presumably would have
been found in testing of the trivial tree alone).
I will put your patch into teh merge of the trivial tree today (so it
will disappear from the akpm tree).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-02-11 0:59 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, David Wragg, Jiri Benc
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/vxlan.c
between commit:
72564b59ffc4 ("vxlan: Relax MTU constraints")
from the net tree and commit:
1a8496ba4091 ("vxlan: consolidate output route calculation")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/vxlan.c
index a31cd954b308,65f52472a52c..000000000000
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@@ -2395,40 -2316,6 +2321,15 @@@ static int __vxlan_change_mtu(struct ne
return 0;
}
+static int vxlan_change_mtu(struct net_device *dev, int new_mtu)
+{
+ struct vxlan_dev *vxlan = netdev_priv(dev);
+ struct vxlan_rdst *dst = &vxlan->default_dst;
+ struct net_device *lowerdev = __dev_get_by_index(vxlan->net,
+ dst->remote_ifindex);
+ return __vxlan_change_mtu(dev, lowerdev, dst, new_mtu, true);
+}
+
- static int egress_ipv4_tun_info(struct net_device *dev, struct sk_buff *skb,
- struct ip_tunnel_info *info,
- __be16 sport, __be16 dport)
- {
- struct vxlan_dev *vxlan = netdev_priv(dev);
- struct rtable *rt;
- struct flowi4 fl4;
-
- memset(&fl4, 0, sizeof(fl4));
- fl4.flowi4_tos = RT_TOS(info->key.tos);
- fl4.flowi4_mark = skb->mark;
- fl4.flowi4_proto = IPPROTO_UDP;
- fl4.daddr = info->key.u.ipv4.dst;
-
- rt = ip_route_output_key(vxlan->net, &fl4);
- if (IS_ERR(rt))
- return PTR_ERR(rt);
- ip_rt_put(rt);
-
- info->key.u.ipv4.src = fl4.saddr;
- info->key.tp_src = sport;
- info->key.tp_dst = dport;
- return 0;
- }
-
static int vxlan_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
^ permalink raw reply
* linux-next: Tree for Feb 11
From: Stephen Rothwell @ 2016-02-11 5:45 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160210:
The net-next tree gained a conflict against the net tree.
The drm-misc tree lost its build failure.
The trivial tree gained a build fix from the akpm tree.
The aio tree still had a build failure so I used the version from
next-20160111.
The akpm tree lost a patch to the trivial build tree fix.
Non-merge commits (relative to Linus' tree): 4057
3564 files changed, 139812 insertions(+), 63361 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 239 trees (counting Linus' and 36 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 (74c7b2af37ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (5070fb14a015 ARM: 8517/1: ICST: avoid arithmetic overflow in icst_hz())
Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (0fe53e8d335b powerpc/powernv: Fix stale PE primary bus)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (a1b14d27ed09 bpf: fix branch offset adjustment on backjumps after patching ctx expansion)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (b16c29191dc8 netfilter: nf_conntrack: use safer way to lock all buckets)
Merging wireless-drivers/master (d76d65fd2695 rtlwifi: fix broken VHT support)
Merging mac80211/master (212c5a5e6ba6 mac80211: minstrel: Change expected throughput unit back to Kbps)
Merging sound-current/for-linus (397da2d0ab0d Merge branch 'topic/core-fixes' into for-linus)
Merging pci-current/for-linus (0cf1337e0b83 PCI: rcar: Add device tree support for r8a7793)
Merging driver-core.current/driver-core-linus (00cd29b799e3 klist: fix starting point removed bug in klist iterators)
Merging tty.current/tty-linus (c8053b587627 Revert "8250: uniphier: allow modular build with 8250 console")
Merging usb.current/usb-linus (89140fdaf11a xhci: harden xhci_find_next_ext_cap against device removal)
Merging usb-gadget-fixes/fixes (6a4290cc28be usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.)
Merging usb-serial-fixes/usb-linus (4152b387da81 USB: option: fix Cinterion AHxx enumeration)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (388f7b1d6e8c Linux 4.5-rc3)
Merging char-misc.current/char-misc-linus (3b2b9ead3214 nvmem: qfprom: Specify LE device endianness)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
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 (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
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 (ed3f9fd1e865 drm/i915: fix error path in intel_setup_gmbus())
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (dec2b2849cfc ARCv2: intc: Allow interruption by lowest priority interrupt)
Merging arm/for-next (f2c5e7deee7f Merge branches 'component', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (92e963f50fc7 Linux 4.5-rc1)
Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
Merging at91/at91-next (8129febb508f ARM: dts: at91: at91sam9n12ek: fix panel compatible string)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (5ec6f2cd8ec4 ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.)
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 (92e963f50fc7 Linux 4.5-rc1)
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 (5a2565fb7d09 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (84127e66ef4a Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (d56817ce2533 Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (2ccea21d797f ARM: qcom: Drop ARCH_MSM* configs)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (74eb2716fe71 Merge branches 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6', 'heads/dt-for-v4.6' and 'heads/soc-for-v4.6' into next)
Merging rockchip/for-next (b24b8204ad7d Merge branch 'v4.6-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (3a9cb5f4a9a7 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (06902a8895d5 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (025e08f78501 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (f4d92287583b arm64: Fix build with CONFIG_DEBUG_PAGEALLOC=n)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
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 (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
Merging m68knommu/for-next (9d4c9e5064d7 m68knommu: fix FEC platform device registration when driver is modular)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (a13d2abd8e61 MIPS: highmem: Turn flush_cache_kmaps into a no-op.)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (388f7b1d6e8c Linux 4.5-rc3)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (232f5dd78586 s390/oprofile: fix address range for asynchronous stack)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging btrfs-kdave/for-next (4c9aeec066dd Merge branch 'for-next-4.6-20160203' into for-next-20160203)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
Merging cifs/for-next (74c7b2af37ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (5a9530e498ed ocfs2: Implement get_next_id())
Merging ext4/dev (6df2762f3f76 ext4 crypto: move context consistency check to ext4_file_open())
Merging f2fs/dev (108daea1bd02 f2fs: increase i_size to avoid missing data)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (50ab8ec74a15 nfs: fix nfs_size_to_loff_t)
Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (6ebcc3fcdac1 Orangefs: added a couple of WARN_ONs, perhaps just temporarily.)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (63a1962bea7d Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
Merging hid/for-next (bc1db4af59b2 Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next)
Merging i2c/i2c/for-next (36f90b0a2ddd Linux 4.5-rc2)
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 (972d7d17b6bb hwmon: Add LTC2990 sensor driver)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (f6f756ddd65f Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (3d3cafda9a56 Merge branch 'for-4.6' into for-next)
Merging pm/linux-next (45bb976de29f Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
Merging thermal-soc/next (26716ce124fc thermal: allow u8500-thermal driver to be a module)
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (64509b4ad81c Merge branch 'topic/pl330' into next)
Merging net-next/master (aaa5672052cb sxgbe: remove unused code)
CONFLICT (content): Merge conflict in drivers/net/vxlan.c
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (6709d1f4ece5 netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers-next/master (11e70824e75f mwifiex: firmware dump support for w8997 chipset)
Merging bluetooth/master (9a6a1c77e1fc Bluetooth: Use managed version of led_trigger_register in LED trigger)
Merging mac80211-next/master (94106d26c380 mac80211: fix VHT MU-MIMO frame processing)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging l2-mtd/master (ed4eeba7338b driver/memory: Removal of deprecated NO_IRQ)
Merging crypto/master (f75516a81548 crypto: keys - Revert "convert public key to akcipher api")
Merging drm/drm-next (5443ce86fa37 drm: virtio-gpu: set atomic flag)
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (2417c8c03f50 drm/i915: fix error path in intel_setup_gmbus())
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (e24bfdd5052c apple-gmux: Fix build breakage if !CONFIG_ACPI)
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 (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (fa9a435debad Merge branch 'topic/hda-mst' into for-next)
Merging sound-asoc/for-next (00d2170519d9 Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (1261d013daea Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB)
Merging block/for-next (0124663be268 Merge branch 'for-4.6/drivers' into for-next)
Merging device-mapper/for-next (aa8c484be790 dm thin metadata: remove needless newline from subtree_dec() DMERR message)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (4e2918512024 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fc2561ec0afc md-cluster: delete useless code)
Merging mfd/for-mfd-next (84a6c45ae136 mfd: syscon: Make syscon_regmap_config const)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (18c4766e2e9f Merge remote-tracking branches 'regulator/topic/mt6397' and 'regulator/topic/qcom-saw' into regulator-next)
Merging security/next (388f7b1d6e8c Linux 4.5-rc3)
Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (388f7b1d6e8c Linux 4.5-rc3)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (5645a717c6ee Documentation: HOWTO: remove obsolete info about regression postings)
Merging trivial/for-next (e9bf1d57f0a0 drivers/rtc: broken link fix)
Applying: kernel/memremap.c: add new arg to dev_WARN
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (b8c15a91f1fe Merge branches 'dt/next' and 'dt/linus' into for-next)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (e908e75fc383 Merge remote-tracking branch 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (f864fe9a9259 Merge branch 'x86/mm')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (9bf4f0056720 EDAC: Use edac_debugfs_remove_recursive() in edac_debugfs_exit())
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
Merging kvm/linux-next (bce87cce88c7 KVM: x86: consolidate different ways to test for in-kernel LAPIC)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support)
Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (d6e022f1d207 workqueue: handle NUMA_NO_NODE for unbound pool_workqueue lookup)
Merging drivers-x86/for-next (9df7fc9a9657 toshiba_acpi: Add a module parameter to disable hotkeys registration)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (02ce716f8000 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/irq' into regmap-next)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (ee2e1c2d18a4 leds: leds-gpio: Fix return value check in create_gpio_led())
Merging ipmi/for-next (7f8df84ecba8 ipmi_si: Avoid a wrong long timeout on transaction done)
Merging driver-core/driver-core-next (67d02a1bbb33 driver-core: platform: probe of-devices only using list of compatibles)
Merging tty/tty-next (54573c4a073f xen/hvc: constify hv_ops structures)
CONFLICT (content): Merge conflict in drivers/tty/tty_io.c
Merging usb/usb-next (a44007a42dfd drivers: usb: removed assignment of 0 to static variables)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (92e963f50fc7 Linux 4.5-rc1)
Merging usb-chipidea-next/ci-for-usb-next (6b8bc9c6fb26 usb: chipidea: udc: remove unused value assignment)
Merging staging/staging-next (8c79c49c803d staging: iio: Remove parantheses around right hand side of assignment)
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
$ git rm -f drivers/staging/dgap/dgap.c
Merging char-misc/char-misc-next (990162f03840 char: nwbutton: avoid unused variable warning)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (9a2ddda572a0 Documentation: cgroup: Fix 'cgroup-legacy' -> 'cgroup-v1')
Merging scsi/for-next (1440a6835981 Merge branch 'misc' into for-next)
Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (45d1df700a55 Merge branch 'devel' into for-next)
Merging vhost/linux-next (481eaec37e91 tools/virtio: add ringtest utilities)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (8d68bb842800 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (7e0810c9485c clk: lpc32xx: add HCLK PLL output configuration)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (92e963f50fc7 Linux 4.5-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
Merging rtc/rtc-next (9d4be765c76d drivers: rtc: allow compilation of sun6i RTC for all sunxi SoCs)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
Merging akpm-current/current (234d02a19863 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (2c1975dd89fc drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* next-20160211 build: 1 failures 7 warnings (next-20160211)
From: Build bot for Mark Brown @ 2016-02-11 8:13 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160211
Git describe: next-20160211
Commit: 8c8d01f13c Add linux-next specific files for 20160211
Build Time: 74 min 20 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 11
Warnings: 7
Section Mismatches: 1
Failed defconfigs:
arm64-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 2 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-multi_v7_defconfig
5 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 11
1 ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
Warnings Summary: 7
3 ../drivers/gpu/drm/msm/msm_fbdev.c:65:21: warning: unused variable 'dev' [-Wunused-variable]
2 ../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
2 ../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Section Mismatch Summary: 1
2 WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 11 errors, 3 warnings, 2 section mismatches
Errors:
ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
Warnings:
../drivers/gpu/drm/msm/msm_fbdev.c:65:21: warning: unused variable 'dev' [-Wunused-variable]
../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
Section Mismatches:
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_fbdev.c:65:21: warning: unused variable 'dev' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_fbdev.c:65:21: warning: unused variable 'dev' [-Wunused-variable]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
^ permalink raw reply
* Re: next-20160208 perf build error "tests/bp_signal.c:106:47: error: declaration of ‘signal’ shadows a global declaration [-Werror=shadow]"
From: Arnaldo Carvalho de Melo @ 2016-02-11 22:21 UTC (permalink / raw)
To: Vinson Lee; +Cc: linux-next, Peter Zijlstra, Ingo Molnar, Wang Nan, Jiri Olsa
In-Reply-To: <CACKvgLFaZagkvRk1R2Xy0=UbWcfELgLxPbfjhRNZj-Rg4jSz4w@mail.gmail.com>
Em Mon, Feb 08, 2016 at 10:28:53AM -0800, Vinson Lee escreveu:
> Hi.
>
> I hit this perf build error with next-20160208 with GCC 4.6.
I try to test on a rhel6 vm from time to time, need to do it using
docker or something, thanks for the report, but can you please send a
proper patch, with a:
Fixes: 6a7d550e8b2e ("perf test: Check environment before start real BPF test")
Line, signed-off, etc?
Thanks,
- Arnaldo
> CC tests/bp_signal.o
> tests/bp_signal.c: In function ‘__event’:
> tests/bp_signal.c:106:47: error: declaration of ‘signal’ shadows a
> global declaration [-Werror=shadow]
> tests/bp_signal.c: In function ‘bp_event’:
> tests/bp_signal.c:144:37: error: declaration of ‘signal’ shadows a
> global declaration [-Werror=shadow]
> tests/bp_signal.c: In function ‘wp_event’:
> tests/bp_signal.c:149:37: error: declaration of ‘signal’ shadows a
> global declaration [-Werror=shadow]
>
> The build error is introduced with "perf test: Check environment
> before start real BPF test".
>
> commit 6a7d550e8b2eeb380ab85d9bc53571123b98345b
> Author: Wang Nan <wangnan0@huawei.com>
> Date: Mon Jan 25 09:55:53 2016 +0000
>
> perf test: Check environment before start real BPF test
>
> Copying perf to old kernel system results:
>
> # perf test bpf
> 37: Test BPF filter :
> 37.1: Test basic BPF filtering : FAILED!
> 37.2: Test BPF prologue generation : Skip
>
> However, in case when kernel doesn't support a test case it should
> return 'Skip', 'FAILED!' should be reserved for kernel tests for when
> the kernel supports a feature that then fails to work as advertised.
>
> This patch checks environment before real testcase.
>
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> Suggested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: He Kuang <hekuang@huawei.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Li Zefan <lizefan@huawei.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: pi3orama@163.com
> Link: http://lkml.kernel.org/r/1453715801-7732-7-git-send-email-wangnan0@huawei.com
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> Cheers,
> Vinson
^ permalink raw reply
* linux-next: manual merge of the kvm-arm tree with the arm64 tree
From: Stephen Rothwell @ 2016-02-12 2:26 UTC (permalink / raw)
To: Christoffer Dall, Marc Zyngier, Catalin Marinas
Cc: linux-next, linux-kernel, Ard Biesheuvel
Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm/kvm/arm.c
between commit:
6a26b548a2c4 ("arm64: kvm: deal with kernel symbols outside of linear mapping")
from the arm64 tree and commit:
aa0bf2030bca ("ARM: KVM: Remove __kvm_hyp_code_start/__kvm_hyp_code_end")
from the kvm-arm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/kvm/arm.c
index 975da6cfbf59,fcf6c130c986..000000000000
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@@ -982,9 -982,10 +982,10 @@@ static void cpu_init_hyp_mode(void *dum
pgd_ptr = kvm_mmu_get_httbr();
stack_page = __this_cpu_read(kvm_arm_hyp_stack_page);
hyp_stack_ptr = stack_page + PAGE_SIZE;
- vector_ptr = (unsigned long)__kvm_hyp_vector;
+ vector_ptr = (unsigned long)kvm_ksym_ref(__kvm_hyp_vector);
__cpu_init_hyp_mode(boot_pgd_ptr, pgd_ptr, hyp_stack_ptr, vector_ptr);
+ __cpu_init_stage2();
kvm_arm_init_debug();
}
@@@ -1074,8 -1075,7 +1075,8 @@@ static int init_hyp_mode(void
/*
* Map the Hyp-code called directly from the host
*/
- err = create_hyp_mappings(kvm_ksym_ref(__kvm_hyp_code_start),
- kvm_ksym_ref(__kvm_hyp_code_end));
- err = create_hyp_mappings(__hyp_text_start, __hyp_text_end);
++ err = create_hyp_mappings(kvm_ksym_ref(__hyp_text_start),
++ kvm_ksym_ref(__hyp_text_end));
if (err) {
kvm_err("Cannot map world-switch code\n");
goto out_free_mappings;
^ permalink raw reply
* linux-next: Tree for Feb 12
From: Stephen Rothwell @ 2016-02-12 5:20 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160211:
The kvm-arm tree gained a conflict against the arm64 tree.
The aio tree still had a build failure so I used the version from
next-20160111.
Non-merge commits (relative to Linus' tree): 4277
3754 files changed, 149171 insertions(+), 67859 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 239 trees (counting Linus' and 36 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 (c05235d50f68 Merge tag 'gpio-v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (e972c37459c8 ARM: 8519/1: ICST: try other dividends than 1)
Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (0fe53e8d335b powerpc/powernv: Fix stale PE primary bus)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (a1b14d27ed09 bpf: fix branch offset adjustment on backjumps after patching ctx expansion)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (b16c29191dc8 netfilter: nf_conntrack: use safer way to lock all buckets)
Merging wireless-drivers/master (d76d65fd2695 rtlwifi: fix broken VHT support)
Merging mac80211/master (212c5a5e6ba6 mac80211: minstrel: Change expected throughput unit back to Kbps)
Merging sound-current/for-linus (397da2d0ab0d Merge branch 'topic/core-fixes' into for-linus)
Merging pci-current/for-linus (0cf1337e0b83 PCI: rcar: Add device tree support for r8a7793)
Merging driver-core.current/driver-core-linus (00cd29b799e3 klist: fix starting point removed bug in klist iterators)
Merging tty.current/tty-linus (c8053b587627 Revert "8250: uniphier: allow modular build with 8250 console")
Merging usb.current/usb-linus (89140fdaf11a xhci: harden xhci_find_next_ext_cap against device removal)
Merging usb-gadget-fixes/fixes (6a4290cc28be usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.)
Merging usb-serial-fixes/usb-linus (4152b387da81 USB: option: fix Cinterion AHxx enumeration)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (388f7b1d6e8c Linux 4.5-rc3)
Merging char-misc.current/char-misc-linus (3b2b9ead3214 nvmem: qfprom: Specify LE device endianness)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
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 (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
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 (ed3f9fd1e865 drm/i915: fix error path in intel_setup_gmbus())
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (dec2b2849cfc ARCv2: intc: Allow interruption by lowest priority interrupt)
Merging arm/for-next (9bf9dc709377 Merge branches 'component', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (92e963f50fc7 Linux 4.5-rc1)
Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
Merging at91/at91-next (8129febb508f ARM: dts: at91: at91sam9n12ek: fix panel compatible string)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (5ec6f2cd8ec4 ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.)
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 (92e963f50fc7 Linux 4.5-rc1)
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 (5a2565fb7d09 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (84127e66ef4a Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (60587828504a Merge branch 'omap-for-v4.5/fixes' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (2ccea21d797f ARM: qcom: Drop ARCH_MSM* configs)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (74eb2716fe71 Merge branches 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6', 'heads/dt-for-v4.6' and 'heads/soc-for-v4.6' into next)
Merging rockchip/for-next (b24b8204ad7d Merge branch 'v4.6-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (3a9cb5f4a9a7 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (06902a8895d5 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (025e08f78501 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (f4d92287583b arm64: Fix build with CONFIG_DEBUG_PAGEALLOC=n)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
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 (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
Merging m68knommu/for-next (9d4c9e5064d7 m68knommu: fix FEC platform device registration when driver is modular)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (a13d2abd8e61 MIPS: highmem: Turn flush_cache_kmaps into a no-op.)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (388f7b1d6e8c Linux 4.5-rc3)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (232f5dd78586 s390/oprofile: fix address range for asynchronous stack)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging btrfs-kdave/for-next (4c9aeec066dd Merge branch 'for-next-4.6-20160203' into for-next-20160203)
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
Merging cifs/for-next (4b550af51985 cifs: fix erroneous return value)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (5a9530e498ed ocfs2: Implement get_next_id())
Merging ext4/dev (6df2762f3f76 ext4 crypto: move context consistency check to ext4_file_open())
Merging f2fs/dev (108daea1bd02 f2fs: increase i_size to avoid missing data)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (50ab8ec74a15 nfs: fix nfs_size_to_loff_t)
Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (6ebcc3fcdac1 Orangefs: added a couple of WARN_ONs, perhaps just temporarily.)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (63a1962bea7d Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
Merging hid/for-next (bc1db4af59b2 Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next)
Merging i2c/i2c/for-next (36f90b0a2ddd Linux 4.5-rc2)
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 (972d7d17b6bb hwmon: Add LTC2990 sensor driver)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (f6f756ddd65f Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (a2127e400edd libata: support AHCI on OCTEON platform)
Merging pm/linux-next (8341b3b9805c Merge branch 'pm-sleep' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
Merging thermal-soc/next (a53b8394ec3c thermal: cpu_cooling: fix out of bounds access in time_in_idle)
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (8e2a101d7199 Merge branch 'topic/sh' into next)
Merging net-next/master (3134b9f019f2 Merge branch 'net-mitigate-kmem_free-slowpath')
CONFLICT (content): Merge conflict in drivers/net/vxlan.c
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (6709d1f4ece5 netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers-next/master (11e70824e75f mwifiex: firmware dump support for w8997 chipset)
Merging bluetooth/master (9a6a1c77e1fc Bluetooth: Use managed version of led_trigger_register in LED trigger)
Merging mac80211-next/master (94106d26c380 mac80211: fix VHT MU-MIMO frame processing)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging l2-mtd/master (ed4eeba7338b driver/memory: Removal of deprecated NO_IRQ)
Merging crypto/master (f75516a81548 crypto: keys - Revert "convert public key to akcipher api")
Merging drm/drm-next (5443ce86fa37 drm: virtio-gpu: set atomic flag)
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (ebb7c78d358b agp/intel-gtt: Only register fake agp driver for gen1)
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (382ab95d1af8 drm/msm: remove unused variable)
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 (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (fa9a435debad Merge branch 'topic/hda-mst' into for-next)
Merging sound-asoc/for-next (00d2170519d9 Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (1261d013daea Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB)
Merging block/for-next (628fb08cada8 Merge branch 'for-4.6/core' into for-next)
Merging device-mapper/for-next (aa8c484be790 dm thin metadata: remove needless newline from subtree_dec() DMERR message)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (7b5c15921f7c Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fc2561ec0afc md-cluster: delete useless code)
Merging mfd/for-mfd-next (d6c2c8325184 mfd: tps65090: Set regmap config reg counts properly)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (18c4766e2e9f Merge remote-tracking branches 'regulator/topic/mt6397' and 'regulator/topic/qcom-saw' into regulator-next)
Merging security/next (388f7b1d6e8c Linux 4.5-rc3)
Merging integrity/next (70ded691640f ima: use "ima_hooks" enum as function argument)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (388f7b1d6e8c Linux 4.5-rc3)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (5645a717c6ee Documentation: HOWTO: remove obsolete info about regression postings)
Merging trivial/for-next (e9bf1d57f0a0 drivers/rtc: broken link fix)
Applying: kernel/memremap.c: add new arg to dev_WARN
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (b8c15a91f1fe Merge branches 'dt/next' and 'dt/linus' into for-next)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (e908e75fc383 Merge remote-tracking branch 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (f864fe9a9259 Merge branch 'x86/mm')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
Merging kvm/linux-next (bce87cce88c7 KVM: x86: consolidate different ways to test for in-kernel LAPIC)
Merging kvm-arm/next (eb023ade6b71 ARM: KVM: Remove __kvm_hyp_exit/__kvm_hyp_exit_end)
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support)
Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (d6e022f1d207 workqueue: handle NUMA_NO_NODE for unbound pool_workqueue lookup)
Merging drivers-x86/for-next (b0c141b8f86b dell-led: use dell_smbios_send_request() for performing SMBIOS calls)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (02ce716f8000 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/irq' into regmap-next)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (ee2e1c2d18a4 leds: leds-gpio: Fix return value check in create_gpio_led())
Merging ipmi/for-next (7f8df84ecba8 ipmi_si: Avoid a wrong long timeout on transaction done)
Merging driver-core/driver-core-next (67d02a1bbb33 driver-core: platform: probe of-devices only using list of compatibles)
Merging tty/tty-next (54573c4a073f xen/hvc: constify hv_ops structures)
CONFLICT (content): Merge conflict in drivers/tty/tty_io.c
Merging usb/usb-next (a44007a42dfd drivers: usb: removed assignment of 0 to static variables)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (92e963f50fc7 Linux 4.5-rc1)
Merging usb-chipidea-next/ci-for-usb-next (6b8bc9c6fb26 usb: chipidea: udc: remove unused value assignment)
Merging staging/staging-next (8c79c49c803d staging: iio: Remove parantheses around right hand side of assignment)
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
$ git rm -f drivers/staging/dgap/dgap.c
Merging char-misc/char-misc-next (990162f03840 char: nwbutton: avoid unused variable warning)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (9a2ddda572a0 Documentation: cgroup: Fix 'cgroup-legacy' -> 'cgroup-v1')
Merging scsi/for-next (1440a6835981 Merge branch 'misc' into for-next)
Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (b4f51b6f4513 Merge branch 'devel' into for-next)
Merging vhost/linux-next (481eaec37e91 tools/virtio: add ringtest utilities)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (8d68bb842800 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (7208d1d9c568 clk: qcom: mmcc8974: Use gdscs .parent and remove genpd calls)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (92e963f50fc7 Linux 4.5-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
Merging rtc/rtc-next (9d4be765c76d drivers: rtc: allow compilation of sun6i RTC for all sunxi SoCs)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
Merging akpm-current/current (234d02a19863 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (6ac38be8b824 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: linux-next: Tree for Feb 12
From: Sudip Mukherjee @ 2016-02-12 6:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160212162035.1e0260cd@canb.auug.org.au>
On Fri, Feb 12, 2016 at 04:20:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160211:
since last few days with gcc-4.6.3, x86_64 and i386 defconfig and
allmodconfig builds are failing with the error:
"arch/x86/include/asm/tlbflush.h:26:18: error: memory input 0 is not
directly addressable"
But with gcc-4.8.2 and later it builds fine. Should I try to bisect and
find the problem or its not worth for gcc-4.6.3 ?
regards
sudip
^ permalink raw reply
* next-20160212 build: 2 failures 13 warnings (next-20160212)
From: Build bot for Mark Brown @ 2016-02-12 8:13 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160212
Git describe: next-20160212
Commit: 64d9a3617b Add linux-next specific files for 20160212
Build Time: 74 min 37 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 11
Warnings: 13
Section Mismatches: 1
Failed defconfigs:
arm64-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 2 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-multi_v7_defconfig
7 warnings 0 mismatches : arm-allmodconfig
6 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 11
1 ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
1 ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
Warnings Summary: 13
2 ../net/ipv4/igmp.c:1665:14: warning: unused variable 'net' [-Wunused-variable]
2 ../net/ipv4/igmp.c:1646:14: warning: unused variable 'net' [-Wunused-variable]
2 ../net/ipv4/igmp.c:1319:14: warning: unused variable 'net' [-Wunused-variable]
2 ../net/ipv4/igmp.c:1227:14: warning: unused variable 'net' [-Wunused-variable]
2 ../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
2 ../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../include/asm-generic/div64.h:224:22: warning: passing argument 1 of '__div64_32' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/asm-generic/div64.h:220:25: warning: right shift count >= width of type [-Wshift-count-overflow]
1 ../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
Section Mismatch Summary: 1
2 WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 11 errors, 2 warnings, 2 section mismatches
Errors:
ERROR: "msi_create_irq_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_mask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "free_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_alloc_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "of_msi_get_domain" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_eoi_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_set_affinity" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_get_domain_info" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "msi_domain_free_irqs" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "alloc_msi_entry" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
ERROR: "irq_chip_unmask_parent" [drivers/staging/fsl-mc/bus/mc-bus-driver.ko] undefined!
Warnings:
../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
Section Mismatches:
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
WARNING: drivers/staging/fsl-mc/bus/mc-bus-driver.o(.init.text+0x198): Section mismatch in reference from the function init_module() to the function .exit.text:fsl_mc_allocator_driver_exit()
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../net/ipv4/igmp.c:1227:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1319:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1646:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1665:14: warning: unused variable 'net' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../include/asm-generic/div64.h:207:28: warning: comparison of distinct pointer types lacks a cast
../include/asm-generic/div64.h:220:25: warning: right shift count >= width of type [-Wshift-count-overflow]
../include/asm-generic/div64.h:224:22: warning: passing argument 1 of '__div64_32' from incompatible pointer type [-Wincompatible-pointer-types]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../net/ipv4/igmp.c:1227:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1319:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1646:14: warning: unused variable 'net' [-Wunused-variable]
../net/ipv4/igmp.c:1665:14: warning: unused variable 'net' [-Wunused-variable]
../drivers/spi/spi.c:2279:9: warning: format '%i' expects argument of type 'int', but argument 4 has type 'size_t {aka long unsigned int}' [-Wformat=]
../include/linux/kernel.h:754:17: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Feb 12
From: Sudip Mukherjee @ 2016-02-12 14:27 UTC (permalink / raw)
To: Kees Cook, Ard Biesheuvel, Russell King
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Stephen Rothwell,
kernel-testers-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20160212162035.1e0260cd-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
On Fri, Feb 12, 2016 at 04:20:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160211:
arm lpc18xx_defconfig build fails with the error:
./arch/arm/kernel/vmlinux.lds:702: undefined symbol `SECTION_SHIFT'
referenced in expression
bisect leads to:
64ac2e74f0b2 ("ARM: 8502/1: mm: mark section-aligned portion of rodata NX")
reverting that patch fixed the build.
build log at:
https://travis-ci.org/sudipm-mukherjee/parport/jobs/108716281
regards
sudip
^ 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