* linux-next memleak after IO on dax mountpoint
From: Xiong Zhou @ 2016-05-27 8:46 UTC (permalink / raw)
To: sfr, axboe, linux-next, linux-nvdimm; +Cc: linux-kernel
Hi,
Reporting an oom/memleak issue in linux-next tree:
#Description:
dbench invokes oom-killer, make host unavaiable.
dbench was doing IO on nvdimm device mounted fs with dax mount option.
It happens on both xfs and ext4 filesystems.
It does not happen testing without dax mountoption.
Seems like memleak keep happening untill system run out of memory. On
good kernels, memory get freed after every dbench run.
#Hardware
lscpu
Architecture: x86_64
CPU op-mode(s): 32-bit, 64-bit
Byte Order: Little Endian
CPU(s): 48
On-line CPU(s) list: 0-47
Thread(s) per core: 2
Core(s) per socket: 12
Socket(s): 2
NUMA node(s): 2
Vendor ID: GenuineIntel
CPU family: 6
Model: 63
Model name: Intel(R) Xeon(R) CPU E5-2690 v3 @ 2.60GHz
Stepping: 2
CPU MHz: 2596.781
BogoMIPS: 5200.05
Virtualization: VT-x
L1d cache: 32K
L1i cache: 32K
L2 cache: 256K
L3 cache: 30720K
NUMA node0 CPU(s): 0-11,24-35
NUMA node1 CPU(s): 12-23,36-47
free -g
total used free shared buff/cache available
Mem: 31 0 30 0 0 30
Swap: 9 0 9
#Version:
Since next-20150517 tree, till latest 0526 tree.
0516 tree survives testing.
dbench version 4.00 - Copyright Andrew Tridgell 1999-2004
#How reproducible:
always
#Reproduce steps:
Repeating fstests[1] generic/241, 30 times, which maybe is relative
to system total ram.
#bisect info
Bisect point to this commit:
commit d6cab70166b5bf2cbeec0c566e51725c793e3aed
Merge: cb9553d 661806a
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue May 17 11:18:34 2016 +1000
Merge remote-tracking branch 'block/for-next'
which is forwarding to this:
commit 661806a319890962aaa839dc1dbf7ea356aa6b92
Merge: 1335822 b3a834b
Author: Jens Axboe <axboe@fb.com>
Date: Mon May 16 09:55:01 2016 -0600
Merge branch 'for-4.7/core' into for-next
On top of 0517 tree, reset --hard to commit cb9553d passed testing,
while reset --hard to commit d6cab70 reproduced issue.
Still working on to id which commit in this merge causes this issuer,
i noticed that lots of merge were going on there....
Meminfo, config, oom msg, bisect log are attached.
Thanks,
Xiong
[1] http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git
# Additional info
meminfo after running generic/241 7~8 rounds:
------ bad --------------
[root@host linux]# free
total used free shared buff/cache available
Mem: 32807280 422756 25782116 9456 6602408 26044756
Swap: 10485756 0 10485756
[root@host linux]# free -g
total used free shared buff/cache available
Mem: 31 0 24 0 6 24
Swap: 9 0 9
[root@host linux]# git log --oneline -1
d6cab70 Merge remote-tracking branch 'block/for-next'
[root@host linux]# echo 1 > /proc/sys/vm/drop_caches
[root@host linux]# echo 2 > /proc/sys/vm/drop_caches
[root@host linux]# echo 3 > /proc/sys/vm/drop_caches
[root@host linux]# free -g
total used free shared buff/cache available
Mem: 31 0 23 0 6 23
Swap: 9 0 9
[root@host linux]# free
total used free shared buff/cache available
Mem: 32807280 419576 25050868 9456 7336836 24938336
Swap: 10485756 0 10485756
-------- good ------------
[root@host linux]# free
total used free shared buff/cache available
Mem: 32807280 421316 30425892 9464 1960072 31884116
Swap: 10485756 0 10485756
[root@host linux]# free -g
total used free shared buff/cache available
Mem: 31 0 29 0 1 30
Swap: 9 0 9
[root@host linux]# echo 1 > /proc/sys/vm/drop_caches
[root@host linux]# echo 2 > /proc/sys/vm/drop_caches
[root@host linux]# echo 3 > /proc/sys/vm/drop_caches
[root@host linux]# free -g
total used free shared buff/cache available
Mem: 31 0 30 0 0 30
Swap: 9 0 9
[root@host linux]# free
total used free shared buff/cache available
Mem: 32807280 410820 32070196 9464 326264 31946400
Swap: 10485756 0 10485756
[root@host linux]# git log --oneline -1
cb9553d Merge remote-tracking branch 'input/next'
^ permalink raw reply
* linux-next: Tree for May 27
From: Stephen Rothwell @ 2016-05-27 3:23 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.8 destined material to your linux-next included
branches until after v4.7-rc1 has been released.
Changes since 20160526:
My fixes tree contains this:
mm/cma: silence warnings due to max() usage
Non-merge commits (relative to Linus' tree): 883
837 files changed, 28447 insertions(+), 10538 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 236 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (a10c38a4f385 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client)
Merging fixes/master (2f8d08a2e029 mm/cma: silence warnings due to max() usage)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (9ea46abe2255 sparc64: Take ctx_alloc_lock properly in hugetlb_setup().)
Merging net/master (b7e7ad611e24 Merge branch 'qed-fixes')
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (86c72d1ce91d ALSA: hda - Fix headset mic detection problem for one Dell machine)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty.current/tty-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb.current/usb-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc.current/char-misc-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging input-current/for-linus (affa80bd97f7 Input: uinput - handle compat ioctl for UI_SET_PHYS)
Merging crypto-current/master (ab6a11a7c8ef crypto: ccp - Fix AES XTS error for request sizes above 4096)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (d6be64b09dd1 Merge branch 'fixes' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (eb8e0105700b firmware: qcom_scm: Make core clock optional)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (7d3bce57b0ca MAINTAINERS: Add file patterns for mips device tree bindings)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (ecc5fbd5ef47 Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (5e19a42ac6d9 s390/cpuinfo: show dynamic and static cpu mhz)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (bdf03e59f8c1 Fix typo)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (d8642c37ded1 Merge branch 'for-next-next-4.7-20160525' into for-next-20160525)
Merging ceph/master (e536030934ae ceph: fix wake_up_session_cb())
Merging cifs/for-next (27d664b9b39c cifs: stuff the fl_owner into "pid" field in the lock request)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (b9d8905e4a75 reiserfs: check kstrdup failure)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (f6c658df6385 Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (29567292c0b5 Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (1b3c6d07e295 pnfs: make pnfs_layout_process more robust)
Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (c782aa1a515e Merge branch 'd_real' into overlayfs-next)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read)
Merging xfs/for-next (555b67e4e729 Merge branch 'xfs-4.7-inode-reclaim' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next)
Merging pci/next (31c4833c2879 Merge branch 'pci/pm' into next)
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d6760b14d4a1 i2c: dev: switch from register_chrdev to cdev API)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (fe520bf9f15b Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-core' and 'acpi-battery' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (88ac99063e6e Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next)
Merging net-next/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (7a226f9c32b0 staging/rdma: Remove the entire rdma subdirectory of staging)
Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6)
Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6)
Merging mtd/master (53b74ed2d0b4 Revert "mtd: atmel_nand: Support variable RB_EDGE interrupts")
Merging l2-mtd/master (4956b14738be Merge v4.6 into MTD -next branch)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging drm/drm-next (92181d47ee74 headers_check: don't warn about c++ guards)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (157d2c7fad08 drm/i915: Stop automatically retiring requests after a GPU hang)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (14fe29e8ef44 drm/doc: Drop vblank_disable_allow wording)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (c466cbed691a drm: hdlcd: Revamp runtime power management)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (19b79de25660 Merge tag 'regmap-v4.7' into regmap-linus)
Merging sound/for-next (86c72d1ce91d ALSA: hda - Fix headset mic detection problem for one Dell machine)
Merging sound-asoc/for-next (a5a3717a980c Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/ep93xx', 'asoc/fix/kirkwood' and 'asoc/fix/twl6040' into asoc-linus)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (c95d6d966e04 Input: tc3589x-keypad - remove stray ')')
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (15c094ad49c6 dm mpath: add optional "queue_mode" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (fc24637efecf Merge branch 'fixes' into next)
Merging md/for-next (412575807427 right meaning of PARITY_ENABLE_RMW and PARITY_PREFER_RMW)
Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus)
Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (540be8b2add1 MAINTAINERS: Add file patterns for watchdog device tree bindings)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (f2c27767af0a devicetree: Add Creative Technology vendor id)
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (c4e85b7e6ff7 Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (65fd15a016cc Merge branch 'perf/urgent')
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD)
Merging kvm/linux-next (fabc71286643 tools: kvm_stat: Add comments)
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (f4ac652dac99 platform/x86: Add PMC Driver for Intel Core SoC)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (87ae3810779d leds: core: Fix brightness setting upon hardware blinking enabled)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty/tty-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb/usb-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc/char-misc-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (332d8a2fd141 cgroup: set css->id to -1 during init)
Merging scsi/for-next (787ab6e97024 aacraid: do not activate events on non-SRC adapters)
Merging target-updates/for-next (e3d7097adab5 target: Fix missing complete during ABORT_TASK + CMD_T_FABRIC_STOP)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next)
Merging pinctrl/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging vhost/linux-next (bb991288728e ringtest: pass buf != NULL)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (da5cb422f15d Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (ef56b79b66fa clk: fix critical clock locking)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (f85f84cd36af coresight: Handle build path error)
Merging rtc/rtc-next (b9ba1eb03368 rtc: tps6586x: rename so module can be autoloaded)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
CONFLICT (content): Merge conflict in include/linux/radix-tree.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in fs/block_dev.c
Merging akpm-current/current (24fda78c8920 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/cma.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug
Merging akpm/master (91bcbb434c7f fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug)
^ permalink raw reply
* linux-next: build warning after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-05-27 3:07 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Michal Hocko
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
mm/oom_kill.c: In function '__oom_reap_task':
mm/oom_kill.c:537:2: warning: 'mm' may be used uninitialized in this function [-Wmaybe-uninitialized]
mmput_async(mm);
^
Introduced by commit
df1e2f56632d ("oom_reaper: close race with exiting task")
This is real - the first "goto unlock_oom" is before "mm" has been
assigned.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* mmotm 2016-05-26-15-51 uploaded
From: akpm @ 2016-05-26 22:51 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-05-26-15-51 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.6:
(patches marked "*" will be included in linux-next)
origin.patch
* seqlock-fix-raw_read_seqcount_latch.patch
* mm-make-config_deferred_struct_page_init-depends-on-flatmem-explicitly.patch
* mm-kasan-remove-unused-reserved-field-from-struct-kasan_alloc_meta.patch
* mm-slub-remove-unused-virt_to_obj.patch
* ocfs2-fix-improper-handling-of-return-errno.patch
* memcg-fix-mem_cgroup_out_of_memory-return-value.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix.patch
* dma-debug-avoid-spinlock-recursion-when-disabling-dma-debug.patch
* update-mm-zsmalloc-dont-fail-if-cant-create-debugfs-info.patch
* drivers-pinctrl-intel-pinctrl-baytrailc-fix-build-with-gcc-44.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* direct-io-fix-direct-write-stale-data-exposure-from-concurrent-buffered-read.patch
* mm-oom-do-not-reap-task-if-there-are-live-threads-in-threadgroup.patch
* maintainers-add-kexec_corec-and-kexec_filec.patch
* maintainers-kdump-maintainers-update.patch
* mm-use-early_pfn_to_nid-in-page_ext_init.patch
* mm-use-early_pfn_to_nid-in-register_page_bootmem_info_node.patch
* oom_reaper-close-race-with-exiting-task.patch
* oom_reaper-close-race-with-exiting-task-checkpatch-fixes.patch
* mm-thp-avoid-false-positive-vm_bug_on_page-in-page_move_anon_rmap.patch
* mm-cma-silence-warnings-due-to-max-usage.patch
* mm-cma-silence-warnings-due-to-max-usage-checkpatch-fixes.patch
* mm-memcontrol-fix-the-margin-computation-in-mem_cgroup_margin.patch
* mm-memcontrol-move-comments-for-get_mctgt_type-to-proper-position.patch
* mm-disable-deferred_struct_page_init-on-no_bootmem.patch
* mm-fix-overflow-in-vm_map_ram.patch
* kdump-fix-dmesg-gdbmacro-to-work-with-record-based-printk.patch
* memcg-add-rcu-locking-around-css_for_each_descendant_pre-in-memcg_offline_kmem.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-fix-a-redundant-re-initialization.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
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* mm-memcontrol-remove-the-useless-parameter-for-mc_handle_swap_pte.patch
* mm-init-fix-zone-boundary-creation.patch
* mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites.patch
* mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-fix.patch
* mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-fix-2.patch
* mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-checkpatch-fixes.patch
* memory-hotplug-add-move_pfn_range.patch
* memory-hotplug-more-general-validation-of-zone-during-online.patch
* memory-hotplug-use-zone_can_shift-for-sysfs-valid_zones-attribute.patch
* mm-memblock-if-nr_new-is-0-just-return.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
* mm-vmstat-calculate-particular-vm-event.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* lib-add-crc64-ecma-module.patch
* samples-kprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-jprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-kretprobe-convert-the-printk-to-pr_info-pr_err.patch
* samples-kretprobe-fix-the-wrong-type.patch
* kexec-return-error-number-directly.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* futex-fix-shared-futex-operations-on-nommu.patch
* kcov-allow-more-fine-grained-coverage-instrumentation.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-git-rejects.patch
* mm-make-optimistic-check-for-swapin-readahead-fix.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* fs-nfs-nfs4statec-work-around-gcc-44-union-initialization-bug.patch
mm-add-strictlimit-knob-v2.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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* next-20160526 build: 0 failures 4 warnings (next-20160526)
From: Build bot for Mark Brown @ 2016-05-26 9:46 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160526
Git describe: next-20160526
Commit: 71e75a2df0 Add linux-next specific files for 20160526
Build Time: 151 min 55 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 4
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
4 warnings 0 mismatches : arm64-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 4
1 ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allmodconfig
arm-allnoconfig
x86_64-allnoconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* linux-next: Tree for May 26
From: Stephen Rothwell @ 2016-05-26 4:20 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.8 destined material to your linux-next included
branches until after v4.7-rc1 has been released.
Changes since 20160525:
Non-merge commits (relative to Linus' tree): 1019
884 files changed, 34784 insertions(+), 11132 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 236 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (0985b65d3ba2 Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (9ea46abe2255 sparc64: Take ctx_alloc_lock properly in hugetlb_setup().)
Merging net/master (f6988cb63a4e team: don't call netdev_change_features under team->lock)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (86c72d1ce91d ALSA: hda - Fix headset mic detection problem for one Dell machine)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty.current/tty-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb.current/usb-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc.current/char-misc-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging input-current/for-linus (affa80bd97f7 Input: uinput - handle compat ioctl for UI_SET_PHYS)
Merging crypto-current/master (ab6a11a7c8ef crypto: ccp - Fix AES XTS error for request sizes above 4096)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (d6be64b09dd1 Merge branch 'fixes' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (eb8e0105700b firmware: qcom_scm: Make core clock optional)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (7d3bce57b0ca MAINTAINERS: Add file patterns for mips device tree bindings)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (ecc5fbd5ef47 Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (5e19a42ac6d9 s390/cpuinfo: show dynamic and static cpu mhz)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (bdf03e59f8c1 Fix typo)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (d8642c37ded1 Merge branch 'for-next-next-4.7-20160525' into for-next-20160525)
Merging ceph/master (e536030934ae ceph: fix wake_up_session_cb())
Merging cifs/for-next (27d664b9b39c cifs: stuff the fl_owner into "pid" field in the lock request)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (b9d8905e4a75 reiserfs: check kstrdup failure)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (f6c658df6385 Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (29567292c0b5 Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (1b3c6d07e295 pnfs: make pnfs_layout_process more robust)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c
CONFLICT (content): Merge conflict in fs/nfs/direct.c
Applying: nfs: fix for i_mutex to i_rwsem change
Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (c782aa1a515e Merge branch 'd_real' into overlayfs-next)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read)
Merging xfs/for-next (555b67e4e729 Merge branch 'xfs-4.7-inode-reclaim' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (51085a1f913a cifs: use C99 syntax for inode_operations initializer)
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
Merging pci/next (31c4833c2879 Merge branch 'pci/pm' into next)
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (5d22c5ab85e4 Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux)
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 (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (fe520bf9f15b Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-core' and 'acpi-battery' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (88ac99063e6e Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next)
Merging net-next/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (c16d2750a08c IB/mlx5: Fire the CQ completion handler from tasklet)
Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6)
Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6)
Merging mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging l2-mtd/master (4956b14738be Merge v4.6 into MTD -next branch)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging drm/drm-next (92181d47ee74 headers_check: don't warn about c++ guards)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (157d2c7fad08 drm/i915: Stop automatically retiring requests after a GPU hang)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (14fe29e8ef44 drm/doc: Drop vblank_disable_allow wording)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (c466cbed691a drm: hdlcd: Revamp runtime power management)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (19b79de25660 Merge tag 'regmap-v4.7' into regmap-linus)
Merging sound/for-next (86c72d1ce91d ALSA: hda - Fix headset mic detection problem for one Dell machine)
Merging sound-asoc/for-next (a5a3717a980c Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/ep93xx', 'asoc/fix/kirkwood' and 'asoc/fix/twl6040' into asoc-linus)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (c95d6d966e04 Input: tc3589x-keypad - remove stray ')')
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (fc24637efecf Merge branch 'fixes' into next)
Merging md/for-next (03b979dd0323 Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus)
Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (540be8b2add1 MAINTAINERS: Add file patterns for watchdog device tree bindings)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (f2c27767af0a devicetree: Add Creative Technology vendor id)
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (c4e85b7e6ff7 Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (65fd15a016cc Merge branch 'perf/urgent')
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD)
Merging kvm/linux-next (fabc71286643 tools: kvm_stat: Add comments)
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (9e48c88bdea6 dell-rbtn: Ignore ACPI notifications if device is suspended)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (87ae3810779d leds: core: Fix brightness setting upon hardware blinking enabled)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty/tty-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb/usb-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc/char-misc-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (787ab6e97024 aacraid: do not activate events on non-SRC adapters)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next)
Merging pinctrl/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging vhost/linux-next (bb991288728e ringtest: pass buf != NULL)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (da5cb422f15d Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (ef56b79b66fa clk: fix critical clock locking)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (f85f84cd36af coresight: Handle build path error)
Merging rtc/rtc-next (b9ba1eb03368 rtc: tps6586x: rename so module can be autoloaded)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
CONFLICT (content): Merge conflict in include/linux/radix-tree.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in fs/block_dev.c
Merging akpm-current/current (13b8d9242797 ipc/msg.c: use freezable blocking call)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug
Merging akpm/master (884cf63d0e57 fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug)
^ permalink raw reply
* next-20160525 build: 0 failures 4 warnings (next-20160525)
From: Build bot for Mark Brown @ 2016-05-25 7:07 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160525
Git describe: next-20160525
Commit: 08389fe28f Add linux-next specific files for 20160525
Build Time: 80 min 23 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 4
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
4 warnings 0 mismatches : arm64-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 4
1 ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allmodconfig
arm-allnoconfig
x86_64-allnoconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* linux-next: Tree for May 25
From: Stephen Rothwell @ 2016-05-25 3:44 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.8 destined material to your linux-next included
branches until after v4.7-rc1 has been released.
Changes since 20160524:
Non-merge commits (relative to Linus' tree): 978
876 files changed, 29717 insertions(+), 8810 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 236 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (28165ec7a99b Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (1d6da87a3241 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging net/master (a9efad8b24bd net_sched: avoid too many hrtimer_start() calls)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (7d727869c7b8 ALSA: hda/realtek - Add support for ALC295/ALC3254)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty.current/tty-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb.current/usb-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc.current/char-misc-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging input-current/for-linus (affa80bd97f7 Input: uinput - handle compat ioctl for UI_SET_PHYS)
Merging crypto-current/master (bad6a185b4d6 crypto: public_key: select CRYPTO_AKCIPHER)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (d6be64b09dd1 Merge branch 'fixes' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (eb8e0105700b firmware: qcom_scm: Make core clock optional)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (7d3bce57b0ca MAINTAINERS: Add file patterns for mips device tree bindings)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5fece5ad24ab parisc: Use long jump to reach ftrace_return_to_handler())
Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (5e19a42ac6d9 s390/cpuinfo: show dynamic and static cpu mhz)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (bdf03e59f8c1 Fix typo)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/dev-replace.c
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (3a18c7ca483e cifs: stuff the fl_owner into "pid" field in the lock request)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (7888824b0b1c udf: Use correct partition reference number for metadata)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
Merging f2fs/dev (f6c658df6385 Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (29567292c0b5 Merge tag 'for-linus-4.7-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (1b3c6d07e295 pnfs: make pnfs_layout_process more robust)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c
CONFLICT (content): Merge conflict in fs/nfs/direct.c
Applying: nfs: fix for i_mutex to i_rwsem change
Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels)
Merging orangefs/for-next (2dcd0af568b0 Linux 4.6)
Merging overlayfs/overlayfs-next (c782aa1a515e Merge branch 'd_real' into overlayfs-next)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read)
Merging xfs/for-next (555b67e4e729 Merge branch 'xfs-4.7-inode-reclaim' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (51085a1f913a cifs: use C99 syntax for inode_operations initializer)
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
Merging pci/next (31c4833c2879 Merge branch 'pci/pm' into next)
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (5d22c5ab85e4 Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux)
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 (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (fe520bf9f15b Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-core' and 'acpi-battery' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (88ac99063e6e Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next)
Merging net-next/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (c16d2750a08c IB/mlx5: Fire the CQ completion handler from tasklet)
Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6)
Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6)
Merging mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging l2-mtd/master (4956b14738be Merge v4.6 into MTD -next branch)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging drm/drm-next (92181d47ee74 headers_check: don't warn about c++ guards)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (157d2c7fad08 drm/i915: Stop automatically retiring requests after a GPU hang)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (14fe29e8ef44 drm/doc: Drop vblank_disable_allow wording)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (c466cbed691a drm: hdlcd: Revamp runtime power management)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (d4ab78d7076d Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (7d727869c7b8 ALSA: hda/realtek - Add support for ALC295/ALC3254)
Merging sound-asoc/for-next (349982487e26 Merge remote-tracking branches 'asoc/fix/ak4642' and 'asoc/fix/twl6040' into asoc-linus)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (4feacbc24eea Input: add new driver for the Surface 3)
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (fc24637efecf Merge branch 'fixes' into next)
Merging md/for-next (03b979dd0323 Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus)
Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (540be8b2add1 MAINTAINERS: Add file patterns for watchdog device tree bindings)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (f2c27767af0a devicetree: Add Creative Technology vendor id)
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (c4e85b7e6ff7 Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (65fd15a016cc Merge branch 'perf/urgent')
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD)
Merging kvm/linux-next (9842df62004f KVM: MTRR: remove MSR 0x2f8)
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (cfdfb45ff3be thinkpad_acpi: save kbdlight state on suspend and restore it on resume)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (87ae3810779d leds: core: Fix brightness setting upon hardware blinking enabled)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty/tty-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb/usb-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc/char-misc-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (787ab6e97024 aacraid: do not activate events on non-SRC adapters)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next)
Merging pinctrl/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging vhost/linux-next (bb991288728e ringtest: pass buf != NULL)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (da5cb422f15d Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (ef56b79b66fa clk: fix critical clock locking)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (f85f84cd36af coresight: Handle build path error)
Merging rtc/rtc-next (b9ba1eb03368 rtc: tps6586x: rename so module can be autoloaded)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
CONFLICT (content): Merge conflict in include/linux/radix-tree.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in fs/block_dev.c
Merging akpm-current/current (13b8d9242797 ipc/msg.c: use freezable blocking call)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug
Merging akpm/master (c15882017d15 fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug)
^ permalink raw reply
* Re: next-20160524 build: 1 failures 11 warnings (next-20160524)
From: Arnd Bergmann @ 2016-05-24 10:30 UTC (permalink / raw)
To: kernel-build-reports; +Cc: Build bot for Mark Brown, linaro-kernel, linux-next
In-Reply-To: <E1b58ra-0008G2-4W@optimist>
On Tuesday, May 24, 2016 10:42:59 AM CEST Build bot for Mark Brown wrote:
> ../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
> ../include/linux/page_idle.h:55:1: error: expected expression before '}' token
> ../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
> ../include/linux/page_idle.h:65:1: error: expected expression before '}' token
> ../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
> ../include/linux/page_idle.h:75:1: error: expected expression before '}' token
> ../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
> ../include/linux/page_idle.h:85:1: error: expected expression before '}' token
> ../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
> ../include/linux/page_idle.h:95:1: error: expected expression before '}' token
> ../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
> ../include/linux/page_idle.h:105:1: error: expected expression before '}' token
>
I sent this patch:
commit 0f8bc0e852f6b73bc7cf4c88f6320d7ee3a8fdd6
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue May 24 12:02:49 2016 +0200
[SUBMITTED 20160524] mm: fix build problems from lookup_page_ext
A patch for lookup_page_ext introduced several build errors and
warnings, e.g.
mm/page_owner.c: In function '__set_page_owner':
mm/page_owner.c:71:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
include/linux/page_idle.h: In function 'set_page_young':
include/linux/page_idle.h:62:3: error: expected ')' before 'return'
This fixes all of them. Please fold into the original patch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 38c4fffbad3c ("mm: check the return value of lookup_page_ext for all call sites")
diff --git a/include/linux/page_idle.h b/include/linux/page_idle.h
index 569c3a180625..fec40271339f 100644
--- a/include/linux/page_idle.h
+++ b/include/linux/page_idle.h
@@ -48,7 +48,7 @@ static inline bool page_is_young(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)
+ if (unlikely(!page_ext))
return false;
return test_bit(PAGE_EXT_YOUNG, &page_ext->flags);
@@ -58,7 +58,7 @@ static inline void set_page_young(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)
+ if (unlikely(!page_ext))
return;
set_bit(PAGE_EXT_YOUNG, &page_ext->flags);
@@ -68,7 +68,7 @@ static inline bool test_and_clear_page_young(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)
+ if (unlikely(!page_ext))
return false;
return test_and_clear_bit(PAGE_EXT_YOUNG, &page_ext->flags);
@@ -78,7 +78,7 @@ static inline bool page_is_idle(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)
+ if (unlikely(!page_ext))
return false;
return test_bit(PAGE_EXT_IDLE, &page_ext->flags);
@@ -88,7 +88,7 @@ static inline void set_page_idle(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)
+ if (unlikely(!page_ext))
return;
set_bit(PAGE_EXT_IDLE, &page_ext->flags);
@@ -98,7 +98,7 @@ static inline void clear_page_idle(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)
+ if (unlikely(!page_ext))
return;
clear_bit(PAGE_EXT_IDLE, &page_ext->flags);
diff --git a/mm/page_owner.c b/mm/page_owner.c
index 902e39813295..c6cda3e36212 100644
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -65,9 +65,6 @@ void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext))
- return;
-
struct stack_trace trace = {
.nr_entries = 0,
.max_entries = ARRAY_SIZE(page_ext->trace_entries),
@@ -75,6 +72,9 @@ void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask)
.skip = 3,
};
+ if (unlikely(!page_ext))
+ return;
+
save_stack_trace(&trace);
page_ext->order = order;
@@ -111,12 +111,11 @@ void __copy_page_owner(struct page *oldpage, struct page *newpage)
{
struct page_ext *old_ext = lookup_page_ext(oldpage);
struct page_ext *new_ext = lookup_page_ext(newpage);
+ int i;
if (unlikely(!old_ext || !new_ext))
return;
- int i;
-
new_ext->order = old_ext->order;
new_ext->gfp_mask = old_ext->gfp_mask;
new_ext->nr_entries = old_ext->nr_entries;
@@ -204,11 +203,6 @@ err:
void __dump_page_owner(struct page *page)
{
struct page_ext *page_ext = lookup_page_ext(page);
- if (unlikely(!page_ext)) {
- pr_alert("There is not page extension available.\n");
- return;
- }
-
struct stack_trace trace = {
.nr_entries = page_ext->nr_entries,
.entries = &page_ext->trace_entries[0],
@@ -216,6 +210,11 @@ void __dump_page_owner(struct page *page)
gfp_t gfp_mask = page_ext->gfp_mask;
int mt = gfpflags_to_migratetype(gfp_mask);
+ if (unlikely(!page_ext)) {
+ pr_alert("There is not page extension available.\n");
+ return;
+ }
+
if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags)) {
pr_alert("page_owner info is not active (free page?)\n");
return;
^ permalink raw reply related
* mmotm git tree since-4.6 branch created (was: mmotm 2016-05-23-16-51 uploaded)
From: Michal Hocko @ 2016-05-24 9:56 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, broonie
In-Reply-To: <57439797.36ht8abUxrU5hKGX%akpm@linux-foundation.org>
I have just created since-4.6 branch in mm git tree
(http://git.kernel.org/?p=linux/kernel/git/mhocko/mm.git;a=summary). It
is based on v4.6 tag in Linus tree and mmotm-2016-05-23-16-51.
As usual mmotm trees are tagged with signed tag
(finger print BB43 1E25 7FB8 660F F2F1 D22D 48E2 09A2 B310 E347)
The shortlog says:
Alexander Kuleshov (1):
mm/memblock.c: move memblock_{add,reserve}_region into memblock_{add,reserve}
Alexander Potapenko (3):
mm: kasan: initial memory quarantine implementation
mm, kasan: don't call kasan_krealloc() from ksize().
mm, kasan: add a ksize() test
Alexey Dobriyan (1):
seqlock: fix raw_read_seqcount_latch()
Andi Kleen (1):
kernek/fork.c: allocate idle task for a CPU always on its local node
Andrea Arcangeli (2):
mm: thp: microoptimize compound_mapcount()
mm: thp: split_huge_pmd_address() comment improvement
Andres Lagar-Cavilla (1):
tmpfs: mem_cgroup charge fault to vm_mm not current mm
Andrew Morton (7):
include/linux/nodemask.h: create next_node_in() helper
mm/hugetlb.c: use first_memory_node
mm/mempolicy.c:offset_il_node() document and clarify
mm: uninline page_mapped()
mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix-fix
mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-checkpatch-fixes
mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix
Andrey Ryabinin (6):
mm/kasan: print name of mem[set,cpy,move]() caller in report
mm/kasan: add API to check memory regions
x86/kasan: instrument user memory access API
kasan/tests: add tests for user memory access functions
mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
mm: slub: remove unused virt_to_obj()
Andy Shevchenko (11):
lib/vsprintf: simplify UUID printing
security/integrity/ima/ima_policy.c: use %pU to output UUID in printable format
lib/uuid.c: move generate_random_uuid() to uuid.c
lib/uuid.c: introduce a few more generic helpers
lib/uuid.c: remove FSF address
kernel/sysctl_binary.c: use generic UUID library
include/linux/efi.h: redefine type, constant, macro from generic code
fs/efivarfs/inode.c: use generic UUID library
include/linux/genhd.h: move to use generic UUID library
block/partitions/ldm.c: use generic UUID library
drivers/platform/x86/wmi.c: use generic UUID library
Arnd Bergmann (1):
kernel/padata.c: hide unused functions
Borislav Petkov (1):
locking/rwsem: Fix comment on register clobbering
Chanho Min (1):
mm/highmem: simplify is_highmem()
Chen Feng (1):
mm/compaction.c: fix zoneindex in kcompactd()
Chen Gang (2):
include/linux/hugetlb*.h: clean up code
include/linux/hugetlb.h: use bool instead of int for hugepage_migration_supported()
Chen Yucong (1):
mm/memory-failure.c: replace "MCE" with "Memory failure"
Chris Wilson (1):
mm/vmalloc: keep a separate lazy-free list
Christoph Lameter (1):
vmstat: get rid of the ugly cpu_stat_off variable
Corey Minyard (1):
kdump: fix gdb macros work work with newer and 64-bit kernels
Dan Streetman (3):
mm/zswap: use workqueue to destroy pool
mm/zsmalloc: don't fail if can't create debugfs info
update "mm/zsmalloc: don't fail if can't create debugfs info"
David Rientjes (3):
mm, hugetlb_cgroup: round limit_in_bytes down to hugepage size
mm, thp: khugepaged should scan when sleep value is written
mm, migrate: increment fail count on ENOMEM
Du, Changbin (8):
debugobjects: make fixup functions return bool instead of int
debugobjects: correct the usage of fixup call results
workqueue: update debugobjects fixup callbacks return type
timer: update debugobjects fixup callbacks return type
rcu: update debugobjects fixup callbacks return type
percpu_counter: update debugobjects fixup callbacks return type
Documentation: update debugobjects doc
debugobjects: insulate non-fixup logic related to static obj from fixup callbacks
Ebru Akagunduz (4):
mm: make optimistic check for swapin readahead
mm: make swapin readahead to improve thp collapse rate
mm, vmstat: calculate particular vm event
mm, thp: avoid unnecessary swapin in khugepaged
Eric Dumazet (1):
mm: tighten fault_in_pages_writeable()
Eric Engestrom (2):
Documentation: vm: fix spelling mistakes
MAINTAINERS: remove defunct spear mailing list
Eric Ren (1):
ocfs2: fix improper handling of return errno
Greg Thelen (1):
memcg: fix stale mem_cgroup_force_empty() comment
Hugh Dickins (8):
mm: update_lru_size warn and reset bad lru_size
mm: update_lru_size do the __mod_zone_page_state
mm: use __SetPageSwapBacked and dont ClearPageSwapBacked
tmpfs: preliminary minor tidyups
mm: /proc/sys/vm/stat_refresh to force vmstat update
huge mm: move_huge_pmd does not need new_vma
huge pagecache: extend mremap pmd rmap lockout to files
arch: fix has_transparent_hugepage()
Janis Danisevskis (1):
procfs: fix pthread cross-thread naming if !PR_DUMPABLE
Jiri Slaby (6):
mn10300: let exit_fpu accept a task
exit_thread: remove empty bodies
exit_thread: accept a task parameter to be exited
fork: free thread in copy_process on failure
MAINTAINERS: remove linux@lists.openrisc.net
MAINTAINERS: remove Koichi Yasutake
Johannes Weiner (1):
mm: filemap: only do access activations on reads
Joonsoo Kim (22):
mm/slab: fix the theoretical race by holding proper lock
mm/slab: remove BAD_ALIEN_MAGIC again
mm/slab: drain the free slab as much as possible
mm/slab: factor out kmem_cache_node initialization code
mm/slab: clean-up kmem_cache_node setup
mm/slab: don't keep free slabs if free_objects exceeds free_limit
mm/slab: racy access/modify the slab color
mm/slab: make cache_grow() handle the page allocated on arbitrary node
mm/slab: separate cache_grow() to two parts
mm/slab: refill cpu cache through a new slab without holding a node lock
mm/slab: lockless decision to grow cache
mm/page_ref: use page_ref helper instead of direct modification of _count
mm: rename _count, field of the struct page, to _refcount
mm/hugetlb: add same zone check in pfn_range_valid_gigantic()
mm/memory_hotplug: add comment to some functions related to memory hotplug
mm/vmstat: add zone range overlapping check
mm/page_owner: add zone range overlapping check
power: add zone range overlapping check
mm/writeback: correct dirty page calculation for highmem
mm/page_alloc: correct highmem memory statistics
mm/highmem: make nr_free_highpages() handles all highmem zones by itself
mm/vmstat: make node_page_state() handles all zones by itself
Julia Lawall (1):
nilfs2: constify nilfs_sc_operations structures
Kirill A. Shutemov (4):
mm: make faultaround produce old ptes
mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix
khugepaged: __collapse_huge_page_swapin(): drop unused 'pte' parameter
thp: do not hold anon_vma lock during swap in
Konstantin Khlebnikov (4):
mm/rmap: replace BUG_ON(anon_vma->degree) with VM_WARN_ON
mm/mmap: kill hook arch_rebalance_pgtables()
mm: enable RLIMIT_DATA by default with workaround for valgrind
arch/defconfig: remove CONFIG_RESOURCE_COUNTERS
Li Peng (1):
mm/slub.c: fix sysfs filename in comment
Li Zhang (1):
mm/page_alloc: Remove useless parameter of __free_pages_boot_core
Matthew Wilcox (36):
radix-tree: introduce radix_tree_empty
radix tree test suite: fix build
radix tree test suite: add tests for radix_tree_locate_item()
raxix-tree: introduce CONFIG_RADIX_TREE_MULTIORDER
radix-tree: add missing sibling entry functionality
radix-tree: fix sibling entry insertion
radix-tree: fix deleting a multi-order entry through an alias
radix-tree: remove restriction on multi-order entries
radix-tree: introduce radix_tree_load_root()
radix-tree: fix extending the tree for multi-order entries at offset 0
radix tree test suite: start adding multiorder tests
radix-tree: fix several shrinking bugs with multiorder entries
radix-tree: rewrite __radix_tree_lookup
radix-tree: fix multiorder BUG_ON in radix_tree_insert
radix-tree: fix radix_tree_create for sibling entries
radix-tree: rewrite radix_tree_locate_item
radix-tree: fix radix_tree_range_tag_if_tagged() for multiorder entries
radix-tree: add copyright statements
drivers/hwspinlock: use correct radix tree API
radix-tree: miscellaneous fixes
radix-tree: split node->path into offset and height
radix-tree: replace node->height with node->shift
radix-tree: remove a use of root->height from delete_node
radix tree test suite: remove dependencies on height
radix-tree: remove root->height
radix-tree: rename INDIRECT_PTR to INTERNAL_NODE
radix-tree: rename ptr_to_indirect() to node_to_entry()
radix-tree: rename indirect_to_ptr() to entry_to_node()
radix-tree: rename radix_tree_is_indirect_ptr()
radix-tree: change naming conventions in radix_tree_shrink
radix-tree: tidy up next_chunk
radix-tree: tidy up range_tag_if_tagged
radix-tree: tidy up __radix_tree_create()
radix-tree: introduce radix_tree_replace_clear_tags()
radix-tree: make radix_tree_descend() more useful
radix-tree: free up the bottom bit of exceptional entries for reuse
Mel Gorman (29):
mm, page_alloc: only check PageCompound for high-order pages
mm, page_alloc: use new PageAnonHead helper in the free page fast path
mm, page_alloc: reduce branches in zone_statistics
mm, page_alloc: inline zone_statistics
mm, page_alloc: inline the fast path of the zonelist iterator
mm, page_alloc: use __dec_zone_state for order-0 page allocation
mm, page_alloc: avoid unnecessary zone lookups during pageblock operations
mm, page_alloc: convert alloc_flags to unsigned
mm, page_alloc: convert nr_fair_skipped to bool
mm, page_alloc: remove unnecessary local variable in get_page_from_freelist
mm, page_alloc: remove unnecessary initialisation in get_page_from_freelist
mm, page_alloc: remove unnecessary initialisation from __alloc_pages_nodemask()
mm, page_alloc: simplify last cpupid reset
mm, page_alloc: move __GFP_HARDWALL modifications out of the fastpath
mm, page_alloc: check once if a zone has isolated pageblocks
mm, page_alloc: shorten the page allocator fast path
mm, page_alloc: reduce cost of fair zone allocation policy retry
mm, page_alloc: shortcut watermark checks for order-0 pages
mm, page_alloc: avoid looking up the first zone in a zonelist twice
mm, page_alloc: remove field from alloc_context
mm, page_alloc: check multiple page fields with a single branch
mm, page_alloc: un-inline the bad part of free_pages_check
mm, page_alloc: pull out side effects from free_pages_check
mm, page_alloc: remove unnecessary variable from free_pcppages_bulk
mm, page_alloc: inline pageblock lookup in page free fast paths
mm, page_alloc: defer debugging checks of freed pages until a PCP drain
mm, page_alloc: defer debugging checks of pages allocated from the PCP
mm, page_alloc: don't duplicate code in free_pcp_prepare
mm, page_alloc: restore the original nodemask if the fast path allocation failed
Michal Hocko (52):
locking/rwsem: Get rid of __down_write_nested()
locking/rwsem: Drop explicit memory barriers
locking/rwsem, xtensa: Drop superfluous arch specific implementation
locking/rwsem, sh: Drop superfluous arch specific implementation
locking/rwsem, sparc: Drop superfluous arch specific implementation
locking/rwsem: Introduce basis for down_write_killable()
locking/rwsem, alpha: Provide __down_write_killable()
locking/rwsem, ia64: Provide __down_write_killable()
locking/rwsem, s390: Provide __down_write_killable()
locking/rwsem, x86: Provide __down_write_killable()
locking/rwsem: Provide down_write_killable()
locking/rwsem, x86: Add frame annotation for call_rwsem_down_write_failed_killable()
mm/memcontrol.c:mem_cgroup_select_victim_node(): clarify comment
mm, oom: move GFP_NOFS check to out_of_memory
oom, oom_reaper: try to reap tasks which skip regular OOM killer path
mm, oom_reaper: clear TIF_MEMDIE for all tasks queued for oom_reaper
vmscan: consider classzone_idx in compaction_ready
mm, compaction: change COMPACT_ constants into enum
mm, compaction: cover all compaction mode in compact_zone
mm, compaction: distinguish COMPACT_DEFERRED from COMPACT_SKIPPED
mm, compaction: distinguish between full and partial COMPACT_COMPLETE
mm, compaction: update compaction_result ordering
mm, compaction: simplify __alloc_pages_direct_compact feedback interface
mm, compaction: abstract compaction feedback to helpers
mm, oom: rework oom detection
mm: throttle on IO only when there are too many dirty and writeback pages
mm, oom: protect !costly allocations some more
mm: consider compaction feedback also for costly allocation
mm, oom, compaction: prevent from should_compact_retry looping for ever for costly orders
mm, oom: protect !costly allocations some more for !CONFIG_COMPACTION
mm, oom_reaper: hide oom reaped tasks from OOM killer more carefully
mm, oom_reaper: do not mmput synchronously from the oom reaper context
oom: consider multi-threaded tasks in task_will_free_mem
mm: make mmap_sem for write waits killable for mm syscalls
mm: make vm_mmap killable
mm: make vm_munmap killable
mm, aout: handle vm_brk failures
mm, elf: handle vm_brk error
mm: make vm_brk killable
mm, proc: make clear_refs killable
mm, fork: make dup_mmap wait for mmap_sem for write killable
ipc, shm: make shmem attach/detach wait for mmap_sem killable
vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
coredump: make coredump_wait wait for mmap_sem for write killable
aio: make aio_setup_ring killable
exec: make exec path waiting for mmap_sem killable
prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
uprobes: wait for mmap_sem for write killable
drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
drm/radeon: make radeon_mn_get wait for mmap_sem killable
drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
mm: oom_reaper: remove some bloat
Mike Kravetz (1):
mm/hugetlb: optimize minimum size (min_size) accounting
Minchan Kim (5):
mm: disable fault around on emulated access bit architecture
zsmalloc: use first_page rather than page
zsmalloc: clean up many BUG_ON
zsmalloc: reorder function parameters
zsmalloc: remove unused pool param in obj_free
Minfei Huang (3):
mm: use existing helper to convert "on"/"off" to boolean
kexec: make a pair of map/unmap reserved pages in error path
kexec: do a cleanup for function kexec_load
Ming Li (1):
mm/swap.c: put activate_page_pvecs and other pagevecs together
Muhammad Falak R Wani (1):
drivers/memstick/core/mspro_block: use kmemdup
Naoya Horiguchi (1):
mm: check_new_page_bad() directly returns in __PG_HWPOISON case
NeilBrown (2):
MM: increase safety margin provided by PF_LESS_THROTTLE
dax: move RADIX_DAX_ definitions to dax.c
Oleg Nesterov (5):
userfaultfd: don't pin the user memory in userfaultfd_file_create()
wait/ptrace: assume __WALL if the child is traced
wait: allow sys_waitid() to accept __WNOTHREAD/__WCLONE/__WALL
signal: move the "sig < SIGRTMIN" check into siginmask(sig)
exec: remove the no longer needed remove_arg_zero()->free_arg_page()
Oleksandr Natalenko (1):
rtsx_usb_ms: use schedule_timeout_idle() in polling loop
Peter Zijlstra (1):
locking/rwsem: Fix down_write_killable()
Petr Mladek (4):
printk/nmi: generic solution for safe printk in NMI
printk/nmi: warn when some message has been lost in NMI context
printk/nmi: increase the size of NMI buffer and make it configurable
printk/nmi: flush NMI messages on the system panic
Ralf Baechle (1):
ELF/MIPS build fix
Rasmus Villemoes (2):
compiler.h: add support for malloc attribute
include/linux: apply __malloc attribute
René Nyffenegger (1):
include/linux/syscalls.h: use pid_t instead of int
Reza Arbab (3):
memory-hotplug: add move_pfn_range()
memory-hotplug: more general validation of zone during online
memory-hotplug: use zone_can_shift() for sysfs valid_zones attribute
Rich Felker (1):
tmpfs/ramfs: fix VM_MAYSHARE mappings for NOMMU
Richard Cochran (1):
kernel/padata.c: removed unused code
Richard Leitner (1):
mm/memblock.c: remove unnecessary always-true comparison
Richard W.M. Jones (1):
procfs: expose umask in /proc/<PID>/status
Rik van Riel (2):
mm: workingset: only do workingset activations on reads
mm: vmscan: reduce size of inactive file list
Ross Zwisler (12):
radix tree test suite: allow testing other fan-out values
radix tree test suite: keep regression test runs short
radix tree test suite: rebuild when headers change
radix-tree: remove unused looping macros
radix-tree: add support for multi-order iterating
radix tree test suite: multi-order iteration test
radix-tree: rewrite radix_tree_tag_set
radix-tree: rewrite radix_tree_tag_clear
radix-tree: rewrite radix_tree_tag_get
radix-tree test suite: add multi-order tag test
radix-tree: add test for radix_tree_locate_item()
radix-tree: fix radix_tree_dump() for multi-order entries
Ryusuke Konishi (18):
nilfs2: fix white space issue in nilfs_mount()
nilfs2: remove space before comma
nilfs2: remove FSF mailing address from GPL notices
nilfs2: clean up old e-mail addresses
MAINTAINERS: add web link for nilfs project
nilfs2: clarify permission to replicate the design
nilfs2: get rid of nilfs_mdt_mark_block_dirty()
nilfs2: move cleanup code of metadata file from inode routines
nilfs2: replace __attribute__((packed)) with __packed
nilfs2: add missing line spacing
nilfs2: clean trailing semicolons in macros
nilfs2: do not emit extra newline on nilfs_warning() and nilfs_error()
nilfs2: remove space before semicolon
nilfs2: fix code indent coding style issue
nilfs2: avoid bare use of 'unsigned'
nilfs2: remove unnecessary else after return or break
nilfs2: remove loops of single statement macros
nilfs2: fix block comments
Salah Triki (9):
fs/befs/datastream.c:befs_read_datastream(): remove unneeded initialization to NULL
fs/befs/datastream.c:befs_read_lsymlink(): remove unneeded initialization to NULL
fs/befs/datastream.c:befs_find_brun_dblindirect(): remove unneeded initializations to NULL
fs/befs/linuxvfs.c:befs_get_block(): remove unneeded initialization to NULL
fs/befs/linuxvfs.c:befs_iget(): remove unneeded initialization to NULL
fs/befs/linuxvfs.c:befs_iget(): remove unneeded raw_inode initialization to NULL
fs/befs/linuxvfs.c:befs_iget(): remove unneeded befs_nio initialization to NULL
fs/befs/io.c:befs_bread_iaddr(): remove unneeded initialization to NULL
fs/befs/io.c:befs_bread(): remove unneeded initialization to NULL
Sergey Senozhatsky (4):
zsmalloc: require GFP in zs_malloc()
zram: user per-cpu compression streams
zram: remove max_comp_streams internals
zram: introduce per-device debug_stat sysfs node
Stefan Bader (1):
mm: use phys_addr_t for reserve_bootmem_region() arguments
Sudip Mukherjee (1):
m32r: fix build failure
Tetsuo Handa (4):
mm,oom: speed up select_bad_process() loop
mm,writeback: don't use memory reserves for wb_start_writeback
signal: make oom_flags a bool
memcg: fix mem_cgroup_out_of_memory() return value.
Thomas Garnier (1):
mm: SLAB freelist randomization
Vaishali Thakkar (6):
mm/hugetlb: introduce hugetlb_bad_size()
arm64: mm: use hugetlb_bad_size()
metag: mm: use hugetlb_bad_size()
powerpc: mm: use hugetlb_bad_size()
tile: mm: use hugetlb_bad_size()
x86: mm: use hugetlb_bad_size()
Ville Syrjälä (1):
dma-debug: avoid spinlock recursion when disabling dma-debug
Vitaly Kuznetsov (2):
memory_hotplug: introduce CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE
memory_hotplug: introduce memhp_default_state= command line parameter
Vitaly Wool (1):
z3fold: the 3-fold allocator for compressed pages
Vladimir Davydov (3):
mm/slub.c: replace kick_all_cpus_sync() with synchronize_sched() in kmem_cache_shrink()
mm: memcontrol: fix possible css ref leak on oom
mm/khugepaged: fix scan not aborted on SCAN_EXCEED_SWAP_PTE
Vlastimil Babka (5):
mm, compaction: wrap calculating first and last pfn of pageblock
mm, compaction: reduce spurious pcplist drains
mm, compaction: skip blocks where isolation fails in async direct compaction
cpuset: use static key better and convert to new API
mm, page_alloc: uninline the bad page part of check_new_page()
Wang Xiaoqiang (1):
kernel/signal.c: convert printk(KERN_<LEVEL> ...) to pr_<level>(...)
Weijie Yang (1):
mm fix commmets: if SPARSEMEM, pgdata doesn't have page_ext
Xunlei Pang (3):
kexec: introduce a protection mechanism for the crashkernel reserved memory
kexec: provide arch_kexec_protect(unprotect)_crashkres()
s390/kexec: consolidate crash_map/unmap_reserved_pages() and arch_kexec_protect(unprotect)_crashkres()
Yang Shi (6):
mm: slab: remove ZONE_DMA_FLAG
mm: thp: simplify the implementation of mk_huge_pmd()
mm: page_is_guard(): return false when page_ext arrays are not allocated yet
mm: call page_ext_init() after all struct pages are initialized
mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
mm: check the return value of lookup_page_ext for all call sites
Yaowei Bai (4):
mm/hugetlb: is_vm_hugetlb_page() can return bool
mm/memory_hotplug: is_mem_section_removable() can return bool
mm/vmalloc.c: is_vmalloc_addr() can return bool
mm/mempolicy.c: vma_migratable() can return bool
Yongji Xie (1):
mm: fix incorrect pfn passed to untrack_pfn() in remap_pfn_range()
Yu Zhao (1):
mm: use unsigned long constant for page flags
Zhaoxiu Zeng (1):
lib/GCD.c: use binary GCD algorithm instead of Euclidean
nimisolo (1):
mm/memblock.c:memblock_add_range(): if nr_new is 0 just return
seokhoon.yoon (1):
mm, kasan: fix to call kasan_free_pages() after poisoning page
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* next-20160524 build: 1 failures 11 warnings (next-20160524)
From: Build bot for Mark Brown @ 2016-05-24 9:42 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160524
Git describe: next-20160524
Commit: 66c198deda Add linux-next specific files for 20160524
Build Time: 221 min 17 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 12
Warnings: 11
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
8 warnings 0 mismatches : arm64-allmodconfig
24 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 12
7 ../include/linux/page_idle.h:95:1: error: expected expression before '}' token
7 ../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
7 ../include/linux/page_idle.h:85:1: error: expected expression before '}' token
7 ../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
7 ../include/linux/page_idle.h:75:1: error: expected expression before '}' token
7 ../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
7 ../include/linux/page_idle.h:65:1: error: expected expression before '}' token
7 ../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
7 ../include/linux/page_idle.h:55:1: error: expected expression before '}' token
7 ../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
7 ../include/linux/page_idle.h:105:1: error: expected expression before '}' token
7 ../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
Warnings Summary: 11
7 ../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
7 ../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
7 ../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
2 ../mm/page_owner.c:71:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
2 ../mm/page_owner.c:212:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
2 ../mm/page_owner.c:118:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
2 ../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
1 ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 8 warnings, 0 section mismatches
Warnings:
../mm/page_owner.c:71:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
../mm/page_owner.c:118:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
../mm/page_owner.c:212:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 84 errors, 24 warnings, 0 section mismatches
Errors:
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
../include/linux/page_idle.h:52:3: error: expected ')' before 'return'
../include/linux/page_idle.h:55:1: error: expected expression before '}' token
../include/linux/page_idle.h:62:3: error: expected ')' before 'return'
../include/linux/page_idle.h:65:1: error: expected expression before '}' token
../include/linux/page_idle.h:72:3: error: expected ')' before 'return'
../include/linux/page_idle.h:75:1: error: expected expression before '}' token
../include/linux/page_idle.h:82:3: error: expected ')' before 'return'
../include/linux/page_idle.h:85:1: error: expected expression before '}' token
../include/linux/page_idle.h:92:3: error: expected ')' before 'return'
../include/linux/page_idle.h:95:1: error: expected expression before '}' token
../include/linux/page_idle.h:102:3: error: expected ')' before 'return'
../include/linux/page_idle.h:105:1: error: expected expression before '}' token
Warnings:
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
../mm/page_owner.c:71:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
../mm/page_owner.c:118:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
../mm/page_owner.c:212:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:55:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:75:1: warning: no return statement in function returning non-void [-Wreturn-type]
../include/linux/page_idle.h:85:1: warning: no return statement in function returning non-void [-Wreturn-type]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: Tree for May 17
From: Xiong Zhou @ 2016-05-24 4:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next, linux-kernel@vger.kernel.org
In-Reply-To: <20160523183755.412b335c@canb.auug.org.au>
Hi Stephen,
On Mon, May 23, 2016 at 4:37 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Xiong,
>
> On Mon, 23 May 2016 16:13:28 +0800 Xiong Zhou <jencce.kernel@gmail.com> wrote:
>>
>> hi,
>>
>> On Tue, May 17, 2016 at 1:04 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > 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
>>
>> Patches after 0516 are not there.
>>
>> i'm chasing an oom issue between 0516 and 0518 trees while missed
>> 0517 tag, so is the patch file the only way to get there trying 0517 tree?
>
> They are there, just the version numbering puts them out of order in the
> page listing - they appear before patch-v4.6-rc1-next-20160327.gz
Ya, my bad, i found them.
>
> All the (recent) tags are in the git tree as well, of course.
Yes! git fetch -t saved my mess git repo.
Thank you very much!
--
Xiong
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for May 24
From: Stephen Rothwell @ 2016-05-24 2:43 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.8 destined material to your linux-next included
branches until after v4.7-rc1 has been released.
Changes since 20160523:
The drm-intel tree lost its build failure.
Non-merge commits (relative to Linus' tree): 1334
1188 files changed, 42483 insertions(+), 14509 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 236 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (1d6da87a3241 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (1d6da87a3241 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
Merging net/master (54b9430f04b0 qed: signedness bug in qed_dcbx_process_tlv())
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (423cd785619a ALSA: hda - Fix headphone noise on Dell XPS 13 9360)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty.current/tty-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb.current/usb-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc.current/char-misc-linus (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging input-current/for-linus (affa80bd97f7 Input: uinput - handle compat ioctl for UI_SET_PHYS)
Merging crypto-current/master (bad6a185b4d6 crypto: public_key: select CRYPTO_AKCIPHER)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core)
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (74db14d8d952 Merge remote-tracking branch 'mainline/master' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (2dd0d1733417 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (592ddeeff8cb metag: Fix typos)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (7d3bce57b0ca MAINTAINERS: Add file patterns for mips device tree bindings)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (5e19a42ac6d9 s390/cpuinfo: show dynamic and static cpu mhz)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (bdf03e59f8c1 Fix typo)
CONFLICT (content): Merge conflict in arch/tile/Kconfig
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/dev-replace.c
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (7888824b0b1c udf: Use correct partition reference number for metadata)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/indirect.c
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging f2fs/dev (f6c658df6385 Merge tag 'for-f2fs-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (1b3c6d07e295 pnfs: make pnfs_layout_process more robust)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c
CONFLICT (content): Merge conflict in fs/nfs/direct.c
Applying: nfs: fix for i_mutex to i_rwsem change
Merging nfsd/nfsd-next (d9e4084f6c97 svcrdma: Generalize svc_rdma_xdr_decode_req())
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (c782aa1a515e Merge branch 'd_real' into overlayfs-next)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (555b67e4e729 Merge branch 'xfs-4.7-inode-reclaim' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (51085a1f913a cifs: use C99 syntax for inode_operations initializer)
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
Merging pci/next (31c4833c2879 Merge branch 'pci/pm' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (0b008267ec1b Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (fe520bf9f15b Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-core' and 'acpi-battery' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next)
Merging net-next/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (07b75260ebc2 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (c16d2750a08c IB/mlx5: Fire the CQ completion handler from tasklet)
Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6)
Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging drm/drm-next (a39ed680bddb drm/edid: add displayid detailed 1 timings to the modelist. (v1.1))
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (157d2c7fad08 drm/i915: Stop automatically retiring requests after a GPU hang)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (b80d3942329d drm/mm: avoid possible null pointer dereference)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (c466cbed691a drm: hdlcd: Revamp runtime power management)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (0c644e04ad1b Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (d4ab78d7076d Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (17e1717c11a3 ALSA: firewire-lib: change a member of event structure to suppress sparse wanings to bool type)
Merging sound-asoc/for-next (349982487e26 Merge remote-tracking branches 'asoc/fix/ak4642' and 'asoc/fix/twl6040' into asoc-linus)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (4feacbc24eea Input: add new driver for the Surface 3)
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (fc24637efecf Merge branch 'fixes' into next)
Merging md/for-next (03b979dd0323 Merge tag 'please-pull-misc-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus)
Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (540be8b2add1 MAINTAINERS: Add file patterns for watchdog device tree bindings)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes)
Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details)
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (f2c27767af0a devicetree: Add Creative Technology vendor id)
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (c4e85b7e6ff7 Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next)
Merging tip/auto-latest (65fd15a016cc Merge branch 'perf/urgent')
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID)
Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD)
Merging kvm/linux-next (9842df62004f KVM: MTRR: remove MSR 0x2f8)
Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16)
CONFLICT (content): Merge conflict in drivers/xen/efi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Applying: xen: efi: merge fix patch
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (d06784c21090 intel_menlow: reduce code duplication)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (f1da6e1a4721 MAINTAINERS: Add file patterns for led device tree bindings)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging tty/tty-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb/usb-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging char-misc/char-misc-next (5469dc270cd4 Merge branch 'akpm' (patches from Andrew))
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (787ab6e97024 aacraid: do not activate events on non-SRC adapters)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next)
Merging pinctrl/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging vhost/linux-next (09e1257c4af9 MAINTAINERS: Add file patterns for virtio device tree bindings)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (da5cb422f15d Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7639dad93a55 Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (ef56b79b66fa clk: fix critical clock locking)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (f85f84cd36af coresight: Handle build path error)
Merging rtc/rtc-next (b9ba1eb03368 rtc: tps6586x: rename so module can be autoloaded)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
CONFLICT (content): Merge conflict in include/linux/radix-tree.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in fs/block_dev.c
Merging akpm-current/current (b40abdc8a2ae ipc/msg.c: use freezable blocking call)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug
Merging akpm/master (31453caf3fbd fs/nfs/nfs4state.c: work around gcc-4.4 anon union initialization bug)
^ permalink raw reply
* [PATCH v4 4/4] watchdog: ebc-c384_wdt: Allow build for X86_64
From: William Breathitt Gray @ 2016-05-24 0:31 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, linux, William Breathitt Gray,
Wim Van Sebroeck
In-Reply-To: <cover.1464049539.git.vilhelm.gray@gmail.com>
With the introduction of the ISA_BUS_API Kconfig option, ISA-style
drivers may be built for X86_64 architectures. This patch changes the
ISA Kconfig option dependency of the WinSystems EBC-C384 watchdog timer
driver to ISA_BUS_API, thus allowing it to build for X86_64 as it is
expected to.
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b54f26c..3938e2d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -746,7 +746,7 @@ config ALIM7101_WDT
config EBC_C384_WDT
tristate "WinSystems EBC-C384 Watchdog Timer"
- depends on X86 && ISA
+ depends on ISA_BUS_API
select WATCHDOG_CORE
help
Enables watchdog timer support for the watchdog timer on the
--
2.7.3
^ permalink raw reply related
* [PATCH v4 3/4] iio: stx104: Allow build for X86_64
From: William Breathitt Gray @ 2016-05-24 0:31 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, linux, William Breathitt Gray,
Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
Jonathan Cameron
In-Reply-To: <cover.1464049539.git.vilhelm.gray@gmail.com>
With the introduction of the ISA_BUS_API Kconfig option, ISA-style
drivers may be built for X86_64 architectures. This patch changes the
ISA Kconfig option dependency of the Apex Embedded Systems STX104 DAC
driver to ISA_BUS_API, thus allowing it to build for X86_64 as it is
expected to.
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/iio/dac/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index e63b957..315442f 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -247,7 +247,7 @@ config MCP4922
config STX104
tristate "Apex Embedded Systems STX104 DAC driver"
- depends on X86 && ISA
+ depends on ISA_BUS_API
help
Say yes here to build support for the 2-channel DAC on the Apex
Embedded Systems STX104 integrated analog PC/104 card. The base port
--
2.7.3
^ permalink raw reply related
* [PATCH v4 2/4] gpio: Allow PC/104 devices on X86_64
From: William Breathitt Gray @ 2016-05-24 0:30 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, linux, William Breathitt Gray, Linus Walleij
In-Reply-To: <cover.1464049539.git.vilhelm.gray@gmail.com>
With the introduction of the ISA_BUS_API Kconfig option, ISA-style
drivers may be built for X86_64 architectures. This patch changes the
ISA Kconfig option dependency of the PC/104 drivers to ISA_BUS_API, thus
allowing them to build for X86_64 as they are expected to.
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/gpio/Kconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 48da857..dc6da77 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -530,7 +530,7 @@ menu "Port-mapped I/O GPIO drivers"
config GPIO_104_DIO_48E
tristate "ACCES 104-DIO-48E GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the ACCES 104-DIO-48E series (104-DIO-48E,
@@ -540,7 +540,7 @@ config GPIO_104_DIO_48E
config GPIO_104_IDIO_16
tristate "ACCES 104-IDIO-16 GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the ACCES 104-IDIO-16 family (104-IDIO-16,
@@ -551,7 +551,7 @@ config GPIO_104_IDIO_16
config GPIO_104_IDI_48
tristate "ACCES 104-IDI-48 GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the ACCES 104-IDI-48 family (104-IDI-48A,
@@ -627,7 +627,7 @@ config GPIO_TS5500
config GPIO_WS16C48
tristate "WinSystems WS16C48 GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the WinSystems WS16C48. The base port
--
2.7.3
^ permalink raw reply related
* [PATCH v4 1/4] isa: Allow ISA-style drivers on modern systems
From: William Breathitt Gray @ 2016-05-24 0:30 UTC (permalink / raw)
To: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-iio-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, sfr-3FnU+UHB4dNDw9hX6IcOSA,
linux-0h96xk9xTtrk1uMJSBkQmQ, William Breathitt Gray,
Linus Torvalds
In-Reply-To: <cover.1464049539.git.vilhelm.gray-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Several modern devices, such as PC/104 cards, are expected to run on
modern systems via an ISA bus interface. Since ISA is a legacy interface
for most modern architectures, ISA support should remain disabled in
general. Support for ISA-style drivers should be enabled on a per driver
basis.
To allow ISA-style drivers on modern systems, this patch introduces the
ISA_BUS_API and ISA_BUS Kconfig options. The ISA bus driver will now
build conditionally on the ISA_BUS_API Kconfig option, which defaults to
the legacy ISA Kconfig option. The ISA_BUS Kconfig option allows the
ISA_BUS_API Kconfig option to be selected on architectures which do not
enable ISA (e.g. X86_64).
The ISA_BUS Kconfig option is currently only implemented for X86
architectures. Other architectures may have their own ISA_BUS Kconfig
options added as required.
Cc: Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Signed-off-by: William Breathitt Gray <vilhelm.gray-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
arch/Kconfig | 3 +++
arch/x86/Kconfig | 9 +++++++++
drivers/base/Makefile | 2 +-
include/linux/isa.h | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index b16e74e..9d9942f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -598,6 +598,9 @@ config HAVE_STACK_VALIDATION
Architecture supports the 'objtool check' host tool command, which
performs compile-time stack metadata validation.
+config ISA_BUS_API
+ def_bool ISA
+
#
# ABI hall of shame
#
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0a7b885..d9a94da 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2439,6 +2439,15 @@ config PCI_CNB20LE_QUIRK
source "drivers/pci/Kconfig"
+config ISA_BUS
+ bool "ISA-style bus support on modern systems" if EXPERT
+ select ISA_BUS_API
+ help
+ Enables ISA-style drivers on modern systems. This is necessary to
+ support PC/104 devices on X86_64 platforms.
+
+ If unsure, say N.
+
# x86_64 have no ISA slots, but can have ISA-style DMA.
config ISA_DMA_API
bool "ISA-style DMA support" if (X86_64 && EXPERT)
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 6b2a84e..2609ba2 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
obj-y += power/
obj-$(CONFIG_HAS_DMA) += dma-mapping.o
obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
-obj-$(CONFIG_ISA) += isa.o
+obj-$(CONFIG_ISA_BUS_API) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o
obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
diff --git a/include/linux/isa.h b/include/linux/isa.h
index 5ab8528..384ab9b 100644
--- a/include/linux/isa.h
+++ b/include/linux/isa.h
@@ -22,7 +22,7 @@ struct isa_driver {
#define to_isa_driver(x) container_of((x), struct isa_driver, driver)
-#ifdef CONFIG_ISA
+#ifdef CONFIG_ISA_BUS_API
int isa_register_driver(struct isa_driver *, unsigned int);
void isa_unregister_driver(struct isa_driver *);
#else
--
2.7.3
^ permalink raw reply related
* [PATCH v4 0/4] Allow ISA-style drivers on modern systems
From: William Breathitt Gray @ 2016-05-24 0:30 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, linux, William Breathitt Gray
Changes in v4:
- Remove unnecessary explicit "default n" from the X86 ISA_BUS Kconfig
option since Kconfig options are disabled by default
Changes in v3:
- Remove redundant X86 dependency from the X86 ISA_BUS Kconfig option
Changes in v2:
- Adjusted preprocessor compilation conditional in include/linux/isa.h
to use CONFIG_ISA_BUS_API in order to link the correct ISA bus
driver function definitions when available
- Move ISA_BUS_API Kconfig option to arch/Kconfig, thus making it
available to all architectures instead of just X86
- X86 ISA_BUS Kconfig option should be disabled by default; ISA
devices typically do not have a way to be probed, so users should
be required to explicitly enable ISA bus driver support, lest a
selected driver be loaded with the misguided expectation of a safe
hardware probe
Several modern devices, such as PC/104 cards, are expected to run on
modern systems via an ISA bus interface. Since ISA is a legacy interface
for most modern architectures, ISA support should remain disabled in
general. Support for ISA-style drivers should be enabled on a per driver
basis.
To allow ISA-style drivers on modern systems, this patchset introduces
the ISA_BUS_API and ISA_BUS Kconfig options. The ISA bus driver will now
build conditionally on the ISA_BUS_API Kconfig option, which defaults to
the legacy ISA Kconfig option. The ISA_BUS Kconfig option allows the
ISA_BUS_API Kconfig option to be selected on architectures which do not
enable ISA (e.g. X86_64).
The ISA_BUS Kconfig option is currently only implemented for X86
architectures. Other architectures may have their own ISA_BUS Kconfig
option added as required.
An earlier attempt to allow the ISA bus driver to build for X86_64 took
an inappropriate approach resulting in legacy ISA drivers becoming
enabled unconditionally on untested and unsupported architectures.
Commit 51e68d055cba ("x86 isa: add back X86_32 dependency on
CONFIG_ISA"), added to restrict the ISA bus driver to only X86_32,
causes several drivers intended for X86_64 to be restricted to X86_32 as
well.
This patchset replaces the ISA Kconfig option dependency of several
drivers to ISA_BUS_API, so that they may build for X86_64 as intended.
The respective drivers are as follows:
* ACCES 104-IDIO-16 GPIO driver
* ACCES 104-IDI-48 GPIO driver
* ACCES 104-DIO-48E GPIO driver
* Apex Embedded Systems STX104 DAC driver
* WinSystems EBC-C384 watchdog timer driver
* WinSystems WS16C48 GPIO driver
William Breathitt Gray (4):
isa: Allow ISA-style drivers on modern systems
gpio: Allow PC/104 devices on X86_64
iio: stx104: Allow build for X86_64
watchdog: ebc-c384_wdt: Allow build for X86_64
arch/Kconfig | 3 +++
arch/x86/Kconfig | 9 +++++++++
drivers/base/Makefile | 2 +-
drivers/gpio/Kconfig | 8 ++++----
drivers/iio/dac/Kconfig | 2 +-
drivers/watchdog/Kconfig | 2 +-
include/linux/isa.h | 2 +-
7 files changed, 20 insertions(+), 8 deletions(-)
--
2.7.3
^ permalink raw reply
* Re: [PATCH v3 1/4] isa: Allow ISA-style drivers on modern systems
From: Guenter Roeck @ 2016-05-23 23:54 UTC (permalink / raw)
To: William Breathitt Gray
Cc: gregkh, akpm, x86, linux-next, linux-gpio, linux-iio,
linux-kernel, linux-watchdog, sfr, Linus Torvalds
In-Reply-To: <8b451e5892f0e610d7899f77be77b1cc57ce712b.1464044853.git.vilhelm.gray@gmail.com>
On Mon, May 23, 2016 at 07:13:31PM -0400, William Breathitt Gray wrote:
> Several modern devices, such as PC/104 cards, are expected to run on
> modern systems via an ISA bus interface. Since ISA is a legacy interface
> for most modern architectures, ISA support should remain disabled in
> general. Support for ISA-style drivers should be enabled on a per driver
> basis.
>
> To allow ISA-style drivers on modern systems, this patch introduces the
> ISA_BUS_API and ISA_BUS Kconfig options. The ISA bus driver will now
> build conditionally on the ISA_BUS_API Kconfig option, which defaults to
> the legacy ISA Kconfig option. The ISA_BUS Kconfig option allows the
> ISA_BUS_API Kconfig option to be selected on architectures which do not
> enable ISA (e.g. X86_64).
>
> The ISA_BUS Kconfig option is currently only implemented for X86
> architectures. Other architectures may have their own ISA_BUS Kconfig
> options added as required.
>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
> ---
> arch/Kconfig | 3 +++
> arch/x86/Kconfig | 10 ++++++++++
> drivers/base/Makefile | 2 +-
> include/linux/isa.h | 2 +-
> 4 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arch/Kconfig b/arch/Kconfig
> index b16e74e..9d9942f 100644
> --- a/arch/Kconfig
> +++ b/arch/Kconfig
> @@ -598,6 +598,9 @@ config HAVE_STACK_VALIDATION
> Architecture supports the 'objtool check' host tool command, which
> performs compile-time stack metadata validation.
>
> +config ISA_BUS_API
> + def_bool ISA
> +
> #
> # ABI hall of shame
> #
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 0a7b885..a5338a6 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -2439,6 +2439,16 @@ config PCI_CNB20LE_QUIRK
>
> source "drivers/pci/Kconfig"
>
> +config ISA_BUS
> + bool "ISA-style bus support on modern systems" if EXPERT
> + default n
I don't think an explicit "default n" is necessary.
> + select ISA_BUS_API
> + help
> + Enables ISA-style drivers on modern systems. This is necessary to
> + support PC/104 devices on X86_64 platforms.
> +
> + If unsure, say N.
> +
> # x86_64 have no ISA slots, but can have ISA-style DMA.
> config ISA_DMA_API
> bool "ISA-style DMA support" if (X86_64 && EXPERT)
> diff --git a/drivers/base/Makefile b/drivers/base/Makefile
> index 6b2a84e..2609ba2 100644
> --- a/drivers/base/Makefile
> +++ b/drivers/base/Makefile
> @@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
> obj-y += power/
> obj-$(CONFIG_HAS_DMA) += dma-mapping.o
> obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
> -obj-$(CONFIG_ISA) += isa.o
> +obj-$(CONFIG_ISA_BUS_API) += isa.o
> obj-$(CONFIG_FW_LOADER) += firmware_class.o
> obj-$(CONFIG_NUMA) += node.o
> obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
> diff --git a/include/linux/isa.h b/include/linux/isa.h
> index 5ab8528..384ab9b 100644
> --- a/include/linux/isa.h
> +++ b/include/linux/isa.h
> @@ -22,7 +22,7 @@ struct isa_driver {
>
> #define to_isa_driver(x) container_of((x), struct isa_driver, driver)
>
> -#ifdef CONFIG_ISA
> +#ifdef CONFIG_ISA_BUS_API
> int isa_register_driver(struct isa_driver *, unsigned int);
> void isa_unregister_driver(struct isa_driver *);
> #else
> --
> 2.7.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* mmotm 2016-05-23-16-51 uploaded
From: akpm @ 2016-05-23 23:51 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-05-23-16-51 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.6:
(patches marked "*" will be included in linux-next)
origin.patch
* m32r-fix-build-failure.patch
* elf-mips-build-fix.patch
* mm-memcontrol-fix-possible-css-ref-leak-on-oom.patch
* fs-befs-datastreamc-befs_read_datastream-remove-unneeded-initialization-to-null.patch
* fs-befs-datastreamc-befs_read_lsymlink-remove-unneeded-initialization-to-null.patch
* fs-befs-datastreamc-befs_find_brun_dblindirect-remove-unneeded-initializations-to-null.patch
* fs-befs-linuxvfsc-befs_get_block-remove-unneeded-initialization-to-null.patch
* fs-befs-linuxvfsc-befs_iget-remove-unneeded-initialization-to-null.patch
* fs-befs-linuxvfsc-befs_iget-remove-unneeded-raw_inode-initialization-to-null.patch
* fs-befs-linuxvfsc-befs_iget-remove-unneeded-befs_nio-initialization-to-null.patch
* fs-befs-ioc-befs_bread_iaddr-remove-unneeded-initialization-to-null.patch
* fs-befs-ioc-befs_bread-remove-unneeded-initialization-to-null.patch
* nilfs2-constify-nilfs_sc_operations-structures.patch
* nilfs2-fix-white-space-issue-in-nilfs_mount.patch
* nilfs2-remove-space-before-comma.patch
* nilfs2-remove-fsf-mailing-address-from-gpl-notices.patch
* nilfs2-clean-up-old-e-mail-addresses.patch
* maintainers-add-web-link-for-nilfs-project.patch
* nilfs2-clarify-permission-to-replicate-the-design.patch
* nilfs2-get-rid-of-nilfs_mdt_mark_block_dirty.patch
* nilfs2-move-cleanup-code-of-metadata-file-from-inode-routines.patch
* nilfs2-replace-__attribute__packed-with-__packed.patch
* nilfs2-add-missing-line-spacing.patch
* nilfs2-clean-trailing-semicolons-in-macros.patch
* nilfs2-do-not-emit-extra-newline-on-nilfs_warning-and-nilfs_error.patch
* nilfs2-remove-space-before-semicolon.patch
* nilfs2-fix-code-indent-coding-style-issue.patch
* nilfs2-avoid-bare-use-of-unsigned.patch
* nilfs2-remove-unnecessary-else-after-return-or-break.patch
* nilfs2-remove-loops-of-single-statement-macros.patch
* nilfs2-fix-block-comments.patch
* wait-ptrace-assume-__wall-if-the-child-is-traced.patch
* wait-allow-sys_waitid-to-accept-__wnothread-__wclone-__wall.patch
* signal-make-oom_flags-a-bool.patch
* kernel-signalc-convert-printkkern_level-to-pr_level.patch
* signal-move-the-sig-sigrtmin-check-into-siginmasksig.patch
* allocate-idle-task-for-a-cpu-always-on-its-local-node.patch
* exec-remove-the-no-longer-needed-remove_arg_zero-free_arg_page.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-make-a-pair-of-map-unmap-reserved-pages-in-error-path.patch
* kexec-do-a-cleanup-for-function-kexec_load.patch
* s390-kexec-consolidate-crash_map-unmap_reserved_pages-and-arch_kexec_protectunprotect_crashkres.patch
* kdump-fix-gdb-macros-work-work-with-newer-and-64-bit-kernels.patch
* rtsx_usb_ms-use-schedule_timeout_idle-in-polling-loop-v2.patch
* drivers-memstick-core-mspro_block-use-kmemdup.patch
* arch-defconfig-remove-config_resource_counters.patch
* scripts-gdb-adjust-module-reference-counter-reported-by-lx-lsmod.patch
* scripts-gdb-provide-linux-constants.patch
* scripts-gdb-provide-kernel-list-item-generators.patch
* scripts-gdb-convert-modules-usage-to-lists-functions.patch
* scripts-gdb-provide-exception-catching-parser.patch
* scripts-gdb-support-config_modules-gracefully.patch
* scripts-gdb-provide-a-dentry_name-vfs-path-helper.patch
* scripts-gdb-add-io-resource-readers.patch
* scripts-gdb-add-mount-point-list-command.patch
* scripts-gdb-add-cpu-iterators.patch
* scripts-gdb-cast-cpu-numbers-to-integer.patch
* scripts-gdb-add-a-radix-tree-parser.patch
* scripts-gdb-add-documentation-example-for-radix-tree.patch
* scripts-gdb-add-lx_thread_info_by_pid-helper.patch
* scripts-gdb-improve-types-abstraction-for-gdb-python-scripts.patch
* scripts-gdb-fix-issue-with-dmesgpy-and-python-3x.patch
* scripts-gdb-decode-bytestream-on-dmesg-for-python3.patch
* maintainers-add-co-maintainer-for-scripts-gdb.patch
* mm-make-mmap_sem-for-write-waits-killable-for-mm-syscalls.patch
* mm-make-vm_mmap-killable.patch
* mm-make-vm_munmap-killable.patch
* mm-aout-handle-vm_brk-failures.patch
* mm-elf-handle-vm_brk-error.patch
* mm-make-vm_brk-killable.patch
* mm-proc-make-clear_refs-killable.patch
* mm-fork-make-dup_mmap-wait-for-mmap_sem-for-write-killable.patch
* ipc-shm-make-shmem-attach-detach-wait-for-mmap_sem-killable.patch
* vdso-make-arch_setup_additional_pages-wait-for-mmap_sem-for-write-killable.patch
* coredump-make-coredump_wait-wait-for-mmap_sem-for-write-killable.patch
* aio-make-aio_setup_ring-killable.patch
* exec-make-exec-path-waiting-for-mmap_sem-killable.patch
* prctl-make-pr_set_thp_disable-wait-for-mmap_sem-killable.patch
* uprobes-wait-for-mmap_sem-for-write-killable.patch
* drm-i915-make-i915_gem_mmap_ioctl-wait-for-mmap_sem-killable.patch
* drm-radeon-make-radeon_mn_get-wait-for-mmap_sem-killable.patch
* drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable.patch
* kgdb-depends-on-vt.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* seqlock-fix-raw_read_seqcount_latch.patch
* mm-make-config_deferred_struct_page_init-depends-on-flatmem-explicitly.patch
* mm-kasan-remove-unused-reserved-field-from-struct-kasan_alloc_meta.patch
* mm-slub-remove-unused-virt_to_obj.patch
* ocfs2-fix-improper-handling-of-return-errno.patch
* memcg-fix-mem_cgroup_out_of_memory-return-value.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix-fix.patch
* dma-debug-avoid-spinlock-recursion-when-disabling-dma-debug.patch
* update-mm-zsmalloc-dont-fail-if-cant-create-debugfs-info.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-fix-a-redundant-re-initialization.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
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites.patch
* mm-check-the-return-value-of-lookup_page_ext-for-all-call-sites-checkpatch-fixes.patch
* memory-hotplug-add-move_pfn_range.patch
* memory-hotplug-more-general-validation-of-zone-during-online.patch
* memory-hotplug-use-zone_can_shift-for-sysfs-valid_zones-attribute.patch
* mm-memblock-if-nr_new-is-0-just-return.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
* mm-vmstat-calculate-particular-vm-event.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* lib-add-crc64-ecma-module.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* futex-fix-shared-futex-operations-on-nommu.patch
* kcov-allow-more-fine-grained-coverage-instrumentation.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
* mm-make-optimistic-check-for-swapin-readahead-fix.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* fs-nfs-nfs4statec-work-around-gcc-44-union-initialization-bug.patch
mm-add-strictlimit-knob-v2.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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* [PATCH v3 4/4] watchdog: ebc-c384_wdt: Allow build for X86_64
From: William Breathitt Gray @ 2016-05-23 23:14 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, William Breathitt Gray, Guenter Roeck,
Wim Van Sebroeck
In-Reply-To: <cover.1464044853.git.vilhelm.gray@gmail.com>
With the introduction of the ISA_BUS_API Kconfig option, ISA-style
drivers may be built for X86_64 architectures. This patch changes the
ISA Kconfig option dependency of the WinSystems EBC-C384 watchdog timer
driver to ISA_BUS_API, thus allowing it to build for X86_64 as it is
expected to.
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b54f26c..3938e2d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -746,7 +746,7 @@ config ALIM7101_WDT
config EBC_C384_WDT
tristate "WinSystems EBC-C384 Watchdog Timer"
- depends on X86 && ISA
+ depends on ISA_BUS_API
select WATCHDOG_CORE
help
Enables watchdog timer support for the watchdog timer on the
--
2.7.3
^ permalink raw reply related
* [PATCH v3 3/4] iio: stx104: Allow build for X86_64
From: William Breathitt Gray @ 2016-05-23 23:14 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, William Breathitt Gray, Hartmut Knaack,
Lars-Peter Clausen, Peter Meerwald-Stadler, Jonathan Cameron
In-Reply-To: <cover.1464044853.git.vilhelm.gray@gmail.com>
With the introduction of the ISA_BUS_API Kconfig option, ISA-style
drivers may be built for X86_64 architectures. This patch changes the
ISA Kconfig option dependency of the Apex Embedded Systems STX104 DAC
driver to ISA_BUS_API, thus allowing it to build for X86_64 as it is
expected to.
Cc: Hartmut Knaack <knaack.h@gmx.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/iio/dac/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
index e63b957..315442f 100644
--- a/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@ -247,7 +247,7 @@ config MCP4922
config STX104
tristate "Apex Embedded Systems STX104 DAC driver"
- depends on X86 && ISA
+ depends on ISA_BUS_API
help
Say yes here to build support for the 2-channel DAC on the Apex
Embedded Systems STX104 integrated analog PC/104 card. The base port
--
2.7.3
^ permalink raw reply related
* [PATCH v3 2/4] gpio: Allow PC/104 devices on X86_64
From: William Breathitt Gray @ 2016-05-23 23:13 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, William Breathitt Gray, Guenter Roeck,
Linus Walleij
In-Reply-To: <cover.1464044853.git.vilhelm.gray@gmail.com>
With the introduction of the ISA_BUS_API Kconfig option, ISA-style
drivers may be built for X86_64 architectures. This patch changes the
ISA Kconfig option dependency of the PC/104 drivers to ISA_BUS_API, thus
allowing them to build for X86_64 as they are expected to.
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
drivers/gpio/Kconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 48da857..dc6da77 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -530,7 +530,7 @@ menu "Port-mapped I/O GPIO drivers"
config GPIO_104_DIO_48E
tristate "ACCES 104-DIO-48E GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the ACCES 104-DIO-48E series (104-DIO-48E,
@@ -540,7 +540,7 @@ config GPIO_104_DIO_48E
config GPIO_104_IDIO_16
tristate "ACCES 104-IDIO-16 GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the ACCES 104-IDIO-16 family (104-IDIO-16,
@@ -551,7 +551,7 @@ config GPIO_104_IDIO_16
config GPIO_104_IDI_48
tristate "ACCES 104-IDI-48 GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the ACCES 104-IDI-48 family (104-IDI-48A,
@@ -627,7 +627,7 @@ config GPIO_TS5500
config GPIO_WS16C48
tristate "WinSystems WS16C48 GPIO support"
- depends on ISA
+ depends on ISA_BUS_API
select GPIOLIB_IRQCHIP
help
Enables GPIO support for the WinSystems WS16C48. The base port
--
2.7.3
^ permalink raw reply related
* [PATCH v3 1/4] isa: Allow ISA-style drivers on modern systems
From: William Breathitt Gray @ 2016-05-23 23:13 UTC (permalink / raw)
To: gregkh, akpm
Cc: x86, linux-next, linux-gpio, linux-iio, linux-kernel,
linux-watchdog, sfr, William Breathitt Gray, Linus Torvalds
In-Reply-To: <cover.1464044853.git.vilhelm.gray@gmail.com>
Several modern devices, such as PC/104 cards, are expected to run on
modern systems via an ISA bus interface. Since ISA is a legacy interface
for most modern architectures, ISA support should remain disabled in
general. Support for ISA-style drivers should be enabled on a per driver
basis.
To allow ISA-style drivers on modern systems, this patch introduces the
ISA_BUS_API and ISA_BUS Kconfig options. The ISA bus driver will now
build conditionally on the ISA_BUS_API Kconfig option, which defaults to
the legacy ISA Kconfig option. The ISA_BUS Kconfig option allows the
ISA_BUS_API Kconfig option to be selected on architectures which do not
enable ISA (e.g. X86_64).
The ISA_BUS Kconfig option is currently only implemented for X86
architectures. Other architectures may have their own ISA_BUS Kconfig
options added as required.
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
---
arch/Kconfig | 3 +++
arch/x86/Kconfig | 10 ++++++++++
drivers/base/Makefile | 2 +-
include/linux/isa.h | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index b16e74e..9d9942f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -598,6 +598,9 @@ config HAVE_STACK_VALIDATION
Architecture supports the 'objtool check' host tool command, which
performs compile-time stack metadata validation.
+config ISA_BUS_API
+ def_bool ISA
+
#
# ABI hall of shame
#
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0a7b885..a5338a6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2439,6 +2439,16 @@ config PCI_CNB20LE_QUIRK
source "drivers/pci/Kconfig"
+config ISA_BUS
+ bool "ISA-style bus support on modern systems" if EXPERT
+ default n
+ select ISA_BUS_API
+ help
+ Enables ISA-style drivers on modern systems. This is necessary to
+ support PC/104 devices on X86_64 platforms.
+
+ If unsure, say N.
+
# x86_64 have no ISA slots, but can have ISA-style DMA.
config ISA_DMA_API
bool "ISA-style DMA support" if (X86_64 && EXPERT)
diff --git a/drivers/base/Makefile b/drivers/base/Makefile
index 6b2a84e..2609ba2 100644
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o
obj-y += power/
obj-$(CONFIG_HAS_DMA) += dma-mapping.o
obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
-obj-$(CONFIG_ISA) += isa.o
+obj-$(CONFIG_ISA_BUS_API) += isa.o
obj-$(CONFIG_FW_LOADER) += firmware_class.o
obj-$(CONFIG_NUMA) += node.o
obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
diff --git a/include/linux/isa.h b/include/linux/isa.h
index 5ab8528..384ab9b 100644
--- a/include/linux/isa.h
+++ b/include/linux/isa.h
@@ -22,7 +22,7 @@ struct isa_driver {
#define to_isa_driver(x) container_of((x), struct isa_driver, driver)
-#ifdef CONFIG_ISA
+#ifdef CONFIG_ISA_BUS_API
int isa_register_driver(struct isa_driver *, unsigned int);
void isa_unregister_driver(struct isa_driver *);
#else
--
2.7.3
^ permalink raw reply related
* [PATCH v3 0/4] Allow ISA-style drivers on modern systems
From: William Breathitt Gray @ 2016-05-23 23:13 UTC (permalink / raw)
To: gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-gpio-u79uwXL29TY76Z2rM5mHXA,
linux-iio-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA, sfr-3FnU+UHB4dNDw9hX6IcOSA,
William Breathitt Gray
Changes in v3:
- Remove redundant X86 dependency from the X86 ISA_BUS Kconfig option
Changes in v2:
- Adjusted preprocessor compilation conditional in include/linux/isa.h
to use CONFIG_ISA_BUS_API in order to link the correct ISA bus
driver function definitions when available
- Move ISA_BUS_API Kconfig option to arch/Kconfig, thus making it
available to all architectures instead of just X86
- X86 ISA_BUS Kconfig option should be disabled by default; ISA
devices typically do not have a way to be probed, so users should
be required to explicitly enable ISA bus driver support, lest a
selected driver be loaded with the misguided expectation of a safe
hardware probe
Several modern devices, such as PC/104 cards, are expected to run on
modern systems via an ISA bus interface. Since ISA is a legacy interface
for most modern architectures, ISA support should remain disabled in
general. Support for ISA-style drivers should be enabled on a per driver
basis.
To allow ISA-style drivers on modern systems, this patchset introduces
the ISA_BUS_API and ISA_BUS Kconfig options. The ISA bus driver will now
build conditionally on the ISA_BUS_API Kconfig option, which defaults to
the legacy ISA Kconfig option. The ISA_BUS Kconfig option allows the
ISA_BUS_API Kconfig option to be selected on architectures which do not
enable ISA (e.g. X86_64).
The ISA_BUS Kconfig option is currently only implemented for X86
architectures. Other architectures may have their own ISA_BUS Kconfig
option added as required.
An earlier attempt to allow the ISA bus driver to build for X86_64 took
an inappropriate approach resulting in legacy ISA drivers becoming
enabled unconditionally on untested and unsupported architectures.
Commit 51e68d055cba ("x86 isa: add back X86_32 dependency on
CONFIG_ISA"), added to restrict the ISA bus driver to only X86_32,
causes several drivers intended for X86_64 to be restricted to X86_32 as
well.
This patchset replaces the ISA Kconfig option dependency of several
drivers to ISA_BUS_API, so that they may build for X86_64 as intended.
The respective drivers are as follows:
* ACCES 104-IDIO-16 GPIO driver
* ACCES 104-IDI-48 GPIO driver
* ACCES 104-DIO-48E GPIO driver
* Apex Embedded Systems STX104 DAC driver
* WinSystems EBC-C384 watchdog timer driver
* WinSystems WS16C48 GPIO driver
William Breathitt Gray (4):
isa: Allow ISA-style drivers on modern systems
gpio: Allow PC/104 devices on X86_64
iio: stx104: Allow build for X86_64
watchdog: ebc-c384_wdt: Allow build for X86_64
arch/Kconfig | 3 +++
arch/x86/Kconfig | 10 ++++++++++
drivers/base/Makefile | 2 +-
drivers/gpio/Kconfig | 8 ++++----
drivers/iio/dac/Kconfig | 2 +-
drivers/watchdog/Kconfig | 2 +-
include/linux/isa.h | 2 +-
7 files changed, 21 insertions(+), 8 deletions(-)
--
2.7.3
^ 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