* Re: next-20160225 build: 2 failures 44 warnings (next-20160225)
From: Thomas Petazzoni @ 2016-02-26 8:08 UTC (permalink / raw)
To: Mark Brown
Cc: Gregory CLEMENT, Olof Johansson, Arnd Bergmann,
kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel,
Bjorn Helgaas
In-Reply-To: <20160226030411.GK18327@sirena.org.uk>
Mark,
On Fri, 26 Feb 2016 12:04:11 +0900, Mark Brown wrote:
> Today's -next fails to build an arm64 allmodconfig due to:
>
> > arm64-allmodconfig
> > ../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
> > ../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
> > ../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
> > ../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
> > ../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
>
> caused by b4f596b19624 (arm64: add mvebu architecture entry) which
> enables MVBEU on arm64, the commit was present for a little while and
> the error cropped up but didn't get reported due to other things masking
> it. This looks like the driver needs modernization and probably ought
> to have a !ARM64 dependency for now.
This has already been fixed by:
[PATCH] PCI: mvebu: Restrict build to 32-bit ARM
submitted by Thierry Redding. I'm Cc'ing Bjorn, who is the one in
charge of merging this fix.
Thanks for reporting!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply
* Re: kernel panic on next-20160225
From: Sergey Senozhatsky @ 2016-02-26 8:05 UTC (permalink / raw)
To: Junxiao Bi
Cc: linux-next, ocfs2-devel@oss.oracle.com, Devel FS Linux,
Linux Kernel mailing list
In-Reply-To: <56CFF19E.4010003@oracle.com>
On (02/26/16 14:33), Junxiao Bi wrote:
> Hi,
>
> The following panic is triggered when run ocfs2 xattr test on
> linux-next-20160225. Did anybody ever see this?
>
perhaps "fs: NULL deref in atime_needs_update"
http://marc.info/?i=CACT4Y+ae=DQjrTtwSqm1PJ9rsnRAvKiBkRjBqaQH6f6W1dOh2Q@mail.gmail.com
-ss
^ permalink raw reply
* Re: next-20160225 build: 2 failures 44 warnings (next-20160225)
From: Guenter Roeck @ 2016-02-26 7:41 UTC (permalink / raw)
To: Mark Brown, Gregory CLEMENT, Thomas Petazzoni, Olof Johansson,
Arnd Bergmann, Wim Van Sebroeck
Cc: kernel-build-reports-cunTk1MwBs8s++Sfvej+rw,
linaro-kernel-cunTk1MwBs8s++Sfvej+rw,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20160226030949.GL18327-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
Hi Mark,
On 02/25/2016 07:09 PM, Mark Brown wrote:
> On Thu, Feb 25, 2016 at 10:04:29AM +0000, Build bot for Mark Brown wrote:
>
> Today's -next fails to build an arm64 allmodconfig due to:
>
>> arm64-allmodconfig
>> ../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
>
> also caused by b4f596b19624 (arm64: add mvebu architecture entry) which
> enables MVBEU on arm64, the commit was present for a little while and
> the error cropped up but didn't get reported due to other things masking
> it. atomic_io_modify() is only available on ARM, I'm unsure if this
> needs a driver change or if the driver is just specific to older
> hardware anyway. The code is only used in the init path accessing what
> look to be device specific registers so I'm not 100% clear why it
> specifically needs to be an atomic modify.
>
Thierry already submitted a patch yesterday to restrict the driver to only
build on ARM. We can revisit if/when the driver is needed on ARM64.
Guenter
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* linux-next: Tree for Feb 26
From: Stephen Rothwell @ 2016-02-26 6:37 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160225:
The sunxi tree gained conflicts against Linus' and the arm-soc trees.
The net-next tree gained a conflict against the net tree.
The tip tree gained conflicts against the arm64 tree.
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 tip tree and I
applied another fix patch. It also gained another build failure for
which I applied another fix patch.
Non-merge commits (relative to Linus' tree): 7266
5926 files changed, 270491 insertions(+), 129316 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 (6dc390ad61ac Merge tag 'arc-4.5-rc6-fixes-upd' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc)
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 (9ef2d8be5565 arc: SMP: CONFIG_ARC_IPI_DBG cleanup)
Merging arm-current/fixes (c7edd7f99cda ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs)
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 (9ab3ac233a8b powerpc/mm/hash: Clear the invalid slot information correctly)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (ee50c130c821 net: jme: fix suspend/resume on JMC260)
Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation)
Merging ipvs/master (5acaf89f88b9 netfilter: ipvs: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers/master (c699404db182 Merge tag 'iwlwifi-for-kalle-2016-02-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b86071528f32 cfg80211: stop critical protocol session upon disconnect event)
Merging sound-current/for-linus (2ae955774f29 ALSA: hda - Fixup speaker pass-through control for nid 0x14 on ALC225)
Merging pci-current/for-linus (0a61cb947a5a Merge branch 'pci/host-hv' into for-linus)
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (428b315a2475 Merge tag 'fixes-for-v4.5-rc6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (d061c1caa31d USB: option: add "4G LTE usb-modem U901")
Merging usb-chipidea-fixes/ci-for-usb-stable (8c0614ca312c usb: chipidea: fix return value check in ci_hdrc_pci_probe())
Merging staging.current/staging-linus (7a64cd887fdb drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE)
Merging char-misc.current/char-misc-linus (18558cae0272 Linux 4.5-rc4)
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 (9b18572e83bf drm/i915/gen9: Verify and enforce dc6 state writes)
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (e75daf55992d ARC: clockevent: Prepare for DT based probe)
Merging arm/for-next (113b44c6c25b Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (94085fe570e7 arm64: dts: Add Cavium ThunderX specific PMU)
Merging arm-soc/for-next (4455d3de7d77 ARM: SoC: document merges)
Merging at91/at91-next (799da647446d Merge tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to 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 (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
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 (655f2d0d2295 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (601052bca473 Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (5b19b3012f3b ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (fd5c290b7efd Merge branches 'heads/sh-drivers-fixes-for-v4.5', 'heads/arm64-defconfig-for-v4.6', 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6' and 'heads/dt-for-v4.6' into next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging rockchip/for-next (2def4fc4fc2d Merge branch 'v4.6-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (341080b4d9b4 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging tegra/for-next (6af0a1cda782 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (cac4b8cdf5a2 arm64: Fix building error with 16KB pages and 36-bit VA)
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 (0cdfea013ee8 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 (606aab63d453 Merge branch '4.5-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (c3ab300ea555 powerpc: Add POWER9 cputable entry)
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 (993e0681084c s390/oprofile: add z13/z13s model numbers)
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 (b7364eb223db Merge branch 'for-next-4.6-20160225' into for-next-20160225)
Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings)
Merging cifs/for-next (6dc390ad61ac Merge tag 'arc-4.5-rc6-fixes-upd' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc)
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 (6332b9b5e797 ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes)
Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling)
Merging f2fs/dev (362977b0dbc6 f2fs crypto: sync ext4_lookup and ext4_file_open)
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 (a63be4e6d0e9 GFS2: Eliminate parameter non_block on gfs2_inode_lookup)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (9fd4b9fc7695 NFSv4.x/pnfs: Fix a race between layoutget and bulk recalls)
Merging nfsd/nfsd-next (b7052cd7bcf3 sunrpc/cache: fix off-by-one in qword_get())
Merging orangefs/for-next (c1223ca48baa orangefs: get rid of op refcounts)
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 (e15c65b38461 Merge branch 'xfs-writepage-rework-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)
CONFLICT (content): Merge conflict in drivers/pci/probe.c
Merging hid/for-next (c2781579ce25 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (33f5ccc343b7 i2c: piix4: Pre-shift the port number)
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 (e1370715b20e ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (c2fd1465f329 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (8490bda29ad1 Merge branch 'for-4.5-fixes' into for-next)
Merging pm/linux-next (154b7d22e480 Merge branch 'acpica' 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 (eb4fc33eb268 thermal: small style cleanup in mtk_thermal)
Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (7a02d9b6888e Merge branch 'topic/omap' into next)
Merging net-next/master (619b17452a38 tipc: fix null deref crash in compat config path)
CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (0a44b22009d5 rtlwifi: rtl8821ae: Convert driver to use common 5G channel table)
Merging bluetooth/master (395174bb07c1 Bluetooth: hci_uart: Add Intel/AG6xx support)
Merging mac80211-next/master (b573213927c5 rfkill: Notify userspace of airplane-mode state changes)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
Merging mtd/master (44248affb5d8 MAINTAINERS: add maintainer entry for FREESCALE GPMI NAND driver)
Merging l2-mtd/master (46f0ba976663 mtd: brcmnand: Fix v7.1 register offsets)
Merging crypto/master (49abc0d2e19b crypto: xts - fix compile errors)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging drm/drm-next (0041ee4d3642 Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (032b612e055e drm/i915: Remove update_sprite_watermarks.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (a6ddd2f1b99f drm/udl: Use module_usb_driver)
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 (3932f008e3eb drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.)
Merging sound/for-next (956dea9e9112 ALSA: oxfw: discontinue MIDI substream for scs1x at transaction failure)
Merging sound-asoc/for-next (7135909be57e Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (6ccb1d8f78bd Input: add MELFAS MIP4 Touchscreen driver)
Merging block/for-next (ab3d8b3ecf77 Merge branch 'for-4.6/core' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging device-mapper/for-next (01dd954e0fd8 dm: drop unnecessary assignment of md->queue)
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 (af3d6866825f mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (93ac96deff4c md: Drop sending a change uevent when stopping)
Merging mfd/for-mfd-next (103d8a7bb8a2 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 (5c0e09e03fb5 power: act8945a: add charger driver for ACT8945A)
Merging omap_dss2/for-next (f059c4b220b8 fbdev: exynos: fix IS_ERR_VALUE usage)
Merging regulator/for-next (3c030f0deff7 Merge remote-tracking branch 'regulator/topic/vexpress' into regulator-next)
Merging security/next (602094428090 Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (a13b64591747 vfio/pci: Expose shadow ROM as PCI option ROM)
Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk)
Merging trivial/for-next (d00cd819d7df 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 (6338b8a12d0a Merge branches 'dt/linus' and 'dt/next' into for-next)
Merging mailbox/mailbox-for-next (be9c09bcca03 arm64: dts: mailbox device tree node for APM X-Gene platform.)
Merging spi/for-next (4483631212ee Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (9d102a2e2002 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/efistub.h
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
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 (95d4f352d268 Merge branch 'irqchip/mvebu' 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 (2863b4e3dd92 Merge branches 'doc.2015.02.23a', 'fixes.2015.02.23a' and 'torture.2015.02.23a' into HEAD)
Merging kvm/linux-next (433da86023f8 KVM: async_pf: use list_first_entry)
Merging kvm-arm/next (67aaab4cff18 arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp)
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
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 (d3695aa4f452 KVM: PPC: Add support for multiple-TCE hcalls)
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 (23217b443b4b workqueue: Replace usage of init_name with dev_set_name())
Merging drivers-x86/for-next (2d905b3e74ad intel-hid: allocate correct amount of memory for private struct)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (10c43341ac84 Merge remote-tracking branches 'regmap/topic/doc', 'regmap/topic/irq', 'regmap/topic/stride' and 'regmap/topic/update-bits' into regmap-next)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (94b0580b6768 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
Merging usb/usb-next (a057c3259ab6 usb: dwc2: USB_DWC2 should depend on HAS_DMA)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (18558cae0272 Linux 4.5-rc4)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (c4e315884ed8 staging: lustre: Remove LASSERTS from router checker)
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
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.
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (35bf7692e765 mei: fix format string in debug prints)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (468de7d80707 Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (3f84575f934a 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 (683072c71ff1 Merge branch 'devel' into for-next)
Merging vhost/linux-next (b91608c87c59 vring: Use the DMA API on Xen)
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 (531dd08c87bd Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
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 (0cbb0b92689a Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (023bd7166be0 clk: skip unnecessary set_phase if nothing to do)
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 (3d6dee7af7fe Makefile: add kselftest-merge)
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 (4c5e6154516b Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (ef1654006c2f rtc: pic32: Add PIC32 real time clock driver)
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 (c27b54512f75 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/mprotect.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Applying: mm: cleanup *pte_alloc* interfaces fix
Applying: mm: cleanup *pte_alloc* interfaces fix 2
Applying: signals, pkeys: make si_pkey 32 bits for now
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: net/sched/sch_mqprio.c: fix build with older gcc
Merging akpm/master (8404c72206cb net/sched/sch_mqprio.c: fix build with older gcc)
^ permalink raw reply
* kernel panic on next-20160225
From: Junxiao Bi @ 2016-02-26 6:33 UTC (permalink / raw)
To: linux-next, ocfs2-devel@oss.oracle.com, Devel FS Linux,
Linux Kernel mailing list
Hi,
The following panic is triggered when run ocfs2 xattr test on
linux-next-20160225. Did anybody ever see this?
[ 254.604228] BUG: unable to handle kernel paging request at
00000002000800c0
[ 254.605013] IP: [<ffffffff81192978>] kmem_cache_alloc+0x78/0x160
[ 254.605013] PGD 7bbe5067 PUD 0
[ 254.605013] Oops: 0000 [#1] SMP
[ 254.605013] Modules linked in: ocfs2_dlmfs ocfs2_stack_o2cb ocfs2_dlm
ocfs2_nodemanager ocfs2_stackglue iscsi_tcp libiscsi_tcp libiscsi
scsi_transport_iscsi xen_kbdfront xen_netfront xen_fbfront xen_blkfront
[ 254.605013] CPU: 2 PID: 4044 Comm: mpirun Not tainted
4.5.0-rc5-next-20160225 #1
[ 254.605013] Hardware name: Xen HVM domU, BIOS 4.3.1OVM 05/14/2014
[ 254.605013] task: ffff88007a521a80 ti: ffff88007aed0000 task.ti:
ffff88007aed0000
[ 254.605013] RIP: 0010:[<ffffffff81192978>] [<ffffffff81192978>]
kmem_cache_alloc+0x78/0x160
[ 254.605013] RSP: 0018:ffff88007aed3a48 EFLAGS: 00010282
[ 254.605013] RAX: 0000000000000000 RBX: 0000000000000000 RCX:
0000000000001991
[ 254.605013] RDX: 0000000000001990 RSI: 00000000024000c0 RDI:
000000000001b330
[ 254.605013] RBP: ffff88007aed3a98 R08: ffff88007d29b330 R09:
00000002000800c0
[ 254.605013] R10: 0000000c51376d87 R11: ffff8800792cac38 R12:
ffff88007cc30f00
[ 254.605013] R13: 00000000024000c0 R14: ffffffff811b053f R15:
ffff88007aed3ce7
[ 254.605013] FS: 0000000000000000(0000) GS:ffff88007d280000(0000)
knlGS:0000000000000000
[ 254.605013] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 254.605013] CR2: 00000002000800c0 CR3: 000000007aeb2000 CR4:
00000000000406e0
[ 254.605013] Stack:
[ 254.605013] 0000000013082000 ffff88007aed3d28 0000007900000000
0000000000000001
[ 254.605013] 2f2f2f2f00000000 ffff8800792cac00 ffff88007aed3d38
0000000000000101
[ 254.605013] ffff88007a5e2000 ffff88007aed3ce7 ffff88007aed3b08
ffffffff811b053f
[ 254.605013] Call Trace:
[ 254.605013] [<ffffffff811b053f>] __d_alloc+0x2f/0x1a0
[ 254.605013] [<ffffffff811a58f2>] ? unlazy_walk+0xe2/0x160
[ 254.605013] [<ffffffff811b1c67>] d_alloc+0x17/0x80
[ 254.605013] [<ffffffff811a5b0a>] lookup_dcache+0x8a/0xc0
[ 254.605013] [<ffffffff81143e63>] ? __alloc_pages_nodemask+0x173/0xeb0
[ 254.605013] [<ffffffff811aa523>] path_openat+0x3c3/0x1210
[ 254.605013] [<ffffffff81354eb3>] ? radix_tree_lookup_slot+0x13/0x30
[ 254.605013] [<ffffffff81139002>] ? find_get_entry+0x32/0xc0
[ 254.605013] [<ffffffff811b4065>] ? atime_needs_update+0x55/0xe0
[ 254.605013] [<ffffffff8113b7a1>] ? filemap_fault+0xd1/0x4b0
[ 254.605013] [<ffffffff81168296>] ? do_set_pte+0xb6/0x140
[ 254.605013] [<ffffffff811ab3f0>] do_filp_open+0x80/0xe0
[ 254.605013] [<ffffffff811b7c48>] ? __alloc_fd+0x48/0x1a0
[ 254.605013] [<ffffffff811a60aa>] ? getname_flags+0x7a/0x1e0
[ 254.605013] [<ffffffff8119a2d0>] do_sys_open+0x110/0x200
[ 254.605013] [<ffffffff8119a3f9>] SyS_open+0x19/0x20
[ 254.605013] [<ffffffff81003ec2>] do_syscall_64+0x72/0x230
[ 254.605013] [<ffffffff8105fc37>] ? __do_page_fault+0x177/0x430
[ 254.605013] [<ffffffff8193bc61>] entry_SYSCALL64_slow_path+0x25/0x25
[ 254.605013] Code: 05 e6 77 e7 7e 4d 8b 08 49 8b 40 10 4d 85 c9 0f 84
dd 00 00 00 48 85 c0 0f 84 d4 00 00 00 49 63 44 24 20 49 8b 3c 24 48 8d
4a 01 <49> 8b 1c 01 4c 89 c8 65 48 0f c7 0f 0f 94 c0 3c 01 75 b6 49 63
[ 254.605013] RIP [<ffffffff81192978>] kmem_cache_alloc+0x78/0x160
[ 254.605013] RSP <ffff88007aed3a48>
[ 254.605013] CR2: 00000002000800c0
[ 254.792273] ---[ end trace 823969e602e4aaac ]---
Thanks,
Junxiao.
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-02-26 5:44 UTC (permalink / raw)
To: Andrew Morton, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Helge Deller, Dave Hansen
Hi all,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from /home/sfr/next/next/include/linux/linkage.h:4:0,
from /home/sfr/next/next/arch/arm/include/asm/bug.h:4,
from /home/sfr/next/next/include/linux/bug.h:4,
from /home/sfr/next/next/include/linux/mmdebug.h:4,
from /home/sfr/next/next/include/linux/gfp.h:4,
from /home/sfr/next/next/include/linux/slab.h:14,
from /home/sfr/next/next/kernel/signal.c:13:
/home/sfr/next/next/kernel/signal.c: In function 'signals_init':
/home/sfr/next/next/include/linux/compiler.h:506:38: error: call to '__compiletime_assert_3610' declared with attribute error: BUILD_BUG_ON failed: __ARCH_SI_PREAMBLE_SIZE != offsetof(struct siginfo, _sifields._pad)
Caused by commit
21c0826ab237 ("kernel/signal.c: add compile-time check for __ARCH_SI_PREAMBLE_SIZE")
interacting with commit
cd0ea35ff551 ("signals, pkeys: Notify userspace about protection key faults")
from the tip tree.
The addition of the "u64 _pkey" has presumably changed the alignment of
the enclosing union on (some) 32 bit platforms and so added padding
after the si_code field. This is a user API issue. :-(
[As an aside, I am pretty sure that we should not be using "u64" in a
uapi header in any case.]
I have added the following patch for today (and will add it to the tip
tree merge from Monday unless some other fix comes along).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Feb 2016 16:31:36 +1100
Subject: [PATCH] signals, pkeys: make si_pkey 32 bits for now
to prevent a change of alignment in the siginfo structure
Fixes: cd0ea35ff551 ("signals, pkeys: Notify userspace about protection key faults")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/ia64/include/uapi/asm/siginfo.h | 2 +-
arch/mips/include/uapi/asm/siginfo.h | 2 +-
include/uapi/asm-generic/siginfo.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
index 0151cfab929d..0c660bbccd3f 100644
--- a/arch/ia64/include/uapi/asm/siginfo.h
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -70,7 +70,7 @@ typedef struct siginfo {
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
- u64 _pkey;
+ int _pkey;
};
} _sigfault;
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
index 6f4edf0d794c..d2adebc0023d 100644
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -93,7 +93,7 @@ typedef struct siginfo {
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
- u64 _pkey;
+ int _pkey;
};
} _sigfault;
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index 90384d55225b..0f23ec63c291 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -98,7 +98,7 @@ typedef struct siginfo {
void __user *_upper;
} _addr_bnd;
/* used when si_code=SEGV_PKUERR */
- u64 _pkey;
+ int _pkey;
};
} _sigfault;
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the akpm-current tree with the tip tree
From: Stephen Rothwell @ 2016-02-26 5:07 UTC (permalink / raw)
To: Andrew Morton, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Dave Hansen, Piotr Kwapulinski
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/mprotect.c
between commit:
62b5f7d013fc ("mm/core, x86/mm/pkeys: Add execute-only protection keys support")
from the tip tree and commit:
aff3915ff831 ("mm/mprotect.c: don't imply PROT_EXEC on non-exec fs")
from the akpm-current tree.
I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell
diff --cc mm/mprotect.c
index fa37c4cd973a,6ff5dfa65b33..000000000000
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@@ -414,7 -409,11 +411,11 @@@ SYSCALL_DEFINE3(mprotect, unsigned long
/* Here we know that vma->vm_start <= nstart < vma->vm_end. */
+ /* Does the application expect PROT_READ to imply PROT_EXEC */
+ if (rier && (vma->vm_flags & VM_MAYEXEC))
+ prot |= PROT_EXEC;
+
- newflags = calc_vm_prot_bits(prot);
+ newflags = calc_vm_prot_bits(prot, pkey);
newflags |= (vma->vm_flags & ~(VM_READ | VM_WRITE | VM_EXEC));
/* newflags >> 4 shift VM_MAY% in place of VM_% */
^ permalink raw reply
* Re: next-20160225 build: 2 failures 44 warnings (next-20160225)
From: Mark Brown @ 2016-02-26 3:09 UTC (permalink / raw)
To: Gregory CLEMENT, Thomas Petazzoni, Olof Johansson, Arnd Bergmann,
Wim Van Sebroeck, Guenter Roeck
Cc: kernel-build-reports-cunTk1MwBs8s++Sfvej+rw,
linaro-kernel-cunTk1MwBs8s++Sfvej+rw,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <E1aYsmb-0006qb-76@optimist>
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
On Thu, Feb 25, 2016 at 10:04:29AM +0000, Build bot for Mark Brown wrote:
Today's -next fails to build an arm64 allmodconfig due to:
> arm64-allmodconfig
> ../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
also caused by b4f596b19624 (arm64: add mvebu architecture entry) which
enables MVBEU on arm64, the commit was present for a little while and
the error cropped up but didn't get reported due to other things masking
it. atomic_io_modify() is only available on ARM, I'm unsure if this
needs a driver change or if the driver is just specific to older
hardware anyway. The code is only used in the init path accessing what
look to be device specific registers so I'm not 100% clear why it
specifically needs to be an atomic modify.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160225 build: 2 failures 44 warnings (next-20160225)
From: Mark Brown @ 2016-02-26 3:04 UTC (permalink / raw)
To: Gregory CLEMENT, Thomas Petazzoni, Olof Johansson, Arnd Bergmann
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <E1aYsmb-0006qb-76@optimist>
[-- Attachment #1: Type: text/plain, Size: 1064 bytes --]
On Thu, Feb 25, 2016 at 10:04:29AM +0000, Build bot for Mark Brown wrote:
Today's -next fails to build an arm64 allmodconfig due to:
> arm64-allmodconfig
> ../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
> ../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
> ../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
> ../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
> ../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
caused by b4f596b19624 (arm64: add mvebu architecture entry) which
enables MVBEU on arm64, the commit was present for a little while and
the error cropped up but didn't get reported due to other things masking
it. This looks like the driver needs modernization and probably ought
to have a !ARM64 dependency for now.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tip tree with the arm64 tree
From: Stephen Rothwell @ 2016-02-26 1:53 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Catalin Marinas
Cc: linux-next, linux-kernel, Ard Biesheuvel
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/arm64-stub.c
between commit:
2b5fe07a78a0 ("arm64: efi: invoke EFI_RNG_PROTOCOL to supply KASLR randomness")
from the arm64 tree and commit:
42b55734030c ("efi/arm64: Check for h/w support before booting a >4 KB granular kernel")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/firmware/efi/libstub/arm64-stub.c
index e0e6b74fef8f,047fc343665a..000000000000
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@@ -12,18 -12,34 +12,38 @@@
#include <linux/efi.h>
#include <asm/efi.h>
#include <asm/sections.h>
+ #include <asm/sysreg.h>
+#include "efistub.h"
+
+extern bool __nokaslr;
+
- efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table_arg,
- unsigned long *image_addr,
- unsigned long *image_size,
- unsigned long *reserve_addr,
- unsigned long *reserve_size,
- unsigned long dram_base,
- efi_loaded_image_t *image)
+ efi_status_t check_platform_features(efi_system_table_t *sys_table_arg)
+ {
+ u64 tg;
+
+ /* UEFI mandates support for 4 KB granularity, no need to check */
+ if (IS_ENABLED(CONFIG_ARM64_4K_PAGES))
+ return EFI_SUCCESS;
+
+ tg = (read_cpuid(ID_AA64MMFR0_EL1) >> ID_AA64MMFR0_TGRAN_SHIFT) & 0xf;
+ if (tg != ID_AA64MMFR0_TGRAN_SUPPORTED) {
+ if (IS_ENABLED(CONFIG_ARM64_64K_PAGES))
+ pr_efi_err(sys_table_arg, "This 64 KB granular kernel is not supported by your CPU\n");
+ else
+ pr_efi_err(sys_table_arg, "This 16 KB granular kernel is not supported by your CPU\n");
+ return EFI_UNSUPPORTED;
+ }
+ return EFI_SUCCESS;
+ }
+
+ efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg,
+ unsigned long *image_addr,
+ unsigned long *image_size,
+ unsigned long *reserve_addr,
+ unsigned long *reserve_size,
+ unsigned long dram_base,
+ efi_loaded_image_t *image)
{
efi_status_t status;
unsigned long kernel_size, kernel_memsize = 0;
^ permalink raw reply
* linux-next: manual merge of the tip tree with the arm64 tree
From: Stephen Rothwell @ 2016-02-26 1:53 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Catalin Marinas
Cc: linux-next, linux-kernel, Ard Biesheuvel
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/libstub/efistub.h
between commits:
e4fbf4767440 ("efi: stub: implement efi_get_random_bytes() based on EFI_RNG_PROTOCOL")
2ddbfc81eac8 ("efi: stub: add implementation of efi_random_alloc()")
from the arm64 tree and commit:
b9d6769b5678 ("efi/arm*: Perform hardware compatibility check")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/firmware/efi/libstub/efistub.h
index 5ed3d3f38166,981c6035ce09..000000000000
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@@ -43,11 -53,6 +53,13 @@@ void efi_get_virtmap(efi_memory_desc_t
unsigned long desc_size, efi_memory_desc_t *runtime_map,
int *count);
+efi_status_t efi_get_random_bytes(efi_system_table_t *sys_table,
+ unsigned long size, u8 *out);
+
+efi_status_t efi_random_alloc(efi_system_table_t *sys_table_arg,
+ unsigned long size, unsigned long align,
+ unsigned long *addr, unsigned long random_seed);
+
+ efi_status_t check_platform_features(efi_system_table_t *sys_table_arg);
+
#endif
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Daniel Borkmann @ 2016-02-26 0:15 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, netdev
Cc: linux-next, linux-kernel, Alexei Starovoitov
In-Reply-To: <20160226111314.5b94099c@canb.auug.org.au>
On 02/26/2016 01:13 AM, Stephen Rothwell wrote:
[...]
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks Stephen!
Best,
Daniel
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-02-26 0:13 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Daniel Borkmann, Alexei Starovoitov
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/uapi/linux/bpf.h
between commit:
2da897e51d7f ("bpf: fix csum setting for bpf_set_tunnel_key")
from the net tree and commit:
d5a3b1f69186 ("bpf: introduce BPF_MAP_TYPE_STACK_TRACE")
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 include/uapi/linux/bpf.h
index 5df4881dea7b,6496f98d3d68..000000000000
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -292,9 -321,12 +321,15 @@@ enum bpf_func_id
/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
#define BPF_F_TUNINFO_IPV6 (1ULL << 0)
+/* BPF_FUNC_skb_set_tunnel_key flags. */
+#define BPF_F_ZERO_CSUM_TX (1ULL << 1)
+
+ /* BPF_FUNC_get_stackid flags. */
+ #define BPF_F_SKIP_FIELD_MASK 0xffULL
+ #define BPF_F_USER_STACK (1ULL << 8)
+ #define BPF_F_FAST_STACK_CMP (1ULL << 9)
+ #define BPF_F_REUSE_STACKID (1ULL << 10)
+
/* user accessible mirror of in-kernel sk_buff.
* new fields can only be added to the end of this structure
*/
^ permalink raw reply
* Re: next-20160225 build: 2 failures 44 warnings (next-20160225)
From: Stephen Rothwell @ 2016-02-25 22:49 UTC (permalink / raw)
To: Build bot for Mark Brown
Cc: kernel-build-reports, linaro-kernel, linux-next, Andrew Morton,
Kirill A. Shutemov
In-Reply-To: <E1aYsmb-0006qb-76@optimist>
Hi all,
On Thu, 25 Feb 2016 10:04:29 +0000 Build bot for Mark Brown <broonie@kernel.org> wrote:
>
> arm64-allmodconfig
> ../arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3
> ../arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function)
Caused by an interaction between commit
b9c9252f278d ("mm: cleanup *pte_alloc* interfaces")
from the akpm-current tree and commit
66b3923a1a0f ("arm64: hugetlb: add support for PTE contiguous bit")
from Linus' tree (added before v4.5-rc1).
I will add a fix patch today that removes the second argument from the
new pte_alloc_map() call added by the latter commit.
Again, grep is your friend ... (yes, I realise that the akpm-current
tree patch was probably written against v4.4 (or some such)).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the sunxi tree with Linus' and the arm-soc trees
From: Stephen Rothwell @ 2016-02-25 22:16 UTC (permalink / raw)
To: Maxime Ripard, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Andre Przywara, Will Deacon,
Srinivas Kandagatla
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
531d3067314f ("arm64: defconfig: updates for 4.5")
from Linus' tree, commit:
efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
from the arm-soc tree and commit:
22b0898e831b ("arm64: add defconfig options for Allwinner SoCs")
from the sunxi tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index 894898f60925,7acadce74d4d..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -30,9 -31,10 +30,10 @@@ CONFIG_MODULES=
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
+ CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_BCM_IPROC=y
CONFIG_ARCH_BERLIN=y
-CONFIG_ARCH_EXYNOS7=y
+CONFIG_ARCH_EXYNOS=y
CONFIG_ARCH_LAYERSCAPE=y
CONFIG_ARCH_HISI=y
CONFIG_ARCH_MEDIATEK=y
@@@ -134,22 -127,24 +135,25 @@@ CONFIG_SERIAL_TEGRA=
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=11
CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_XILINX_PS_UART=y
CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_MVEBU_UART=y
CONFIG_VIRTIO_CONSOLE=y
# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
+ CONFIG_I2C_CHARDEV=y
+ CONFIG_I2C_MV64XXX=y
CONFIG_I2C_QUP=y
+CONFIG_I2C_UNIPHIER_F=y
CONFIG_I2C_RCAR=y
CONFIG_SPI=y
CONFIG_SPI_PL022=y
CONFIG_SPI_QUP=y
+CONFIG_SPMI=y
CONFIG_PINCTRL_MSM8916=y
+CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
+ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_PL061=y
CONFIG_GPIO_RCAR=y
CONFIG_GPIO_XGENE=y
@@@ -196,8 -179,12 +200,10 @@@ CONFIG_MMC_SDHCI=
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_TEGRA=y
CONFIG_MMC_SPI=y
+ CONFIG_MMC_SUNXI=y
CONFIG_MMC_DW=y
-CONFIG_MMC_DW_IDMAC=y
-CONFIG_MMC_DW_PLTFM=y
CONFIG_MMC_DW_EXYNOS=y
+ CONFIG_MMC_BLOCK_MINORS=16
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_SYSCON=y
@@@ -206,14 -193,12 +212,15 @@@ CONFIG_LEDS_TRIGGER_HEARTBEAT=
CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_PL031=y
+ CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_XGENE=y
CONFIG_DMADEVICES=y
-CONFIG_RCAR_DMAC=y
CONFIG_QCOM_BAM_DMA=y
CONFIG_TEGRA20_APB_DMA=y
+CONFIG_RCAR_DMAC=y
+CONFIG_VFIO=y
+CONFIG_VFIO_PCI=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_MMIO=y
^ permalink raw reply
* next-20160225 build: 2 failures 44 warnings (next-20160225)
From: Build bot for Mark Brown @ 2016-02-25 10:04 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160225
Git describe: next-20160225
Commit: 6cbc4fe7dd Add linux-next specific files for 20160225
Build Time: 93 min 8 sec
Passed: 7 / 9 ( 77.78 %)
Failed: 2 / 9 ( 22.22 %)
Errors: 9
Warnings: 44
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm64-defconfig
Errors:
arm64-allmodconfig
../arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3
../arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function)
../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
arm64-defconfig
../arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3
../arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function)
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
74 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
9 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 9
4 drivers/gpio/Kconfig:34:error: recursive dependency detected!
2 ../arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function)
2 ../arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3
1 ../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
1 ../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
1 ../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
1 ../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
1 ../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
1 ../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
Warnings Summary: 44
7 <stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
6 ../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
6 ../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
4 ../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
2 ../arch/arm64/mm/hugetlbpage.c:117:10: warning: unused variable 'pmd' [-Wunused-variable]
1 ../mm/debug_page_ref.c:8:21: warning: passing argument 1 of 'trace_page_ref_set' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../mm/debug_page_ref.c:50:26: warning: passing argument 1 of 'trace_page_ref_unfreeze' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../mm/debug_page_ref.c:43:24: warning: passing argument 1 of 'trace_page_ref_freeze' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../mm/debug_page_ref.c:36:28: warning: passing argument 1 of 'trace_page_ref_mod_unless' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../mm/debug_page_ref.c:29:32: warning: passing argument 1 of 'trace_page_ref_mod_and_return' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../mm/debug_page_ref.c:22:30: warning: passing argument 1 of 'trace_page_ref_mod_and_test' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../mm/debug_page_ref.c:15:21: warning: passing argument 1 of 'trace_page_ref_mod' from incompatible pointer type [-Wincompatible-pointer-types]
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/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../include/trace/events/page_ref.h:47:18: warning: its scope is only this definition or declaration, which is probably not what you want
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/pci/host/pci-mvebu.c:904:16: warning: unused variable 'hw' [-Wunused-variable]
1 ../drivers/pci/host/pci-mvebu.c:841:40: warning: passing argument 1 of 'sys_to_pcie' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../drivers/pci/host/pci-mvebu.c:839:44: warning: 'struct pci_sys_data' declared inside parameter list
1 ../drivers/pci/host/pci-mvebu.c:753:53: warning: its scope is only this definition or declaration, which is probably not what you want
1 ../drivers/pci/host/pci-mvebu.c:753:53: warning: 'struct pci_sys_data' declared inside parameter list
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=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 8 errors, 74 warnings, 0 section mismatches
Errors:
../arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3
../arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function)
../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
Warnings:
../arch/arm64/mm/hugetlbpage.c:117:10: warning: unused variable 'pmd' [-Wunused-variable]
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: its scope is only this definition or declaration, which is probably not what you want
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:47:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:54:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:97:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:104:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:111:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:118:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/events/page_ref.h:125:18: warning: 'struct page' declared inside parameter list
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/trace_events.h:703:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_set' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_test' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_and_return' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_mod_unless' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_freeze' from incompatible pointer type [-Wincompatible-pointer-types]
../include/trace/perf.h:83:35: warning: passing argument 1 of 'check_trace_callback_type_page_ref_unfreeze' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:8:21: warning: passing argument 1 of 'trace_page_ref_set' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:15:21: warning: passing argument 1 of 'trace_page_ref_mod' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:22:30: warning: passing argument 1 of 'trace_page_ref_mod_and_test' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:29:32: warning: passing argument 1 of 'trace_page_ref_mod_and_return' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:36:28: warning: passing argument 1 of 'trace_page_ref_mod_unless' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:43:24: warning: passing argument 1 of 'trace_page_ref_freeze' from incompatible pointer type [-Wincompatible-pointer-types]
../mm/debug_page_ref.c:50:26: warning: passing argument 1 of 'trace_page_ref_unfreeze' from incompatible pointer type [-Wincompatible-pointer-types]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../drivers/pci/host/pci-mvebu.c:753:53: warning: 'struct pci_sys_data' declared inside parameter list
../drivers/pci/host/pci-mvebu.c:753:53: warning: its scope is only this definition or declaration, which is probably not what you want
../drivers/pci/host/pci-mvebu.c:839:44: warning: 'struct pci_sys_data' declared inside parameter list
../drivers/pci/host/pci-mvebu.c:841:40: warning: passing argument 1 of 'sys_to_pcie' from incompatible pointer type [-Wincompatible-pointer-types]
../drivers/pci/host/pci-mvebu.c:904:16: warning: unused variable 'hw' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/gpio/Kconfig:34:error: recursive dependency detected!
drivers/gpio/Kconfig:34:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 9 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
../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]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/gpio/Kconfig:34:error: recursive dependency detected!
drivers/gpio/Kconfig:34:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm64-defconfig : FAIL, 2 errors, 1 warnings, 0 section mismatches
Errors:
../arch/arm64/mm/hugetlbpage.c:127:42: error: macro "pte_alloc_map" passed 4 arguments, but takes just 3
../arch/arm64/mm/hugetlbpage.c:127:9: error: 'pte_alloc_map' undeclared (first use in this function)
Warnings:
../arch/arm64/mm/hugetlbpage.c:117:10: warning: unused variable 'pmd' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
^ permalink raw reply
* linux-next: Tree for Feb 25
From: Stephen Rothwell @ 2016-02-25 5:17 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160224:
The renesas tree gained a conflict against the arm-soc tree.
The mac80211-next tree lost its build failure.
The aio tree still had a build failure so I used the version from
next-20160111.
The akpm-current tree gained a build failure for which I applied a
fix patch.
Non-merge commits (relative to Linus' tree): 6735
5508 files changed, 251727 insertions(+), 122466 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 (84e54c46b2f4 Merge tag 'dm-4.5-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm)
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 (9ef2d8be5565 arc: SMP: CONFIG_ARC_IPI_DBG cleanup)
Merging arm-current/fixes (c7edd7f99cda ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs)
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 (9ab3ac233a8b powerpc/mm/hash: Clear the invalid slot information correctly)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (a8c4a2522a08 ipv4: only create late gso-skb if skb is already set up with CHECKSUM_PARTIAL)
Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation)
Merging ipvs/master (5acaf89f88b9 netfilter: ipvs: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers/master (c699404db182 Merge tag 'iwlwifi-for-kalle-2016-02-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b86071528f32 cfg80211: stop critical protocol session upon disconnect event)
Merging sound-current/for-linus (7e31a0159461 ALSA: hda - Apply clock gate workaround to Skylake, too)
Merging pci-current/for-linus (9a091fd371f8 Merge branch 'pci/host-hv' into for-linus)
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (e5bdfd50d6f7 Revert "usb: hub: do not clear BOS field during reset device")
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (d061c1caa31d USB: option: add "4G LTE usb-modem U901")
Merging usb-chipidea-fixes/ci-for-usb-stable (8c0614ca312c usb: chipidea: fix return value check in ci_hdrc_pci_probe())
Merging staging.current/staging-linus (7a64cd887fdb drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE)
Merging char-misc.current/char-misc-linus (18558cae0272 Linux 4.5-rc4)
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 (9b18572e83bf drm/i915/gen9: Verify and enforce dc6 state writes)
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (e75daf55992d ARC: clockevent: Prepare for DT based probe)
Merging arm/for-next (113b44c6c25b Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (94085fe570e7 arm64: dts: Add Cavium ThunderX specific PMU)
Merging arm-soc/for-next (b71af59d8286 Merge branch 'fixes' into for-next)
Merging at91/at91-next (799da647446d Merge tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to 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 (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
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 (655f2d0d2295 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (98a5093dc516 Merge branch 'mvebu/dt64' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging omap/for-next (601052bca473 Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (5b19b3012f3b ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (25b58bf23c27 Merge branches 'heads/arm64-defconfig-for-v4.6', 'heads/arm64-dt-for-v4.6' and 'heads/dt-for-v4.6' into next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging rockchip/for-next (2def4fc4fc2d Merge branch 'v4.6-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c67b0b31311f Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (5e04a6344023 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6', 'sunxi/dt-for-4.6' and 'sunxi/defconfig-for-4.6' into sunxi/for-next)
Merging tegra/for-next (822a31bceba1 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (2b5fe07a78a0 arm64: efi: invoke EFI_RNG_PROTOCOL to supply KASLR randomness)
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 (0cdfea013ee8 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 (f1cf93aed364 MIPS: tlb-r4k: panic if the MMU doesn't support PAGE_SIZE)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (c3ab300ea555 powerpc: Add POWER9 cputable entry)
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 (993e0681084c s390/oprofile: add z13/z13s model numbers)
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 (c4067a08c106 Merge branch 'for-next-4.6-20160223' into for-next-20160223)
Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings)
Merging cifs/for-next (81f70ba233d5 Linux 4.5-rc5)
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 (6332b9b5e797 ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes)
Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling)
Merging f2fs/dev (80c4fd200a7c f2fs: avoid hungtask problem caused by losing wake_up)
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 (a63be4e6d0e9 GFS2: Eliminate parameter non_block on gfs2_inode_lookup)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (9fd4b9fc7695 NFSv4.x/pnfs: Fix a race between layoutget and bulk recalls)
Merging nfsd/nfsd-next (b7052cd7bcf3 sunrpc/cache: fix off-by-one in qword_get())
Merging orangefs/for-next (c1223ca48baa orangefs: get rid of op refcounts)
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 (e15c65b38461 Merge branch 'xfs-writepage-rework-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)
CONFLICT (content): Merge conflict in drivers/pci/probe.c
Merging hid/for-next (c2781579ce25 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (33f5ccc343b7 i2c: piix4: Pre-shift the port number)
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 (e1370715b20e ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (c2fd1465f329 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (4477c1cdf1c4 Merge branch 'for-4.6' into for-next)
Merging pm/linux-next (154b7d22e480 Merge branch 'acpica' 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 (eb4fc33eb268 thermal: small style cleanup in mtk_thermal)
Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (7a02d9b6888e Merge branch 'topic/omap' into next)
Merging net-next/master (5aba81868569 Merge branch 'gianfar-xmit-improvements')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (d289cbed9d55 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue)
Merging bluetooth/master (395174bb07c1 Bluetooth: hci_uart: Add Intel/AG6xx support)
Merging mac80211-next/master (b573213927c5 rfkill: Notify userspace of airplane-mode state changes)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
Merging mtd/master (38714fbd299f MAINTAINERS: update Han's email)
Merging l2-mtd/master (5e64c29e98bf mtd: onenand: fix deadlock in onenand_block_markbad)
Merging crypto/master (49abc0d2e19b crypto: xts - fix compile errors)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging drm/drm-next (d2eaa59000c7 Merge branch 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/kernel-drm-rockchip into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (6831f3e3c640 drm/i915: Add for_each_pipe_masked())
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (a6ddd2f1b99f drm/udl: Use module_usb_driver)
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 (a17ba6a39ed1 drm/msm: add timestamp param)
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.)
Merging sound/for-next (956dea9e9112 ALSA: oxfw: discontinue MIDI substream for scs1x at transaction failure)
Merging sound-asoc/for-next (7135909be57e Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (6ccb1d8f78bd Input: add MELFAS MIP4 Touchscreen driver)
Merging block/for-next (ab3d8b3ecf77 Merge branch 'for-4.6/core' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging device-mapper/for-next (01dd954e0fd8 dm: drop unnecessary assignment of md->queue)
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 (af3d6866825f mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (93ac96deff4c md: Drop sending a change uevent when stopping)
Merging mfd/for-mfd-next (103d8a7bb8a2 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 (5c0e09e03fb5 power: act8945a: add charger driver for ACT8945A)
Merging omap_dss2/for-next (f059c4b220b8 fbdev: exynos: fix IS_ERR_VALUE usage)
Merging regulator/for-next (69092c65e44e Merge remote-tracking branch 'regulator/topic/vexpress' into regulator-next)
Merging security/next (602094428090 Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (a13b64591747 vfio/pci: Expose shadow ROM as PCI option ROM)
Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk)
Merging trivial/for-next (d00cd819d7df 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 (6338b8a12d0a Merge branches 'dt/linus' and 'dt/next' into for-next)
Merging mailbox/mailbox-for-next (be9c09bcca03 arm64: dts: mailbox device tree node for APM X-Gene platform.)
Merging spi/for-next (4483631212ee Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (a4a40d25e75d Merge branch 'x86/platform')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
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 (95d4f352d268 Merge branch 'irqchip/mvebu' 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 (2863b4e3dd92 Merge branches 'doc.2015.02.23a', 'fixes.2015.02.23a' and 'torture.2015.02.23a' into HEAD)
Merging kvm/linux-next (433da86023f8 KVM: async_pf: use list_first_entry)
Merging kvm-arm/next (67aaab4cff18 arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp)
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
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 (d3695aa4f452 KVM: PPC: Add support for multiple-TCE hcalls)
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 (23217b443b4b workqueue: Replace usage of init_name with dev_set_name())
Merging drivers-x86/for-next (2d905b3e74ad intel-hid: allocate correct amount of memory for private struct)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (10c43341ac84 Merge remote-tracking branches 'regmap/topic/doc', 'regmap/topic/irq', 'regmap/topic/stride' and 'regmap/topic/update-bits' into regmap-next)
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (94b0580b6768 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
Merging usb/usb-next (a057c3259ab6 usb: dwc2: USB_DWC2 should depend on HAS_DMA)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (18558cae0272 Linux 4.5-rc4)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (c4e315884ed8 staging: lustre: Remove LASSERTS from router checker)
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
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.
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (35bf7692e765 mei: fix format string in debug prints)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (468de7d80707 Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (3f84575f934a 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 (683072c71ff1 Merge branch 'devel' into for-next)
Merging vhost/linux-next (b91608c87c59 vring: Use the DMA API on Xen)
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 (3cf42efc3479 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
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 (0cbb0b92689a Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (706d5c73e336 clk: Update some outdated comments)
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 (76e9d9ab63cd Makefile: add kselftest-merge)
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 (4c5e6154516b Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (e1d7a40f67f7 rtc: rx8025: unsupport UIE mode)
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 (c27b54512f75 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Applying: mm: cleanup *pte_alloc* interfaces fix
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: net/sched/sch_mqprio.c: fix build with older gcc
Merging akpm/master (6e62ee2f472b net/sched/sch_mqprio.c: fix build with older gcc)
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-02-25 4:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Kirill A. Shutemov, Russell King
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
arch/arm/mm/mmu.c:737:37: error: macro "pte_alloc" passed 4 arguments, but takes just 3
void *(*alloc)(unsigned long sz))
^
arch/arm/mm/mmu.c:738:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token
{
^
arch/arm/mm/mmu.c: In function 'early_pte_alloc':
arch/arm/mm/mmu.c:750:47: error: macro "pte_alloc" passed 4 arguments, but takes just 3
return pte_alloc(pmd, addr, prot, early_alloc);
^
arch/arm/mm/mmu.c:750:9: error: 'pte_alloc' undeclared (first use in this function)
return pte_alloc(pmd, addr, prot, early_alloc);
^
arch/arm/mm/mmu.c:750:9: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/mm/mmu.c: In function 'alloc_init_pte':
arch/arm/mm/mmu.c:759:56: error: macro "pte_alloc" passed 4 arguments, but takes just 3
pte_t *pte = pte_alloc(pmd, addr, type->prot_l1, alloc);
^
arch/arm/mm/mmu.c:759:15: error: 'pte_alloc' undeclared (first use in this function)
pte_t *pte = pte_alloc(pmd, addr, type->prot_l1, alloc);
^
arch/arm/mm/mmu.c: In function 'early_pte_alloc':
arch/arm/mm/mmu.c:751:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
Caused by commit
b9c9252f278d ("mm: cleanup *pte_alloc* interfaces")
grep is your friend ...
I applied this fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 25 Feb 2016 15:36:59 +1100
Subject: [PATCH] mm: cleanup *pte_alloc* interfaces fix
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/mm/mmu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index e4b681aafd6d..62f4d01941f7 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -732,7 +732,7 @@ static void *__init late_alloc(unsigned long sz)
return ptr;
}
-static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
+static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,
unsigned long prot,
void *(*alloc)(unsigned long sz))
{
@@ -747,7 +747,7 @@ static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr,
unsigned long prot)
{
- return pte_alloc(pmd, addr, prot, early_alloc);
+ return arm_pte_alloc(pmd, addr, prot, early_alloc);
}
static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
@@ -756,7 +756,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
void *(*alloc)(unsigned long sz),
bool ng)
{
- pte_t *pte = pte_alloc(pmd, addr, type->prot_l1, alloc);
+ pte_t *pte = arm_pte_alloc(pmd, addr, type->prot_l1, alloc);
do {
set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)),
ng ? PTE_EXT_NG : 0);
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* mmotm 2016-02-24-16-18 uploaded
From: akpm @ 2016-02-25 0:19 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-02-24-16-18 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.5-rc5:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
* mm-thp-fix-smp-race-condition-between-thp-page-fault-and-madv_dontneed.patch
* mm-thp-fix-smp-race-condition-between-thp-page-fault-and-madv_dontneed-fix.patch
* mm-numa-quickly-fail-allocations-for-numa-balancing-on-full-nodes.patch
* drivers-char-random-add-get_random_long.patch
* use-get_random_long.patch
* ocfs2-unlock-inode-if-deleting-inode-from-orphan-fail.patch
* block-disable-block-device-dax-by-default.patch
* ext2-ext4-only-set-s_dax-for-regular-inodes.patch
* ext4-online-defrag-not-supported-with-dax.patch
* dax-give-dax-clearing-code-correct-bdev.patch
* dax-move-writeback-calls-into-the-filesystems.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* m32r-mm-fix-build-warning.patch
* blackfin-define-dummy-pgprot_writecombine-for-mmu.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-cluster-replace-the-interrupt-safe-spinlocks-with-common-ones.patch
* ocfs2-use-spinlock-irqsave-for-downconvert-lock-in-ocfs2_osb_dump.patch
* ocfs2-dlm-fix-a-typo-in-dlmcommonh.patch
* ocfs2-dlm-add-deref_done-message.patch
* ocfs2-dlm-return-in-progress-if-master-can-not-clear-the-refmap-bit-right-now.patch
* ocfs2-dlm-clear-dropping_ref-flag-when-the-master-goes-down.patch
* ocfs2-dlm-return-einval-when-the-lockres-on-migration-target-is-in-dropping_ref-state.patch
* ocfs2-add-ocfs2_write_type_t-type-to-identify-the-caller-of-write.patch
* ocfs2-use-c_new-to-indicate-newly-allocated-extents.patch
* ocfs2-test-target-page-before-change-it.patch
* ocfs2-do-not-change-i_size-in-write_end-for-direct-io.patch
* ocfs2-return-the-physical-address-in-ocfs2_write_cluster.patch
* ocfs2-record-unwritten-extents-when-populate-write-desc.patch
* ocfs2-fix-sparse-file-data-ordering-issue-in-direct-io.patch
* ocfs2-code-clean-up-for-direct-io.patch
* ocfs2-code-clean-up-for-direct-io-fix.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
* ocfs2-take-ip_alloc_sem-in-ocfs2_dio_get_block-ocfs2_dio_end_io_write.patch
* ocfs2-fix-disk-file-size-and-memory-file-size-mismatch.patch
* ocfs2-fix-a-deadlock-issue-in-ocfs2_dio_end_io_write.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v2.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v3.patch
* ocfs2-dlm-fix-bug-in-dlm_move_lockres_to_recovery_list.patch
* ocfs2-extend-transaction-for-ocfs2_remove_rightmost_path-and-ocfs2_update_edge_lengths-before-to-avoid-inconsistency-between-inode-and-et.patch
* extend-enough-credits-for-freeing-one-truncate-record-while-replaying-truncate-records.patch
* ocfs2-avoid-occurring-deadlock-by-changing-ocfs2_wq-from-global-to-local.patch
* ocfs2-solve-a-problem-of-crossing-the-boundary-in-updating-backups.patch
* ocfs2-export-ocfs2_kset-for-online-file-check.patch
* ocfs2-sysfile-interfaces-for-online-file-check.patch
* ocfs2-create-remove-sysfile-for-online-file-check.patch
* ocfs2-check-fix-inode-block-for-online-file-check.patch
* ocfs2-add-feature-document-for-online-file-check.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert.patch
* ocfs2-dlm-move-lock-to-the-tail-of-grant-queue-while-doing-in-place-convert-fix.patch
* block-partition-add-partition-specific-uevent-callbacks-for-partition-info.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* slub-cleanup-code-for-kmem-cgroup-support-to-kmem_cache_free_bulk.patch
* mm-slab-move-slub-alloc-hooks-to-common-mm-slabh.patch
* mm-fault-inject-take-over-bootstrap-kmem_cache-check.patch
* mm-fault-inject-take-over-bootstrap-kmem_cache-check-fix.patch
* slab-use-slab_pre_alloc_hook-in-slab-allocator-shared-with-slub.patch
* slab-use-slab_pre_alloc_hook-in-slab-allocator-shared-with-slub-fix.patch
* mm-kmemcheck-skip-object-if-slab-allocation-failed.patch
* slab-use-slab_post_alloc_hook-in-slab-allocator-shared-with-slub.patch
* slab-implement-bulk-alloc-in-slab-allocator.patch
* slab-avoid-running-debug-slab-code-with-irqs-disabled-for-alloc_bulk.patch
* slab-implement-bulk-free-in-slab-allocator.patch
* mm-new-api-kfree_bulk-for-slabslub-allocators.patch
* mm-fix-some-spelling.patch
* mm-slab-fix-stale-code-comment.patch
* mm-slab-remove-useless-structure-define.patch
* mm-slab-remove-the-checks-for-slab-implementation-bug.patch
* mm-slab-activate-debug_pagealloc-in-slab-when-it-is-actually-enabled.patch
* mm-slab-use-more-appropriate-condition-check-for-debug_pagealloc.patch
* mm-slab-clean-up-debug_pagealloc-processing-code.patch
* mm-slab-clean-up-debug_pagealloc-processing-code-fix.patch
* mm-slab-alternative-implementation-for-debug_slab_leak.patch
* mm-slab-remove-object-status-buffer-for-debug_slab_leak.patch
* mm-slab-put-the-freelist-at-the-end-of-slab-page.patch
* mm-slab-put-the-freelist-at-the-end-of-slab-page-fix.patch
* mm-slab-align-cache-size-first-before-determination-of-off_slab-candidate.patch
* mm-slab-clean-up-cache-type-determination.patch
* mm-slab-do-not-change-cache-size-if-debug-pagealloc-isnt-possible.patch
* mm-slab-make-criteria-for-off-slab-determination-robust-and-simple.patch
* mm-slab-factor-out-slab-list-fixup-code.patch
* mm-slab-factor-out-debugging-initialization-in-cache_init_objs.patch
* mm-slab-introduce-new-slab-management-type-objfreelist_slab.patch
* mm-slab-introduce-new-slab-management-type-objfreelist_slab-fix.patch
* mm-slab-re-implement-pfmemalloc-support.patch
* mm-slab-re-implement-pfmemalloc-support-v2.patch
* slub-drop-lock-at-the-end-of-free_debug_processing.patch
* slub-drop-lock-at-the-end-of-free_debug_processing-fix.patch
* slub-fix-clean-free_debug_processing-return-paths.patch
* slub-convert-slab_debug_free-to-slab_consistency_checks.patch
* slub-relax-cmpxchg-consistency-restrictions.patch
* mm-slub-support-left-red-zone.patch
* fs-mpagec-mpage_readpages-use-lru_to_page-helper.patch
* mm-page_allocc-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
* mm-page_allocc-introduce-kernelcore=mirror-option.patch
* mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
* mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
* mm-page-writeback-fix-dirty_ratelimit-calculation.patch
* mm-debug_pagealloc-ask-users-for-default-setting-of-debug_pagealloc.patch
* mm-debug_pagealloc-ask-users-for-default-setting-of-debug_pagealloc-v3.patch
* mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc.patch
* mm-debug-pageallocc-split-out-page-poisoning-from-debug-page_alloc-checkpatch-fixes.patch
* mm-page_poisonc-enable-page_poisoning-as-a-separate-option.patch
* mm-page_poisonc-enable-page_poisoning-as-a-separate-option-fix.patch
* mm-page_poisoningc-allow-for-zero-poisoning.patch
* mm-page_poisoningc-allow-for-zero-poisoning-checkpatch-fixes.patch
* mm-fix-two-typos-in-comments-for-to_vmem_altmap.patch
* mm-mprotectc-dont-imply-prot_exec-on-non-exec-fs.patch
* mm-mprotectc-dont-imply-prot_exec-on-non-exec-fs-v2.patch
* mm-filemap-remove-redundant-code-in-do_read_cache_page.patch
* mm-filemap-avoid-unnecessary-calls-to-lock_page-when-waiting-for-io-to-complete-during-a-read.patch
* tracepoints-move-trace_print_flags-definitions-to-tracepoint-defsh.patch
* mm-tracing-make-show_gfp_flags-up-to-date.patch
* tools-perf-make-gfp_compact_table-up-to-date.patch
* mm-tracing-unify-mm-flags-handling-in-tracepoints-and-printk.patch
* mm-printk-introduce-new-format-string-for-flags.patch
* mm-printk-introduce-new-format-string-for-flags-fix.patch
* mm-debug-replace-dump_flags-with-the-new-printk-formats.patch
* mm-page_alloc-print-symbolic-gfp_flags-on-allocation-failure.patch
* mm-oom-print-symbolic-gfp_flags-in-oom-warning.patch
* mm-page_owner-print-migratetype-of-page-and-pageblock-symbolic-flags.patch
* mm-page_owner-convert-page_owner_inited-to-static-key.patch
* mm-page_owner-copy-page-owner-info-during-migration.patch
* mm-page_owner-track-and-print-last-migrate-reason.patch
* mm-page_owner-dump-page-owner-info-from-dump_page.patch
* mm-debug-move-bad-flags-printing-to-bad_page.patch
* mm-madvise-pass-return-code-of-memory_failure-to-userspace.patch
* mm-memory-failurec-remove-the-useless-undefs.patch
* mm-mempolicy-skip-vm_hugetlb-and-vm_mixedmap-vma-for-lazy-mbind.patch
* make-apply_to_page_range-more-robust.patch
* memory-hotplug-add-automatic-onlining-policy-for-the-newly-added-memory.patch
* xen_balloon-support-memory-auto-onlining-policy.patch
* mm-vmscan-do-not-clear-shrinker_numa_aware-if-nr_node_ids-==-1.patch
* mm-madvise-update-comment-on-sys_madvise.patch
* mm-madvise-update-comment-on-sys_madvise-fix.patch
* mm-vmscan-make-zone_reclaimable_pages-more-precise.patch
* mm-memcontrol-generalize-locking-for-the-page-mem_cgroup-binding.patch
* mm-workingset-define-radix-entry-eviction-mask.patch
* mm-workingset-separate-shadow-unpacking-and-refault-calculation.patch
* mm-workingset-eviction-buckets-for-bigmem-lowbit-machines.patch
* mm-workingset-per-cgroup-cache-thrash-detection.patch
* mm-workingset-per-cgroup-cache-thrash-detection-fix.patch
* mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages.patch
* mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix.patch
* mm-migrate-do-not-touch-page-mem_cgroup-of-live-pages-fix-2.patch
* mm-simplify-lock_page_memcg.patch
* mm-simplify-lock_page_memcg-fix.patch
* mm-remove-unnecessary-uses-of-lock_page_memcg.patch
* mm-use-linear_page_index-in-do_fault.patch
* thp-cleanup-split_huge_page.patch
* x86-query-dynamic-debug_pagealloc-setting.patch
* s390-query-dynamic-debug_pagealloc-setting.patch
* x86-also-use-debug_pagealloc_enabled-for-free_init_pages.patch
* sched-add-schedule_timeout_idle.patch
* mm-oom-introduce-oom-reaper.patch
* oom-reaper-handle-mlocked-pages.patch
* oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space.patch
* mm-oom_reaper-report-success-failure.patch
* mm-oom_reaper-report-success-failure-fix.patch
* mm-oom_reaper-report-success-failure-fix-2.patch
* mm-oom_reaper-implement-oom-victims-queuing.patch
* oom-make-oom_reaper-freezable.patch
* oom-oom_reaper-disable-oom_reaper-for-oom_kill_allocating_task.patch
* mm-memblock-remove-unnecessary-memblock_type-variable.patch
* mm-compaction-fix-invalid-free_pfn-and-compact_cached_free_pfn.patch
* mm-compaction-pass-only-pageblock-aligned-range-to-pageblock_pfn_to_page.patch
* mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous.patch
* mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-v3.patch
* mm-compaction-speed-up-pageblock_pfn_to_page-when-zone-is-contiguous-fix.patch
* mm-migrate-consolidate-mem_cgroup_migrate-calls.patch
* mm-memcontrol-drop-unnecessary-lru-locking-from-mem_cgroup_migrate.patch
* mm-memcontrol-do-not-bypass-slab-charge-if-memcg-is-offline.patch
* mm-memcontrol-make-tree_statevents-fetch-all-stats.patch
* mm-memcontrol-make-tree_statevents-fetch-all-stats-fix.patch
* mm-memcontrol-report-slab-usage-in-cgroup2-memorystat.patch
* mm-memcontrol-report-kernel-stack-usage-in-cgroup2-memorystat.patch
* mm-memcontrol-report-kernel-stack-usage-in-cgroup2-memorystat-v2.patch
* proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages.patch
* proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix.patch
* proc-kpageflags-return-kpf_buddy-for-tail-buddy-pages-fix-fix.patch
* proc-kpageflags-return-kpf_slab-for-slab-tail-pages.patch
* tools-vm-page-typesc-support-swap-entry.patch
* mm-vmalloc-query-dynamic-debug_pagealloc-setting.patch
* mm-vmalloc-query-dynamic-debug_pagealloc-setting-fix.patch
* mm-slub-query-dynamic-debug_pagealloc-setting.patch
* mm-slub-query-dynamic-debug_pagealloc-setting-fix.patch
* mm-slub-query-dynamic-debug_pagealloc-setting-v2.patch
* sound-query-dynamic-debug_pagealloc-setting.patch
* sound-query-dynamic-debug_pagealloc-setting-fix.patch
* powerpc-query-dynamic-debug_pagealloc-setting.patch
* tile-query-dynamic-debug_pagealloc-setting.patch
* mm-kswapd-remove-bogus-check-of-balance_classzone_idx.patch
* mm-compaction-introduce-kcompactd.patch
* mm-compaction-introduce-kcompactd-fix.patch
* mm-compaction-introduce-kcompactd-fix-2.patch
* mm-memory-hotplug-small-cleanup-in-online_pages.patch
* mm-kswapd-replace-kswapd-compaction-with-waking-up-kcompactd.patch
* mm-compaction-adapt-isolation_suitable-flushing-to-kcompactd.patch
* mm-config_nr_zones_extended.patch
* mm-config_nr_zones_extended-fix.patch
* tools-vm-page-typesc-add-memory-cgroup-dumping-and-filtering.patch
* tools-vm-page-typesc-add-memory-cgroup-dumping-and-filtering-fix.patch
* bufferhead-force-inlining-of-buffer-head-flag-operations.patch
* force-inlining-of-selected-page-flag-modifications.patch
* mm-memcontrol-enable-kmem-accounting-for-all-cgroups-in-the-legacy-hierarchy.patch
* mm-vmscan-pass-root_mem_cgroup-instead-of-null-to-memcg-aware-shrinker.patch
* mm-memcontrol-zap-memcg_kmem_online-helper.patch
* radix-tree-account-radix_tree_node-to-memory-cgroup.patch
* mm-workingset-size-shadow-nodes-lru-basing-on-file-cache-size.patch
* mm-workingset-make-shadow-node-shrinker-memcg-aware.patch
* thp-vmstats-count-deferred-split-events.patch
* thp-vmstats-count-deferred-split-events-v2.patch
* mm-move-max_map_count-bits-into-mmh.patch
* mm-dedupclicate-memory-overcommitment-code.patch
* mm-tracing-refresh-__def_vmaflag_names.patch
* mm-tracing-refresh-__def_vmaflag_names-fix.patch
* mm-thp-migration-switch-from-flush_tlb_range-to-flush_pmd_tlb_range.patch
* arc-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* mm-kconfig-remove-redundant-arch-depend-for-memory-hotplug.patch
* calculate-available-memory-in-the-separate-function.patch
* virtio_balloon-export-available-memory-to-balloon-statistics.patch
* mm-add-a-new-vector-based-madvise-syscall.patch
* mm-add-a-new-vector-based-madvise-syscall-fix.patch
* mm-cleanup-pte_alloc-interfaces.patch
* mm-introduce-page-reference-manipulation-functions.patch
* mm-page_ref-add-tracepoint-to-track-down-page-reference-manipulation.patch
* mm-scale-kswapd-watermarks-in-proportion-to-memory.patch
* mm-remove-unnecessary-description-about-a-non-exist-gfp-flag.patch
* mm-mempool-only-set-__gfp_nomemalloc-if-there-are-free-elements.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-3.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* zsmalloc-drop-unused-member-mapping_area-huge.patch
* zram-export-the-number-of-available-comp-streams.patch
* zram-export-the-number-of-available-comp-streams-fix.patch
* mmoom-make-oom_killer_disable-killable.patch
* mmoom-do-not-loop-__gfp_fs-allocation-if-the-oom-killer-is-disabled.patch
* mm-oom-rework-oom-detection.patch
* mm-oom-rework-oom-detection-checkpatch-fixes.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* timer-convert-timer_slack_ns-from-unsigned-long-to-u64.patch
* proc-add-proc-pid-timerslack_ns-interface.patch
* proc-add-proc-pid-timerslack_ns-interface-fix.patch
* kernel-hung_taskc-use-timeout-diff-when-timeout-is-updated.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-use-irq-work-only-when-ready.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* printk-move-can_use_console-out-of-console_trylock_for_printk.patch
* printk-set-may_schedule-for-some-of-console_trylock-callers.patch
* printk-check-con_enabled-in-have_callable_console.patch
* include-linux-list_blh-use-bool-instead-of-int-for-boolean-functions.patch
* lib-bug-make-panic_on_warn-available-for-all-architectures.patch
* radix-tree-add-an-explicit-include-of-bitopsh.patch
* radix-tree-test-harness.patch
* radix_tree-tag-all-internal-tree-nodes-as-indirect-pointers.patch
* radix_tree-loop-based-on-shift-count-not-height.patch
* radix_tree-add-support-for-multi-order-entries.patch
* radix_tree-add-radix_tree_dump.patch
* btrfs-use-radix_tree_iter_retry.patch
* btrfs-use-radix_tree_iter_retry-fix.patch
* mm-use-radix_tree_iter_retry.patch
* mm-use-radix_tree_iter_retry-fix.patch
* radix-treeshmem-introduce-radix_tree_iter_next.patch
* radix-tree-tests-add-regression3-test.patch
* lib-string-introduce-match_string-helper.patch
* lib-string-introduce-match_string-helper-fix.patch
* device-property-convert-to-use-match_string-helper.patch
* device-property-convert-to-use-match_string-helper-fix.patch
* pinctrl-convert-to-use-match_string-helper.patch
* drm-edid-convert-to-use-match_string-helper.patch
* power-charger_manager-convert-to-use-match_string-helper.patch
* power-ab8500-convert-to-use-match_string-helper.patch
* ata-hpt366-convert-to-use-match_string-helper.patch
* ide-hpt366-convert-to-use-match_string-helper.patch
* usb-common-convert-to-use-match_string-helper.patch
* asm-generic-force-inlining-of-some-atomic_long-operations.patch
* force-inlining-of-some-byteswap-operations.patch
* force-inlining-of-unaligned-byteswap-operations.patch
* lib-move-strtobool-to-kstrtobool.patch
* lib-update-single-char-callers-of-strtobool.patch
* lib-add-on-off-support-to-kstrtobool.patch
* param-convert-some-on-off-users-to-strtobool.patch
* param-convert-some-on-off-users-to-strtobool-fix.patch
* lib-bugc-use-common-warn-helper.patch
* mm-utilc-add-kstrimdup.patch
* lib-add-crc64-ecma-module.patch
* compat-add-in_compat_syscall-to-ask-whether-were-in-a-compat-syscall.patch
* sparc-compat-provide-an-accurate-in_compat_syscall-implementation.patch
* sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix.patch
* sparc-compat-provide-an-accurate-in_compat_syscall-implementation-fix-fix.patch
* sparc-syscall-fix-syscall_get_arch.patch
* seccomp-check-in_compat_syscall-not-is_compat_task-in-strict-mode.patch
* ptrace-in-peek_siginfo-check-syscall-bitness-not-task-bitness.patch
* auditsc-for-seccomp-events-log-syscall-compat-state-using-in_compat_syscall.patch
* staging-lustre-switch-from-is_compat_task-to-in_compat_syscall.patch
* ext4-in-ext4_dir_llseek-check-syscall-bitness-directly.patch
* net-sctp-use-in_compat_syscall-for-sctp_getsockopt_connectx3.patch
* net-xfrm_user-use-in_compat_syscall-to-deny-compat-syscalls.patch
* firewire-use-in_compat_syscall-to-check-ioctl-compatness.patch
* efivars-use-in_compat_syscall-to-check-for-compat-callers.patch
* amdkfd-use-in_compat_syscall-to-check-open-caller-type.patch
* input-redefine-input_compat_test-as-in_compat_syscall.patch
* uhid-check-write-bitness-using-in_compat_syscall.patch
* x86-compat-remove-is_compat_task.patch
* x86-kallsyms-disable-absolute-percpu-symbols-on-smp.patch
* x86-kallsyms-disable-absolute-percpu-symbols-on-smp-v5.patch
* kallsyms-dont-overload-absolute-symbol-type-for-percpu-symbols.patch
* kallsyms-add-support-for-relative-offsets-in-kallsyms-address-table.patch
* kallsyms-add-support-for-relative-offsets-in-kallsyms-address-table-v5.patch
* init-mainc-use-list_for_each_entry.patch
* autofs-show-pipe-inode-in-mount-options.patch
* autofs4-coding-style-fixes.patch
* autofs4-fix-coding-style-problem-in-autofs4_get_set_timeout.patch
* autofs4-fix-coding-style-line-length-in-autofs4_wait.patch
* autofs4-fix-invalid-ioctl-return-in-autofs4_root_ioctl_unlocked.patch
* autofs4-fix-some-white-space-errors.patch
* autofs4-make-autofs-log-prints-consistent.patch
* autofs4-change-log-print-macros-to-not-insert-newline.patch
* autofs4-use-pr_xxx-macros-directly-for-logging.patch
* autofs4-fix-stringh-include-in-auto_dev-ioctlh.patch
* add-compile-time-check-for-__arch_si_preamble_size.patch
* cpumask-remove-incorrect-information-from-comment.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory-v4.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres-v4.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rionet-fix-deadlock-on-smp.patch
* rapidio-rionet-add-capability-to-change-mtu.patch
* rapidio-tsi721-fix-hardcoded-mrrs-setting.patch
* rapidio-tsi721-add-check-for-overlapped-ib-window-mappings.patch
* rapidio-tsi721-add-option-to-configure-direct-mapping-of-ib-window.patch
* rapidio-tsi721_dma-fix-pending-transaction-queue-handling.patch
* rapidio-add-query_mport-operation.patch
* rapidio-tsi721-add-query_mport-callback.patch
* rapidio-add-shutdown-notification-for-rapidio-devices.patch
* rapidio-tsi721-add-shutdown-notification-callback.patch
* rapidio-rionet-add-shutdown-event-handling.patch
* rapidio-rework-common-rio-device-add-delete-routines.patch
* rapidio-move-net-allocation-into-core-code.patch
* rapidio-move-net-allocation-into-core-code-fix.patch
* rapidio-add-core-mport-removal-support.patch
* rapidio-tsi721-add-hw-specific-mport-removal.patch
* powerpc-fsl_rio-changes-to-mport-registration.patch
* rapidio-rionet-add-locking-into-add-remove-device.patch
* rapidio-rionet-add-mport-removal-handling.patch
* rapidio-add-lock-protection-for-doorbell-list.patch
* rapidio-add-lock-protection-for-doorbell-list-fix.patch
* rapidio-move-rio_local_set_device_id-function-to-the-common-core.patch
* rapidio-move-rio_pw_enable-into-core-code.patch
* rapidio-move-rio_pw_enable-into-core-code-fix.patch
* rapidio-add-global-inbound-port-write-interfaces.patch
* rapidio-add-global-inbound-port-write-interfaces-fix.patch
* rapidio-tsi721-fix-locking-in-ob_msg-processing.patch
* rapidio-add-outbound-window-support.patch
* rapidio-tsi721-add-outbound-windows-mapping-support.patch
* rapidio-tsi721-add-filtered-debug-output.patch
* rapidio-tsi721_dma-update-error-reporting-from-prep_sg-callback.patch
* rapidio-tsi721_dma-fix-synchronization-issues.patch
* rapidio-tsi721_dma-fix-hardware-error-handling.patch
* rapidio-add-mport-char-device-driver.patch
* rapidio-add-mport-char-device-driver-fix.patch
* rapidio-add-mport-char-device-driver-fix-2.patch
* dma-rename-dma__writecombine-to-dma__wc.patch
* dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes.patch
* profile-hide-unused-functions-when-config_proc_fs.patch
* kernel-add-kcov-code-coverage.patch
* kernel-add-kcov-code-coverage-fix.patch
* kernel-add-kcov-code-coverage-fix-2.patch
* kernel-add-kcov-code-coverage-clean-up-code.patch
* scripts-gdb-add-version-command.patch
* scripts-gdb-add-cmdline-reader-command.patch
* kfifo-fix-sparse-complains.patch
* ubsan-fix-tree-wide-wmaybe-uninitialized-false-positives.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* net-sched-sch_mqprioc-fix-build-with-older-gcc.patch
mm-add-strictlimit-knob-v2.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* linux-next: manual merge of the renesas tree with the arm-soc tree
From: Stephen Rothwell @ 2016-02-24 22:07 UTC (permalink / raw)
To: Simon Horman, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Yoshihiro Shimoda, Srinivas Kandagatla
Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
efdda175c07f ("arm64: defconfig: add spmi and usb related configs")
from the arm-soc tree and commit:
a9c42f02387c ("arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support")
from the renesas tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index 7fddb2188f5c,eaf738a59927..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -230,7 -213,7 +230,8 @@@ CONFIG_QCOM_SMD_RPM=
CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_TEGRA_210_SOC=y
CONFIG_HISILICON_IRQ_MBIGEN=y
+CONFIG_EXTCON_USB_GPIO=y
+ CONFIG_PHY_RCAR_GEN3_USB2=y
CONFIG_PHY_XGENE=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
^ permalink raw reply
* Re: linux-next: Tree for Feb 24
From: Benjamin LaHaise @ 2016-02-24 14:37 UTC (permalink / raw)
To: Sedat Dilek; +Cc: linux-next, LKML, Stephen Rothwell, linux-aio
In-Reply-To: <CA+icZUVeY1-HbhQChpC=vwJO7Fk+3d07UFmDxW13vaoVEUTk9g@mail.gmail.com>
On Wed, Feb 24, 2016 at 07:32:17AM +0100, Sedat Dilek wrote:
> On Wed, Feb 24, 2016 at 6:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > Changes since 20160223:
> >
> ...
> > The aio tree still had a build failure so I used the version from
> > next-20160111.
> >
>
> Might be good to poke the maintainer as I am seeing this for a long
> time in Linux-next.
These are architecture code related build failures that arch maintainers
need to fix. Avoiding pulling the tree allows people to ignore the issue,
which isn't going to get things fixed. I provided an example how to
implement the 64 bit __get_user() without generating warnings, and it is
now up to maintainers to adapt it for their architecture.
-ben
> - Sedat -
--
"Thought is the essence of where you are now."
--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to majordomo@kvack.org. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"aart@kvack.org">aart@kvack.org</a>
^ permalink raw reply
* next-20160224 build: 1 failures 14 warnings (next-20160224)
From: Build bot for Mark Brown @ 2016-02-24 10:52 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160224
Git describe: next-20160224
Commit: 96aa08682d Add linux-next specific files for 20160224
Build Time: 137 min 26 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 7
Warnings: 14
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
Errors:
arm64-allmodconfig
../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
9 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
9 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
-------------------------------------------------------------------------------
Errors summary: 7
4 drivers/gpio/Kconfig:34:error: recursive dependency detected!
1 ../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
1 ../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
1 ../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
1 ../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
1 ../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
1 ../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
Warnings Summary: 14
7 <stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
4 ../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type '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/pci/host/pci-mvebu.c:904:16: warning: unused variable 'hw' [-Wunused-variable]
1 ../drivers/pci/host/pci-mvebu.c:841:40: warning: passing argument 1 of 'sys_to_pcie' from incompatible pointer type [-Wincompatible-pointer-types]
1 ../drivers/pci/host/pci-mvebu.c:839:44: warning: 'struct pci_sys_data' declared inside parameter list
1 ../drivers/pci/host/pci-mvebu.c:753:53: warning: its scope is only this definition or declaration, which is probably not what you want
1 ../drivers/pci/host/pci-mvebu.c:753:53: warning: 'struct pci_sys_data' declared inside parameter list
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=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 6 errors, 9 warnings, 0 section mismatches
Errors:
../drivers/pci/host/pci-mvebu.c:755:12: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:855:31: error: dereferencing pointer to incomplete type 'struct pci_sys_data'
../drivers/pci/host/pci-mvebu.c:904:16: error: storage size of 'hw' isn't known
../drivers/pci/host/pci-mvebu.c:919:2: error: implicit declaration of function 'pci_common_init_dev' [-Werror=implicit-function-declaration]
../drivers/pci/host/pci-mvebu.c:1282:3: error: implicit declaration of function 'pci_ioremap_io' [-Werror=implicit-function-declaration]
../drivers/watchdog/orion_wdt.c:109:2: error: implicit declaration of function 'atomic_io_modify' [-Werror=implicit-function-declaration]
Warnings:
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../include/linux/kern_levels.h:4:18: warning: field width specifier '*' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=]
../drivers/pci/host/pci-mvebu.c:753:53: warning: 'struct pci_sys_data' declared inside parameter list
../drivers/pci/host/pci-mvebu.c:753:53: warning: its scope is only this definition or declaration, which is probably not what you want
../drivers/pci/host/pci-mvebu.c:839:44: warning: 'struct pci_sys_data' declared inside parameter list
../drivers/pci/host/pci-mvebu.c:841:40: warning: passing argument 1 of 'sys_to_pcie' from incompatible pointer type [-Wincompatible-pointer-types]
../drivers/pci/host/pci-mvebu.c:904:16: warning: unused variable 'hw' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/gpio/Kconfig:34:error: recursive dependency detected!
drivers/gpio/Kconfig:34:error: recursive dependency detected!
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 9 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
../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]
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall madvisev not implemented [-Wcpp]
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 2 errors, 0 warnings, 0 section mismatches
Errors:
drivers/gpio/Kconfig:34:error: recursive dependency detected!
drivers/gpio/Kconfig:34:error: recursive dependency detected!
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the mac80211-next tree
From: Johannes Berg @ 2016-02-24 8:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Heikki Krogerus
In-Reply-To: <20160224115927.3fa9161e@canb.auug.org.au>
Hi Stephen,
> [...]
> include/linux/bug.h:74:2: note: in expansion of macro
> 'BUILD_BUG_ON_MSG'
> BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
> ^
> net/rfkill/core.c:647:2: note: in expansion of macro 'BUILD_BUG_ON'
> BUILD_BUG_ON(!rfkill_types[NUM_RFKILL_TYPES - 1]);
> ^
>
> Caused by commit
>
> 1f86443b4ffe ("net: rfkill: add rfkill_find_type function")
Thanks for the heads-up.
> Maybe the compiler version matters? I am using gcc v5.2.0.
Hm. I'm using Debian 5.3.1-8.
> Though, it seems to be that "!rfkill_types[NUM_RFKILL_TYPES - 1]" is
> not a constant expression since
>
> static const char *rfkill_types[NUM_RFKILL_TYPES]
>
> does not stop "rfkill_types[NUM_RFKILL_TYPES - 1]" being modified at
> run time. I think that you might need:
>
> static const char * const rfkill_types[NUM_RFKILL_TYPES]
That's true, but since I can't test it I'll just solve this
differently. We'll never be able to insert anything into the middle, so
we can also just BUILD_BUG_ON() the ARRAY_SIZE() and do the code a bit
differently.
Thanks,
johannes
^ permalink raw reply
* Re: linux-next: Tree for Feb 24
From: Sedat Dilek @ 2016-02-24 6:32 UTC (permalink / raw)
To: Benjamin LaHaise; +Cc: linux-next, LKML, Stephen Rothwell, linux-aio
In-Reply-To: <20160224163414.260db0ec@canb.auug.org.au>
On Wed, Feb 24, 2016 at 6:34 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20160223:
>
...
> The aio tree still had a build failure so I used the version from
> next-20160111.
>
Might be good to poke the maintainer as I am seeing this for a long
time in Linux-next.
- Sedat -
^ permalink raw reply
* linux-next: Tree for Feb 24
From: Stephen Rothwell @ 2016-02-24 5:34 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160223:
The arc tree gained conflicts against the arc-current tree.
The pci tree gained a conflict against the pci-current tree.
The mac80211-next tree gained a build failure so I used the version
from next-20160223.
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): 6570
5356 files changed, 246127 insertions(+), 121346 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 (4de8ebeff8dd Merge tag 'trace-fixes-v4.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
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 (0443ad7fb2eb ARC: SMP: No need for CONFIG_ARC_IPI_DBG)
Merging arm-current/fixes (c7edd7f99cda ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs)
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 (6ecad912a007 powerpc/ioda: Set "read" permission when "write" is set)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
Merging net/master (fb5eb24cdd5c Add Dell Wireless 5809e Gobi 4G HSPA+ Mobile Broadband Card (rev3) to qmi_wwan)
Merging ipsec/master (3ed01df4ff79 xfrm: Reset encapsulation field of the skb before transformation)
Merging ipvs/master (5acaf89f88b9 netfilter: ipvs: handle ip_vs_fill_iph_skb_off failure)
Merging wireless-drivers/master (c699404db182 Merge tag 'iwlwifi-for-kalle-2016-02-15' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (b86071528f32 cfg80211: stop critical protocol session upon disconnect event)
Merging sound-current/for-linus (7e31a0159461 ALSA: hda - Apply clock gate workaround to Skylake, too)
Merging pci-current/for-linus (9a091fd371f8 Merge branch 'pci/host-hv' into for-linus)
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (e5bdfd50d6f7 Revert "usb: hub: do not clear BOS field during reset device")
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (d061c1caa31d USB: option: add "4G LTE usb-modem U901")
Merging usb-chipidea-fixes/ci-for-usb-stable (8c0614ca312c usb: chipidea: fix return value check in ci_hdrc_pci_probe())
Merging staging.current/staging-linus (7a64cd887fdb drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE)
Merging char-misc.current/char-misc-linus (18558cae0272 Linux 4.5-rc4)
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 (9b18572e83bf drm/i915/gen9: Verify and enforce dc6 state writes)
Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
Merging arc/for-next (38a39d18e7b4 ARC: clockevent: Prepare for DT based probe)
CONFLICT (content): Merge conflict in arch/arc/kernel/intc-compact.c
CONFLICT (content): Merge conflict in arch/arc/Kconfig
Merging arm/for-next (113b44c6c25b Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (94085fe570e7 arm64: dts: Add Cavium ThunderX specific PMU)
Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
Merging at91/at91-next (799da647446d Merge tag 'at91-ab-4.6-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to 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 (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
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 (655f2d0d2295 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
Merging mvebu/for-next (98a5093dc516 Merge branch 'mvebu/dt64' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging omap/for-next (601052bca473 Merge branch 'omap-for-v4.6/dt' into for-next)
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (305d0c411114 ARM: qcom: Drop ARCH_MSM* configs)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (414811089a01 Merge branches 'heads/defconfig-for-v4.6' and 'heads/dt-for-v4.6' into next)
Merging rockchip/for-next (2def4fc4fc2d Merge branch 'v4.6-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c67b0b31311f Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (5e04a6344023 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6', 'sunxi/dt-for-4.6' and 'sunxi/defconfig-for-4.6' into sunxi/for-next)
Merging tegra/for-next (822a31bceba1 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (f98deee9a9f8 arm64: move brk immediate argument definitions to separate header)
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 (0cdfea013ee8 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 (f1cf93aed364 MIPS: tlb-r4k: panic if the MMU doesn't support PAGE_SIZE)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (56c08e6d226c powerpc: atomic: Implement acquire/release/relaxed variants for cmpxchg)
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 (13c6a790d77c s390/mm: correct comment about segment table entries)
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 (c4067a08c106 Merge branch 'for-next-4.6-20160223' into for-next-20160223)
Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
Merging cifs/for-next (81f70ba233d5 Linux 4.5-rc5)
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 (6332b9b5e797 ext4: Make Q_GETNEXTQUOTA work for quota in hidden inodes)
Merging ext4/dev (d89b5f6318c2 jbd2: save some atomic ops in __JI_COMMIT_RUNNING handling)
Merging f2fs/dev (80c4fd200a7c f2fs: avoid hungtask problem caused by losing wake_up)
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 (9fd4b9fc7695 NFSv4.x/pnfs: Fix a race between layoutget and bulk recalls)
Merging nfsd/nfsd-next (b7052cd7bcf3 sunrpc/cache: fix off-by-one in qword_get())
Merging orangefs/for-next (c1223ca48baa orangefs: get rid of op refcounts)
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 (e15c65b38461 Merge branch 'xfs-writepage-rework-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)
CONFLICT (content): Merge conflict in drivers/pci/probe.c
Merging hid/for-next (c2781579ce25 Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (4916eb690976 i2c: iproc: Support larger TX transfer)
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 (e1370715b20e ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel)
Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (c2fd1465f329 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (4477c1cdf1c4 Merge branch 'for-4.6' into for-next)
Merging pm/linux-next (9822c3f7f0de 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 (eb4fc33eb268 thermal: small style cleanup in mtk_thermal)
Merging ieee1394/for-next (575913946989 firewire: ABI documentation: jujuutils were renamed to linux-firewire-utils)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (7a02d9b6888e Merge branch 'topic/omap' into next)
Merging net-next/master (f5461c276316 Merge branch 'dsa-pass-bridge-to-drivers')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (d289cbed9d55 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue)
Merging bluetooth/master (ebba380cc946 ieee802154: 6lowpan: fix return of netdev notifier)
Merging mac80211-next/master (c4b29719e095 rfkill: Notify userspace of airplane-mode state changes)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
$ git reset --hard HEAD^
Merging next-20160223 version of mac80211-next
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
[master 425a286a2dda] next-20160223/mac80211-next
Merging rdma/for-next (18558cae0272 Linux 4.5-rc4)
Merging mtd/master (38714fbd299f MAINTAINERS: update Han's email)
Merging l2-mtd/master (3b5394a3ccff mtd: spi-nor: remove micron_quad_enable())
Merging crypto/master (49abc0d2e19b crypto: xts - fix compile errors)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in HEAD and modified in crypto/master. Version crypto/master of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging drm/drm-next (d2eaa59000c7 Merge branch 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/kernel-drm-rockchip into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
Applying: drm: fix bad merge of drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (6831f3e3c640 drm/i915: Add for_each_pipe_masked())
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (a6ddd2f1b99f drm/udl: Use module_usb_driver)
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 (a17ba6a39ed1 drm/msm: add timestamp param)
Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (fc04023fafec drm/vc4: Add support for YUV planes.)
Merging sound/for-next (fe0d128c57bf ALSA: jack: Allow building the jack layer without input device)
Merging sound-asoc/for-next (f2163caed70b Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/ssm4567', 'asoc/topic/sunxi', 'asoc/topic/topology' and 'asoc/topic/wm8974' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (6ccb1d8f78bd Input: add MELFAS MIP4 Touchscreen driver)
Merging block/for-next (ab3d8b3ecf77 Merge branch 'for-4.6/core' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging device-mapper/for-next (d27eb582b2bb dm: reorder 'struct mapped_device' members to fix alignment and holes)
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 (af3d6866825f mmc: sdhci-pltfm: remove priv variable from sdhci_pltfm_host)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (93ac96deff4c md: Drop sending a change uevent when stopping)
Merging mfd/for-mfd-next (103d8a7bb8a2 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 (b950762c3ba7 ARM: dts: n900: Rename isp1704 to isp1707 to match correct name)
Merging omap_dss2/for-next (f059c4b220b8 fbdev: exynos: fix IS_ERR_VALUE usage)
Merging regulator/for-next (69092c65e44e Merge remote-tracking branch 'regulator/topic/vexpress' into regulator-next)
Merging security/next (602094428090 Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (1926e54f1157 MAINTAINERS: Update mailing list for Renesas ARM64 SoC Development)
Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (a13b64591747 vfio/pci: Expose shadow ROM as PCI option ROM)
Merging jc_docs/docs-next (510e64fb0423 Doc: ARM: Fix a typo in clksrc-change-registers.awk)
Merging trivial/for-next (d00cd819d7df 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 (6338b8a12d0a Merge branches 'dt/linus' and 'dt/next' into for-next)
Merging mailbox/mailbox-for-next (be9c09bcca03 arm64: dts: mailbox device tree node for APM X-Gene platform.)
Merging spi/for-next (87f17882fe8e Merge remote-tracking branches 'spi/topic/sh' and 'spi/topic/ti-qspi' into spi-next)
Merging tip/auto-latest (a4a40d25e75d Merge branch 'x86/platform')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
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 (95d4f352d268 Merge branch 'irqchip/mvebu' 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 (efef127c30c5 Merge tag 'kvm-s390-next-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (67aaab4cff18 arm64: KVM: Move __cpu_init_stage2 after kvm_call_hyp)
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
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 (d3695aa4f452 KVM: PPC: Add support for multiple-TCE hcalls)
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 (23217b443b4b workqueue: Replace usage of init_name with dev_set_name())
Merging drivers-x86/for-next (2d905b3e74ad intel-hid: allocate correct amount of memory for private struct)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (10c43341ac84 Merge remote-tracking branches 'regmap/topic/doc', 'regmap/topic/irq', 'regmap/topic/stride' and 'regmap/topic/update-bits' into regmap-next)
Merging hsi/for-next (901bdbdb8cb6 HSI: omap-ssi: add clk change support)
Merging leds/for-next (94b0580b6768 leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a3f0b77f36ca sc16is7xx: implemented get_mctrl)
Merging usb/usb-next (a057c3259ab6 usb: dwc2: USB_DWC2 should depend on HAS_DMA)
Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
Merging usb-serial/usb-next (18558cae0272 Linux 4.5-rc4)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (c4e315884ed8 staging: lustre: Remove LASSERTS from router checker)
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
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.
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (35bf7692e765 mei: fix format string in debug prints)
Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
Merging cgroup/for-next (468de7d80707 Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (3f84575f934a 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 (683072c71ff1 Merge branch 'devel' into for-next)
Merging vhost/linux-next (b91608c87c59 vring: Use the DMA API on Xen)
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 (3cf42efc3479 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
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 (0cbb0b92689a Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (f073cd8a3e7b Merge branch 'clk-samsung' into clk-next)
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 (76e9d9ab63cd Makefile: add kselftest-merge)
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 (4c5e6154516b Merge branch 'for-4.5/upstream-fixes' into for-next)
Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (e1d7a40f67f7 rtc: rx8025: unsupport UIE mode)
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 (320a8eca8148 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in arch/x86/mm/extable.c
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Applying: x86/extable: remainder of revert of "x86/extable: use generic search and sort routines"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (c87875e89a0c drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ 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