* Re: linux-next: build failure after merge of the aio tree
From: Stephen Rothwell @ 2016-01-15 2:24 UTC (permalink / raw)
To: Benjamin LaHaise; +Cc: linux-next, linux-kernel
In-Reply-To: <20160112164034.0fe945a7@canb.auug.org.au>
Hi Benjamin,
On Tue, 12 Jan 2016 16:40:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the aio tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> fs/built-in.o: In function `aio_thread_op_foo_at':
> file.c:(.text+0x43808): undefined reference to `__get_user_bad'
> file.c:(.text+0x43838): undefined reference to `__get_user_bad'
>
> Caused by commit
>
> 150a0b4905f1 ("aio: add support for async openat()")
>
> I have used the aio tree from next-20160111 for today.
I am still getting this error.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* linux-next: manual merge of the drivers-x86 tree with Linus' tree
From: Stephen Rothwell @ 2016-01-15 1:56 UTC (permalink / raw)
To: Darren Hart
Cc: linux-next, linux-kernel, Hans de Goede, Rafael J. Wysocki,
Pali Rohár
Hi Darren,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/platform/x86/dell-wmi.c
between commit:
61679c725553 ("dell-wmi: Use acpi_video_handles_brightness_key_presses()")
from Linus' tree and commit:
6129570931b8 ("dell-wmi: Check if Dell WMI descriptor structure is valid")
from the drivers-x86 tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/platform/x86/dell-wmi.c
index cb8a9c2a3a1f,5db9efbde5b9..000000000000
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@@ -42,8 -44,13 +44,12 @@@ MODULE_DESCRIPTION("Dell laptop WMI hot
MODULE_LICENSE("GPL");
#define DELL_EVENT_GUID "9DBB5994-A997-11DA-B012-B622A1EF5492"
+ #define DELL_DESCRIPTOR_GUID "8D9DDCBC-A997-11DA-B012-B622A1EF5492"
+
-static int acpi_video;
+ static u32 dell_wmi_interface_version;
MODULE_ALIAS("wmi:"DELL_EVENT_GUID);
+ MODULE_ALIAS("wmi:"DELL_DESCRIPTOR_GUID);
/*
* Certain keys are flagged as KE_IGNORE. All of these are either
@@@ -396,7 -520,12 +520,11 @@@ static int __init dell_wmi_init(void
return -ENODEV;
}
+ err = dell_wmi_check_descriptor_buffer();
+ if (err)
+ return err;
+
dmi_walk(find_hk_type, NULL);
- acpi_video = acpi_video_get_backlight_type() != acpi_backlight_vendor;
err = dell_wmi_input_setup();
if (err)
^ permalink raw reply
* next-20160114 build: 0 failures 6 warnings (next-20160114)
From: Build bot for Mark Brown @ 2016-01-14 11:39 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160114
Git describe: next-20160114
Commit: 0908339089 Add linux-next specific files for 20160114
Build Time: 153 min 35 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 6
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
4 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 6
7 <stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
1 ../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Jan 14
From: Stephen Rothwell @ 2016-01-14 4:43 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any material for v4.6 to your linux-next included
branches until after v4.5-rc1 is released.
Changes since 20160113:
The aio tree still had a build failure so I used the version from
next-20160111.
The akpm-current tree lost its build failure.
The akpm tree still had its build failure that I just left broken for now.
Non-merge commits (relative to Linus' tree): 5330
4913 files changed, 281452 insertions(+), 102282 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 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 powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc,
sparc64 and arm defconfig.
Below is a summary of the state of the merge.
I am currently merging 238 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (77a76b04d2be Merge tag 'media/v4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed)
Merging m68k-current/for-linus (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys())
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (afd2ff9b7e1b Linux 4.4)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging net/master (701a0fd52318 hip04_eth: fix missing error handle for build_skb failed)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings)
Merging wireless-drivers/master (01d85b9b2b6b Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (cf1e05c63642 mac80211: handle width changes from opmode notification IE in beacon)
Merging sound-current/for-linus (ee8413b01045 ALSA: timer: Fix double unlink of active_list)
Merging pci-current/for-linus (5c3b99d05752 PCI: dra7xx: Mark driver as broken)
Merging driver-core.current/driver-core-linus (afd2ff9b7e1b Linux 4.4)
Merging tty.current/tty-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb.current/usb-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set)
Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging input-current/for-linus (009f77383651 Merge branch 'next' into for-linus)
Merging crypto-current/master (cd7e98414462 crypto: algif_skcipher - Add key check exception for cipher_null)
Merging ide/master (1b1050cdc5cd 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 (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode")
Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf)
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 (afd2ff9b7e1b Linux 4.4)
Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page)
Merging arc/for-next (4dc0323fd6bd ARCv2: STAR 9000950267: Handle return from intr to Delay Slot #2)
Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next)
CONFLICT (content): Merge conflict in drivers/tty/serial/amba-pl011.c
Merging arm-perf/for-next/perf (8fcf04067cb5 Revert "arm64: kernel: enforce pmuserenr_el0 initialization and restore")
Merging arm-soc/for-next (ce504c3d4750 ARM: SoC: document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.)
Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836)
Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver)
Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig)
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 (c6abe665c94f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (64c3c928aef2 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (95c5bf2f0552 Merge branch 'omap-for-v4.4/fixes' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs)
Merging renesas/next (23a0d0a54a30 Merge branch 'heads/dt-fixes-for-v4.5' into next)
Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next)
Merging tegra/for-next (92b100361a4e Merge branch for-4.5/defconfig into for-next)
Merging arm64/for-next/core (2a803c4db615 arm64: head.S: use memset to clear BSS)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (2039b162f1cc Merge remote-tracking branch 'origin/master' into h8300-next)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys())
Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (544f742d0c2a Merge branch '4.4-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (9105b4a82439 parisc: Protect huge page pte changes with spinlocks)
Merging powerpc/next (a61674bdfc7c powerpc/module: Handle R_PPC64_ENTRY relocations)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c2ab7282f0fc s390/sclp: fix possible control register corruption)
CONFLICT (content): Merge conflict in drivers/s390/char/zcore.c
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (544f7d5a408e numa: remove stale node_has_online_mem() define)
Merging uml/linux-next (3e46b2537632 um: Use race-free temporary file creation)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only)
Merging cifs/for-next (181a15048df3 [SMB3] Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (bb00c898ad1c udf: Check output buffer length when converting name to CS0)
Merging ext4/dev (9f053aee1bb8 fs: clean up the flags definition in uapi/linux/fs.h)
Merging f2fs/dev (447135a86659 f2fs: should unset atomic flag after successful commit)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (67990608c8b9 Merge tag 'pm+acpi-4.5-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (44aab3e09ef9 NFS: Fix a compile warning about unused variable in nfs_generic_pg_pgios())
CONFLICT (content): Merge conflict in fs/nfs/nfs4file.c
Merging nfsd/nfsd-next (ed97e830390a NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (dde7f55bd000 Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next)
Merging file-locks/linux-next (b4d629a39e10 locks: rename __posix_lock_file to posix_lock_inode)
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
Merging pci/next (5c6c026b3867 Merge branch 'pci/trivial' into next)
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging hid/for-next (86243f383145 Merge branch 'for-4.5/logitech' into for-next)
Merging i2c/i2c/for-next (4c7916427953 Merge branch 'i2c/for-4.5' into i2c/for-next)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging jdelvare-hwmon/master (ef0303d2bba0 hwmon: (emc2103) Fix typo in MODULE_PARM_DESC)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (91918d13eb17 hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards)
Merging v4l-dvb/master (fef24ea1b8c1 Merge branch 'topic/media-controller' into to_next)
Merging kbuild/for-next (9ab3e1d71e55 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (44858e07ff87 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (43576081fbb1 Merge branch 'pm-core' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (efa2498bb842 Merge branches 'thermal-core', 'thermal-soc' and 'thermal-intel' into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (45f29dde4d57 Merge branch 'fixes' into next)
Merging net-next/master (725da8dee445 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning)
Merging wireless-drivers-next/master (42e0ed0d454c brcmfmac: Do not handle link downs for ibss.)
Merging bluetooth/master (8e69d71996e4 Bluetooth: add LED trigger for indicating HCI is powered up)
Merging mac80211-next/master (e6a0cd058e1b mac80211: Don't buffer non-bufferable MMPDUs)
Merging rdma/for-next (59caaed7a72a IB/iser: Support the remote invalidation exception)
CONFLICT (content): Merge conflict in include/linux/mlx5/vport.h
CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h
CONFLICT (content): Merge conflict in include/linux/mlx5/device.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/vport.c
Applying: fixup! Merge remote-tracking branch 'gerrit/ib-next' into HEAD
Applying: IB/mlx5: merge fix for mlx5_ib_port_link_layer API change
Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging l2-mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (e9c5e7402dad drm/amdgpu: add missing irq.h include)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (48ea1e32c39d drm/i915/gen9: Set PIN_ZONE_4G end to 4GB - 1 page)
Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC)
Merging drm-misc/topic/drm-misc (d122cbf1a310 drm/sysfs: use kobj_to_dev())
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (40eb4e27aa20 arm64: Juno: Add HDLCD support to the Juno boards.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (ee8413b01045 ALSA: timer: Fix double unlink of active_list)
Merging sound-asoc/for-next (108915e8535a Merge tag 'asoc-v4.4-rc8' into asoc-next)
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
Merging input/next (809d9516da73 Input: gpio-keys - allow disabling individual buttons in DT)
Merging block/for-next (bb1192dd3fad Merge branch 'for-4.5/drivers' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/lightnvm.c
CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile
Applying: nvme: merge fix up for ns code movement
Merging device-mapper/for-next (385277bfb57f dm snapshot: fix hung bios when copy error occurs)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (01a999e48995 mmc: dw_mmc: remove the unused quirks)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (649ce6e4af6d raid5-cache: handle journal hotadd in quiesce)
Merging mfd/for-mfd-next (f7e5cc49a39f mfd: davinci_voicecodec: Remove pointless 'out of memory' error message)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (6b9140f39c2a power: test_power: correctly handle empty writes)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (d3bd4e0a5fd4 Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next)
Merging security/next (607259e17b37 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next)
Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
Merging selinux/next (76319946f321 selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (ac36856fe432 watchdog: asm9260: remove __init and __exit annotations)
Merging iommu/next (dabc4de14132 Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86/amd' and 'x86/vt-d' into next)
Merging dwmw2-iommu/master (e57e58bd390a iommu/vt-d: Fix mm refcounting to hold mm_count not mm_users)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (000afe892ed6 DMA-API: fix confusing sentence in Documentation/DMA-API.txt)
Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static)
Merging audit/next (09eccd1da92b audit: always enable syscall auditing when supported and audit is enabled)
CONFLICT (content): Merge conflict in kernel/audit.c
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (183223770ae8 drivers/of: Export OF changeset functions)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (cabeea980879 Merge remote-tracking branches 'spi/topic/sun4i', 'spi/topic/topcliff-pch' and 'spi/topic/zynq' into spi-next)
Merging tip/auto-latest (5852b88267ad Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (1cac5503fbf7 EDAC, i5100: Use to_delayed_work())
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (5156dca34a3e ftrace: Fix the race between ftrace and insmod)
Merging rcu/rcu/next (984cf355aeaa sysrq: Fix warning in sysrq generated crash.)
Merging kvm/linux-next (45bdbcfdf241 kvm: x86: Fix vmwrite to SECONDARY_VM_EXEC_CONTROL)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (696066f875bc KVM: PPC: Increase memslots to 512)
Merging kvms390/next (c6e5f166373a KVM: s390: implement the RI support of guest)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (6201171e3b2c workqueue: simplify the apply_workqueue_attrs_locked())
Merging drivers-x86/for-next (15adbe5ba066 tc1100-wmi: fix build warning when CONFIG_PM not enabled)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (6cb07abcc318 Merge remote-tracking branches 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/seq' into regmap-next)
Merging hsi/for-next (525e1abc6b5a HSI: omap_ssi_port: fix handling of_get_named_gpio result)
Merging leds/for-next (522f17e1214c leds: add HAS_IOMEM dependency to LEDS_BCM6328/LEDS_BCM6358)
Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.)
Merging driver-core/driver-core-next (afd2ff9b7e1b Linux 4.4)
Merging tty/tty-next (041497eb721d drivers/tty/serial: delete unused MODULE_DEVICE_TABLE from atmel_serial.c)
Merging usb/usb-next (60d77b3d2229 MAINTAINERS: change my email address)
Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM)
Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages)
Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry)
Merging staging/staging-next (841e3ed977e0 Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC.")
Merging char-misc/char-misc-next (ed6dc538e5a3 mei: fix fasync return value on error)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (36ae3fad335f Merge branch 'for-4.5' into for-next)
Merging scsi/for-next (f6817f3450cb Merge branch 'misc' into for-next)
Merging target-updates/for-next (4c1a6448e1ee target: Obtain se_node_acl->acl_kref during get_initiator_node_acl)
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (14da0a91bf4a pinctrl: mediatek: Modify pinctrl bindings for mt2701)
Merging vhost/linux-next (43e361f23c49 checkpatch: add virt barriers)
CONFLICT (content): Merge conflict in include/asm-generic/barrier.h
CONFLICT (content): Merge conflict in arch/s390/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/ia64/include/asm/barrier.h
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (de06c1db255f gpio: xilinx: Do not use gpiochip_get_data() in xgpio_save_regs())
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (074726402b82 pwm: omap-dmtimer: Potential NULL dereference on error)
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (b360ada3f153 Merge tag 'tegra-for-4.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-next)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (514c11dabdf2 aio: fix a compiler warning on 32 bit architectures in aio_renameat())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (1b1fe542b6f0 selftests: firmware: add empty string and async tests)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (8735f8e16a70 selftests/x86: Add tests for UC_SIGCONTEXT_SS and UC_STRICT_RESTORE_SS)
Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)
Merging livepatching/for-next (5dc5f4089332 Merge branch 'for-4.5/core' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c
Merging coresight/next (d2b29c2f35a2 coresight: Fix a typo in Kconfig)
Merging rtc/rtc-next (079062b28fb4 rtc: cmos: prevent kernel warning on IRQ flags mismatch)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (8b63b6bfc1a5 Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm)
Merging akpm-current/current (00b51fa02c0f ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in scripts/tags.sh
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (content): Merge conflict in include/linux/memblock.h
CONFLICT (content): Merge conflict in fs/block_dev.c
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable_64.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/64/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs"
Applying: mm, dax, gpu: merge fix for convert vm_insert_mixed to pfn_t
Applying: mm, dax: convert vmf_insert_pfn_pmd() to pfn_t fix
Applying: fix up for bad merge of arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs/overlayfs/super.c needs pagemap.h
Applying: fs/adfs/adfs.h: tidy up comments
Applying: iio: core: fix ptr_ret.cocci warnings
Applying: dma-mapping: make the generic coherent dma mmap implementation optional
Applying: arc: convert to dma_map_ops
Applying: arc: dma mapping fixes
Applying: ARC: dma mapping fixes #2
Applying: avr32: convert to dma_map_ops
Applying: blackfin: convert to dma_map_ops
Applying: c6x: convert to dma_map_ops
Applying: C6X: fix build breakage
Applying: c6x: dma mapping fixes
Applying: cris: convert to dma_map_ops
Applying: nios2: convert to dma_map_ops
Applying: nios2: dma mapping fixes
Applying: frv: convert to dma_map_ops
Applying: parisc: convert to dma_map_ops
Applying: mn10300: convert to dma_map_ops
Applying: m68k: convert to dma_map_ops
Applying: metag: convert to dma_map_ops
Applying: sparc: use generic dma_set_mask
Applying: tile: uninline dma_set_mask
Applying: dma-mapping: always provide the dma_map_ops based implementation
Applying: HAVE_DMA_ATTRS: remove leftovers in Kconfig
Applying: dma-mapping: remove <asm-generic/dma-coherent.h>
Applying: dma-mapping: use offset_in_page macro
Applying: memstick: use sector_div instead of do_div
Applying: mm: memcontrol: drop unused @css argument in memcg_init_kmem
Applying: mm: memcontrol: remove double kmem page_counter init
Applying: mm: memcontrol: give the kmem states more descriptive names
Applying: mm: memcontrol: group kmem init and exit functions together
Applying: mm: memcontrol: separate kmem code from legacy tcp accounting code
Applying: mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix
Applying: mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
Applying: mm: memcontrol: allow to disable kmem accounting for cgroup2
Applying: mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
Applying: mm: memcontrol: only manage socket pressure for CONFIG_INET
Applying: net: drop tcp_memcontrol.c
Applying: net-drop-tcp_memcontrolc-fix
Applying: mm: memcontrol: rein in the CONFIG space madness
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix-fix
Applying: mm: memcontrol: flatten struct cg_proto
Applying: mm: memcontrol: clean up alloc, online, offline, free functions
Applying: mm: memcontrol: clean up alloc, online, offline, free functions fix
Applying: memcg: fix SLOB build regression
Applying: mm: memcontrol: charge swap to cgroup2
Applying: mm: vmscan: pass memcg to get_scan_count()
Applying: mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
Applying: swap.h: move memcg related stuff to the end of the file
Applying: mm: vmscan: do not scan anon pages if memcg swap limit is hit
Applying: mm: free swap cache aggressively if memcg swap is full
Applying: Documentation: cgroup: add memory.swap.{current,max} description
Applying: MAINTAINERS: add git URL for APM driver
Applying: MAINTAINERS: add git URL for at91
Applying: MAINTAINERS: add git URL for Rockchip
Applying: MAINTAINERS: add git URL for ARM64
Applying: MAINTAINERS: update git URL for ath6kl
Applying: MAINTAINERS: add git URL for backlight
Applying: MAINTAINERS: add git URL for chrome
Applying: MAINTAINERS: add git URL for cris
Applying: MAINTAINERS: add git URL for cryptodev
Applying: MAINTAINERS: add git URL for devfreq
Applying: MAINTAINERS: update git URL for DLM
Applying: MAINTAINERS: add git URL for eCryptfs
Applying: MAINTAINERS: add git URL for ext4
Applying: MAINTAINERS: add git URL for hwspinlock
Applying: MAINTAINERS: add git URL for integrity
Applying: MAINTAINERS: add git URL for IPVS
Applying: MAINTAINERS: add git URL for nfsd
Applying: MAINTAINERS: add git URL for KVM/s390
Applying: MAINTAINERS: add git URL for kgdb
Applying: MAINTAINERS: add git URL for nvdimm
Applying: MAINTAINERS: add git URL for metag
Applying: MAINTAINERS: add git URL for wireless drivers
Applying: MAINTAINERS: add git URL for devicetree
Applying: MAINTAINERS: update git URL for PCMCIA
Applying: MAINTAINERS: update git URL for pstore
Applying: MAINTAINERS: update git URL for ath10k
Applying: MAINTAINERS: add git URL for hexagon
Applying: MAINTAINERS: add git URL for reset
Applying: MAINTAINERS: add git URL for s390
Applying: MAINTAINERS: fix tree format for SAMSUNG thermal
Applying: MAINTAINERS: add git URL for md
Applying: MAINTAINERS: add git URL for squashfs
Applying: MAINTAINERS: add git URL for swiotlb
Applying: MAINTAINERS: add git URL for xtensa
Applying: MAINTAINERS: fix tree format for TPM
Applying: MAINTAINERS: add git URL for UML
Applying: MAINTAINERS: add git URL for VFIO
Applying: MAINTAINERS: add git URL for vhost
Applying: MAINTAINERS: update git URL for XFS
Applying: MAINTAINERS: fix MIC maintainers entry
Applying: dax: fix NULL pointer dereference in __dax_dbg()
Applying: dax: fix conversion of holes to PMDs
Applying: pmem: add wb_cache_pmem() to the PMEM API
Applying: pmem-add-wb_cache_pmem-to-the-pmem-api-v6
Applying: dax: support dirty DAX entries in radix tree
Applying: dax-support-dirty-dax-entries-in-radix-tree-v6
Applying: mm: add find_get_entries_tag()
Applying: dax: add support for fsync/sync
Applying: dax-add-support-for-fsync-sync-v6
Applying: dax: fix dax_pmd_dbg build warning
Applying: dax: add support for fsync/msync
Applying: dax-add-support-for-fsync-msync-v8
Applying: ext2: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: ext4: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: xfs: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: tree wide: use kvfree() than conditional kfree()/vfree()
Merging akpm/master (18da8d410e37 tree wide: use kvfree() than conditional kfree()/vfree())
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm tree
From: Stephen Rothwell @ 2016-01-14 4:15 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
In-Reply-To: <20151231232210.7ab890f1@canb.auug.org.au>
Hi Andrew,
On Thu, 31 Dec 2015 23:22:10 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the akpm tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> sound/core/compress_offload.c: In function 'snd_compr_ioctl':
> /home/sfr/next/next/sound/core/compress_offload.c:804:2: error: case label does not reduce to an integer constant
> case _IOC_NR(SNDRV_COMPRESS_GET_CODEC_CAPS):
> ^
>
> I have no idea what caused that and have just left it broken for now.
I am still getting this. Something in mmotm is causing or exposing this.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* next-20160113 build: 0 failures 6 warnings (next-20160113)
From: Build bot for Mark Brown @ 2016-01-13 17:23 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160113
Git describe: next-20160113
Commit: 2f2b3c440e Add linux-next specific files for 20160113
Build Time: 213 min 8 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 6
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
4 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 6
7 <stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
1 ../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: mmotm git tree since-4.4 branch created (was: mmotm 2016-01-12-16-44 uploaded)
From: Michal Hocko @ 2016-01-13 15:10 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, broonie
In-Reply-To: <20160113134211.GD28942@dhcp22.suse.cz>
On Wed 13-01-16 14:42:11, Michal Hocko wrote:
> I have just created since-4.4 branch in mm git tree
> (http://git.kernel.org/?p=linux/kernel/git/mhocko/mm.git;a=summary). It
> is based on v4.4 tag in Linus tree and mmotm-2016-01-12-16-44.
>
> As usual mmotm trees are tagged with signed tag
> (finger print BB43 1E25 7FB8 660F F2F1 D22D 48E2 09A2 B310 E347)
Unfortunatelly my scripts have missed the whole post-linux-next section
in the series file. So the last push didn't have many patches. This
is now fixed. I have overwritten the previous tag but the change is
incremental (aka no rebase...):
The shortlog says:
Alexander Kuleshov (3):
mm/memblock: remove rgnbase and rgnsize variables
mm/memblock: introduce for_each_memblock_type()
mm/page_alloc.c: remove unused struct zone *z variable
Alexey Klimov (1):
mm/mlock.c: drop unneeded initialization in munlock_vma_pages_range()
Andrea Arcangeli (2):
ksm: introduce ksm_max_page_sharing per page deduplication limit
ksm: validate STABLE_NODE_DUP_HEAD conditional to gcc version
Andrew Morton (29):
account-certain-kmem-allocations-to-memcg-checkpatch-fixes
include-define-__phys_to_pfn-as-phys_pfn-fix
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes
mm-zonelist-enumerate-zonelists-array-index-fix
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes
fs/block_dev.c:bdev_write_page(): use blk_queue_enter(..., GFP_NOIO)
arm64-mm-support-arch_mmap_rnd_bits-fix
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2
mm-fs-obey-gfp_mapping-for-add_to_page_cache-fix
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix
mm-hwpoison-adjust-for-new-thp-refcounting-fix
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes
thp-add-debugfs-handle-to-split-all-huge-pages-fix
mm-support-madvisemadv_free-fix-2-fix
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3
mm-oom-rework-oom-detection-checkpatch-fixes
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes
sched: add schedule_timeout_idle()
mm-mlockc-change-can_do_mlock-return-value-type-to-boolean-fix
mm-page_allocc-introduce-kernelcore=mirror-option-fix
mm/page_alloc.c: rework code layout in memmap_init_zone()
mm-hugetlbfs-unmap-pages-if-page-fault-raced-with-hole-punch-fix
mm-soft-offline-exit-with-failure-for-non-anonymous-thp-fix
net-drop-tcp_memcontrolc-fix
mm-memcontrol-reign-in-the-config-space-madness-fix
mm-memcontrol-reign-in-the-config-space-madness-fix-fix
Arnd Bergmann (6):
cpuset: Replace all instances of time_t with time64_t
mm: include linux/pfn.h for PHYS_PFN definition
ARM: thp: fix unterminated ifdef in header file
memstick: use sector_div instead of do_div
mm: memcontrol: only manage socket pressure for CONFIG_INET
memcg: fix SLOB build regression
Chen Gang (3):
mm/mmap.c: remove redundant local variables for may_expand_vm()
mm: add PHYS_PFN, use it in __phys_to_pfn()
arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures
Christian Borntraeger (3):
dma: Provide simple noop dma ops
alpha/dma: use common noop dma ops
s390/dma: Allow per device dma ops
Christoph Hellwig (19):
dma-mapping: make the generic coherent dma mmap implementation optional
arc: convert to dma_map_ops
arc: dma mapping fixes
avr32: convert to dma_map_ops
blackfin: convert to dma_map_ops
c6x: convert to dma_map_ops
c6x: dma mapping fixes
cris: convert to dma_map_ops
nios2: convert to dma_map_ops
nios2: dma mapping fixes
frv: convert to dma_map_ops
parisc: convert to dma_map_ops
mn10300: convert to dma_map_ops
m68k: convert to dma_map_ops
metag: convert to dma_map_ops
sparc: use generic dma_set_mask
tile: uninline dma_set_mask
dma-mapping: always provide the dma_map_ops based implementation
dma-mapping: remove <asm-generic/dma-coherent.h>
Christoph Lameter (2):
vmstat: make vmstat_updater deferrable again and shut down on idle
vmstat-make-vmstat_updater-deferrable-again-and-shut-down-on-idle-fix
Dan Carpenter (2):
mm/huge_memory: add a missing tab
C6X: fix build breakage
Dan Williams (29):
pmem, dax: clean up clear_pmem()
dax: increase granularity of dax_clear_blocks() operations
dax: guarantee page aligned results from bdev_direct_access()
dax: fix lifetime of in-kernel dax mappings with dax_map_atomic()
dax-fix-lifetime-of-in-kernel-dax-mappings-with-dax_map_atomic-v3
um: kill pfn_t
kvm: rename pfn_t to kvm_pfn_t
mm, dax, pmem: introduce pfn_t
mm: skip memory block registration for ZONE_DEVICE
mm: introduce find_dev_pagemap()
x86, mm: introduce vmem_altmap to augment vmemmap_populate()
libnvdimm, pfn, pmem: allocate memmap array in persistent memory
avr32: convert to asm-generic/memory_model.h
hugetlb: fix compile error on tile
frv: fix compiler warning from definition of __pmd()
x86, mm: introduce _PAGE_DEVMAP
mm, dax, gpu: convert vm_insert_mixed to pfn_t
mm, dax: convert vmf_insert_pfn_pmd() to pfn_t
libnvdimm, pmem: move request_queue allocation earlier in probe
mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup
list, perf: fix list_force_poison() build regression
mm, dax: dax-pmd vs thp-pmd vs hugetlbfs-pmd
mm, dax: dax-pmd vs thp-pmd vs hugetlbfs-pmd v5
mm: fix pmd_devmap compile error
mm, x86: get_user_pages() for dax mappings
mm, x86: get_user_pages() for dax mappings
dax: provide diagnostics for pmd mapping failures
dax: re-enable dax pmd mappings
dax: fix dax_pmd_dbg build warning
Daniel Cashman (8):
mm: mmap: add new /proc tunable for mmap_base ASLR
arm: mm: support ARCH_MMAP_RND_BITS
arm: mm: support ARCH_MMAP_RND_BITS
arm64: mm: support ARCH_MMAP_RND_BITS
arm64-mm-support-arch_mmap_rnd_bits-v6
arm64-mm-support-arch_mmap_rnd_bits-v7
x86: mm: support ARCH_MMAP_RND_BITS
x86-mm-support-arch_mmap_rnd_bits-v7.txt
Dave Chinner (1):
xfs: fix recursive splice read locking with DAX
David Rientjes (1):
mm, vmalloc: remove VM_VPAGES
Dominik Dingel (2):
mm: bring in additional flag for fixup_user_fault to signal unlock
s390/mm: enable fixup_user_fault retrying
Ebru Akagunduz (3):
mm: add tracepoint for scanning pages
mm: make optimistic check for swapin readahead
mm: make swapin readahead to improve thp collapse rate
Florian Fainelli (1):
include/linux/memblock.h: fix ordering of 'flags' argument in comments
Geliang Tang (14):
mm/slab.c use list_first_entry_or_null()
mm/slab.c: use list_for_each_entry in cache_flusharray
mm/slab.c: add a helper function get_first_slab
mm/vmalloc.c: use list_{next,first}_entry
mm, thp: use list_first_entry_or_null()
mm/page_alloc.c: use list_{first,last}_entry instead of list_entry
mm/page_alloc.c: use list_for_each_entry in mark_free_pages()
mm/swapfile.c: use list_{next,first}_entry
mm/readahead.c, mm/vmscan.c: use lru_to_page instead of list_to_page
mm/ksm.c: use list_for_each_entry_safe
mm/swapfile.c: use list_for_each_entry_safe in free_swap_count_continuations
mm: move lru_to_page to mm_inline.h
mm/zbud.c: use list_last_entry() instead of list_tail_entry()
dma-mapping: use offset_in_page macro
Guenter Roeck (1):
mn10300: Declare __pfn_to_phys() to fix build error
Hugh Dickins (2):
memcg: avoid vmpressure oops when memcg disabled
mm: make swapoff more robust against soft dirty
Jan Kara (5):
ext4: fix races between page faults and hole punching
ext4: move unlocked dio protection from ext4_alloc_file_blocks()
ext4: fix races between buffered IO and collapse / insert range
ext4: fix races of writeback with punch hole and zero range
ext4: document lock ordering
Jerome Marchand (2):
mm, shmem: add internal shmem resident memory accounting
mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status
Johannes Weiner (34):
cgroup: clean up the kernel configuration menu nomenclature
cgroup: put controller Kconfig options in meaningful order
mm: page_alloc: generalize the dirty balance reserve
proc: meminfo: estimate available memory more conservatively
mm: memcontrol: export root_mem_cgroup
net: tcp_memcontrol: properly detect ancestor socket pressure
net: tcp_memcontrol: remove bogus hierarchy pressure propagation
net: tcp_memcontrol: protect all tcp_memcontrol calls by jump-label
net: tcp_memcontrol: remove dead per-memcg count of allocated sockets
net: tcp_memcontrol: simplify the per-memcg limit access
net: tcp_memcontrol: sanitize tcp memory accounting callbacks
net: tcp_memcontrol: simplify linkage between socket and page counter
net-tcp_memcontrol-simplify-linkage-between-socket-and-page-counter
mm: memcontrol: generalize the socket accounting jump label
mm: memcontrol: do not account memory+swap on unified hierarchy
mm: memcontrol: move socket code for unified hierarchy accounting
mm: memcontrol: account socket memory in unified hierarchy memory controller
mm: memcontrol: hook up vmpressure to socket pressure
mm: memcontrol: switch to the updated jump-label API
mm/oom_kill.c: don't ignore oom score on exiting tasks
mm: memcontrol: drop unused @css argument in memcg_init_kmem
mm: memcontrol: remove double kmem page_counter init
mm: memcontrol: give the kmem states more descriptive names
mm: memcontrol: group kmem init and exit functions together
mm: memcontrol: separate kmem code from legacy tcp accounting code
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2
mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix
mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
mm: memcontrol: rein in the CONFIG space madness
mm: memcontrol: flatten struct cg_proto
mm: memcontrol: clean up alloc, online, offline, free functions
mm: memcontrol: clean up alloc, online, offline, free functions fix
John Allen (1):
drivers/base/memory.c: fix kernel warning during memory hotplug on ppc64
Joonsoo Kim (5):
mm/page_isolation.c: return last tested pfn rather than failure indicator
mm/page_isolation.c: add new tracepoint, test_pages_isolated
mm/cma: always check which page caused allocation failure
mm/cma: always check which page cause allocation failure
mm/compaction.c: __compact_pgdat() code cleanuup
Joshua Clayton (1):
mm: fix noisy sparse warning in LIBCFS_ALLOC_PRE()
Juergen Gross (1):
x86/paravirt: Remove paravirt ops pmd_update[_defer] and pte_update_defer
Kirill A. Shutemov (86):
mm: make sure isolate_lru_page() is never called for tail page
khugepaged: avoid usage of uninitialized variable 'isolated'
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
page-flags: trivial cleanup for PageTrans* helpers
page-flags: move code around
page-flags: introduce page flags policies wrt compound pages
page-flags: do not corrupt caller 'page' in PF_NO_TAIL
page-flags: add documentation for policies
page-flags: hide PF_* validation check under separate config option
page-flags: define PG_locked behavior on compound pages
page-flags: define behavior of FS/IO-related flags on compound pages
page-flags: define behavior of LRU-related flags on compound pages
page-flags: define behavior SL*B-related flags on compound pages
page-flags: define behavior of Xen-related flags on compound pages
page-flags: define PG_reserved behavior on compound pages
hugetlb: clear PG_reserved before setting PG_head on gigantic pages
page-flags: define PG_swapbacked behavior on compound pages
page-flags: define PG_swapcache behavior on compound pages
page-flags: define PG_mlocked behavior on compound pages
page-flags: define PG_uncached behavior on compound pages
page-flags: define PG_uptodate behavior on compound pages
page-flags: look at head page if the flag is encoded in page->mapping
mm: sanitize page->mapping for tail pages
page-flags: drop __TestClearPage*() helpers
mm, proc: adjust PSS calculation
rmap: add argument to charge compound page
memcg: adjust to support new THP refcounting
mm, thp: adjust conditions when we can reuse the page on WP fault
mm: adjust FOLL_SPLIT for new refcounting
mm: handle PTE-mapped tail pages in gerneric fast gup implementaiton
thp, mlock: do not allow huge pages in mlocked area
khugepaged: ignore pmd tables with THP mapped with ptes
thp: rename split_huge_page_pmd() to split_huge_pmd()
mm, vmstats: new THP splitting event
mm: temporally mark THP broken
thp: drop all split_huge_page()-related code
mm: drop tail page refcounting
futex, thp: remove special case for THP in get_futex_key
futex-thp-remove-special-case-for-thp-in-get_futex_key-fix
ksm: prepare to new THP semantics
mm, thp: remove compound_lock()
arm64, thp: remove infrastructure for handling splitting PMDs
arm, thp: remove infrastructure for handling splitting PMDs
mips, thp: remove infrastructure for handling splitting PMDs
powerpc, thp: remove infrastructure for handling splitting PMDs
s390, thp: remove infrastructure for handling splitting PMDs
sparc, thp: remove infrastructure for handling splitting PMDs
tile, thp: remove infrastructure for handling splitting PMDs
x86, thp: remove infrastructure for handling splitting PMDs
mm, thp: remove infrastructure for handling splitting PMDs
mm-thp-remove-infrastructure-for-handling-splitting-pmds-fix
mm: rework mapcount accounting to enable 4k mapping of THPs
mm: do not crash on PageDoubleMap() for non-head pages
mm: duplicate rmap reference for hugetlb pages as compound
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-4
mm: differentiate page_mapped() from page_mapcount() for compound pages
mm, numa: skip PTE-mapped THP on numa fault
thp: implement split_huge_pmd()
thp: add option to setup migration entries during PMD split
thp, mm: split_huge_page(): caller need to lock page
thp: reintroduce split_huge_page()
thp-reintroduce-split_huge_page-fix-2
thp: fix split vs. unmap race
thp: fix leak due split_huge_page() vs. exit race
migrate_pages: try to split pages on queuing
mempolicy: add missed spin_unlock in queue_pages_pte_range
thp: introduce deferred_split_huge_page()
thp: fix split_huge_page vs. deferred_split_scan race
mm: re-enable THP
thp: update documentation
thp: allow mlocked THP again
mm: stop __munlock_pagevec_fill() if THP encountered
mm, thp: clear PG_mlocked when last mapping gone
mm: prepare page_referenced() and page_idle to new THP refcounting
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-fix
mm: uninline slowpath of page_mapcount()
mm: fix __page_mapcount()
thp: add debugfs handle to split all huge pages
thp: increase split_huge_page() success rate
thp-increase-split_huge_page-success-rate-fix
mm-add-page_check_address_transhuge-helper-fix-fix
thp: fix regression in handling mlocked pages in __split_huge_pmd()
memblock: fix section mismatch
mm: fix locking order in mm_take_all_locks()
Konstantin Khlebnikov (1):
mm: rework virtual memory accounting
Kyeongdon Kim (1):
zram: try vmalloc() after kmalloc()
Laura Abbott (1):
dma-debug: switch check from _text to _stext
Liang Chen (1):
mm: mempolicy: skip non-migratable VMAs when setting MPOL_MF_LAZY
Mel Gorman (1):
mm/page_alloc.c: remove unnecessary parameter from __rmqueue
Michal Hocko (15):
Merge remote-tracking branch 'tj-cgroups/for-4.5' into mmotm-4.4
mm/page_alloc.c: get rid of __alloc_pages_high_priority()
mm/page_alloc.c: do not loop over ALLOC_NO_WATERMARKS without triggering reclaim
mm, vmscan: consider isolated pages in zone_reclaimable_pages
mm: allow GFP_{FS,IO} for page_cache_read page cache allocation
mm, oom: give __GFP_NOFAIL allocations access to memory reserves
memcg: ignore partial THP when moving task
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-5-fix
mm, oom: rework oom detection
mm: throttle on IO only when there are too many dirty and writeback pages
mm: use watermark checks for __GFP_REPEAT high order allocations
mm, oom: introduce oom reaper
mm-oom-introduce-oom-reaper-v4
oom reaper: handle anonymous mlocked pages
oom: clear TIF_MEMDIE after oom_reaper managed to unmap the address space
Mike Kravetz (2):
fs/hugetlbfs/inode.c: fix bugs in hugetlb_vmtruncate_list()
mm/hugetlbfs: unmap pages if page fault raced with hole punch
Minchan Kim (14):
zram: pass gfp from zcomp frontend to backend
mm: support madvise(MADV_FREE)
mm-support-madvisemadv_free-fix
mm: account pglazyfreed exactly
mm: define MADV_FREE for some arches
mm/madvise.c: free swp_entry in madvise_free
mm: move lazily freed pages to inactive list
mm/ksm.c: mark stable page dirty
arch/x86/include/asm/pgtable.h: add pmd_[dirty|mkclean] for THP
arch/sparc/include/asm/pgtable_64.h: add pmd_[dirty|mkclean] for THP
arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP
arch/arm/include/asm/pgtable-3level.h: add pmd_mkclean for THP
arch/arm64/include/asm/pgtable.h: add pmd_mkclean for THP
mm/huge_memory.c: don't split THP page when MADV_FREE syscall is called
Naoya Horiguchi (8):
mm/page_alloc.c: fix warning in comparing enumerator
mm-zonelist-enumerate-zonelists-array-index-fix-fix-fix
mm/page_isolation: use macro to judge the alignment
mm: fix mapcount mismatch in hugepage migration
mm: soft-offline: check return value in second __get_any_page() call
mm: hwpoison: adjust for new thp refcounting
mm: soft-offline: clean up soft_offline_page()
mm: soft-offline: exit with failure for non anonymous thp
Nathan Zimmer (1):
mm/mempolicy.c: convert the shared_policy lock to a rwlock
Oleg Nesterov (2):
cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friends
mm: /proc/pid/clear_refs: no need to clear VM_SOFTDIRTY in clear_soft_dirty_pmd()
Paul Gortmaker (1):
hugetlb: make mm and fs code explicitly non-modular
Piotr Kwapulinski (1):
mm/mmap.c: remove incorrect MAP_FIXED flag comparison from mmap_region
Rami Rosen (2):
cgroup_pids: fix a typo.
cgroup: fix a typo.
Rodrigo Freire (1):
Documentation/filesystems: describe the shared memory usage/accounting
Ross Zwisler (16):
cgroup: Fix uninitialized variable warning
mm, dax: fix livelock, allow dax pmd mappings to become writeable
dax: fix NULL pointer dereference in __dax_dbg()
dax: fix conversion of holes to PMDs
pmem: add wb_cache_pmem() to the PMEM API
pmem-add-wb_cache_pmem-to-the-pmem-api-v6
dax: support dirty DAX entries in radix tree
dax-support-dirty-dax-entries-in-radix-tree-v6
mm: add find_get_entries_tag()
dax: add support for fsync/sync
dax-add-support-for-fsync-sync-v6
dax: add support for fsync/msync
dax-add-support-for-fsync-msync-v8
ext2: call dax_pfn_mkwrite() for DAX fsync/msync
ext4: call dax_pfn_mkwrite() for DAX fsync/msync
xfs: call dax_pfn_mkwrite() for DAX fsync/msync
Sergey Senozhatsky (2):
zram/zcomp: use GFP_NOIO to allocate streams
zram/zcomp: do not zero out zcomp private pages
Seth Jennings (2):
drivers/base/memory.c: clean up section counting
drivers/base/memory.c: rename remove_memory_block() to remove_memory_section()
Sudip Mukherjee (3):
m32r: fix m32104ut_defconfig build fail
arch/*/include/uapi/asm/mman.h: correct uniform value of MADV_FREE
m68k: provide __phys_to_pfn() and __pfn_to_phys()
Taku Izumi (2):
mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()
mm/page_alloc.c: introduce kernelcore=mirror option
Tejun Heo (11):
cgroup: replace __DEVEL__sane_behavior with cgroup2 fs type
cgroup: rename Documentation/cgroups/ to Documentation/cgroup-legacy/
cgroup: replace unified-hierarchy.txt with a proper cgroup v2 documentation
cgroup: record ancestor IDs and reimplement cgroup_is_descendant() using it
kernfs: implement kernfs_walk_and_get()
cgroup: implement cgroup_get_from_path() and expose cgroup_put()
Merge branch 'for-4.4-fixes' into for-4.5
Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/.../tj/cgroup into for-4.5
cgroup: demote subsystem init messages to KERN_DEBUG
cgroup: rename cgroup documentations
cgroup, memcg, writeback: drop spurious rcu locking around mem_cgroup_css_from_page()
Tetsuo Handa (1):
tree wide: use kvfree() than conditional kfree()/vfree()
Toshi Kani (3):
x86/mm/pat: Add untrack_pfn_moved for mremap
x86/mm/pat: Change free_memtype() to support shrinking case
dax: Split pmd map when fallback on COW
Valentin Rothberg (1):
HAVE_DMA_ATTRS: remove leftovers in Kconfig
Vineet Gupta (1):
ARC: dma mapping fixes #2
Vitaly Kuznetsov (2):
memory-hotplug: don't BUG() in register_memory_resource()
memory-hotplug-dont-bug-in-register_memory_resource-v2
Vladimir Davydov (21):
Revert "kernfs: do not account ino_ida allocations to memcg"
Revert "gfp: add __GFP_NOACCOUNT"
memcg: only account kmem allocations marked as __GFP_ACCOUNT
slab: add SLAB_ACCOUNT flag
vmalloc: allow to account vmalloc to memcg
kmemcg: account certain kmem allocations to memcg
vmscan: do not force-scan file lru if its absolute size is small
vmscan-do-not-force-scan-file-lru-if-its-absolute-size-is-small-v2
memcg: do not allow to disable tcp accounting after limit is set
mm/khugepaged: fix scan not aborted on SCAN_EXCEED_SWAP_PTE
mm: add page_check_address_transhuge() helper
mm-add-page_check_address_transhuge-helper-fix
mm: memcontrol: allow to disable kmem accounting for cgroup2
net: drop tcp_memcontrol.c
mm: memcontrol: charge swap to cgroup2
mm: vmscan: pass memcg to get_scan_count()
mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
swap.h: move memcg related stuff to the end of the file
mm: vmscan: do not scan anon pages if memcg swap limit is hit
mm: free swap cache aggressively if memcg swap is full
Documentation: cgroup: add memory.swap.{current,max} description
Vlastimil Babka (4):
mm, documentation: clarify /proc/pid/status VmSwap limitations for shmem
mm, proc: account for shmem swap in /proc/pid/smaps
mm, proc: reduce cost of /proc/pid/smaps for shmem mappings
mm, proc: reduce cost of /proc/pid/smaps for unpopulated shmem mappings
Wang Xiaoqiang (3):
mm/page_isolation: do some cleanup in "undo_isolate_page_range"
mm/vmalloc.c: use macro IS_ALIGNED to judge the aligment
mm/mlock.c: change can_do_mlock return value type to boolean
Weijie Yang (1):
zsmalloc: reorganize struct size_class to pack 4 bytes hole
Yaowei Bai (6):
include/linux/hugetlb.h: is_file_hugepages() can be boolean
mm/memblock.c: memblock_is_memory()/reserved() can be boolean
include/linux/mmzone.h: remove unused is_unevictable_lru()
mm/zonelist: enumerate zonelists array index
mm/mmzone.c: memmap_valid_within() can be boolean
mm/compaction: improve comment for compact_memory tunable knob handler
Yuan Sun (2):
Subject: cgroup: Fix incomplete dd command in blkio documentation
cgroup: Remove resource_counter.txt in Documentation/cgroup-legacy/00-INDEX.
nimisolo (1):
mm/memblock.c:memblock_add_range(): if nr_new is 0 just return
yalin wang (3):
mm/vmscan.c: change trace_mm_vmscan_writepage() proto type
mm: change mm_vmscan_lru_shrink_inactive() proto types
mm: fix kernel crash in khugepaged thread
zhong jiang (1):
arm64: fix add kasan bug
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* mmotm git tree since-4.4 branch created (was: mmotm 2016-01-12-16-44 uploaded)
From: Michal Hocko @ 2016-01-13 13:42 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, broonie
In-Reply-To: <56959f89.w3mPYnkFwRbLPsAK%akpm@linux-foundation.org>
I have just created since-4.4 branch in mm git tree
(http://git.kernel.org/?p=linux/kernel/git/mhocko/mm.git;a=summary). It
is based on v4.4 tag in Linus tree and mmotm-2016-01-12-16-44.
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 (3):
mm/memblock: remove rgnbase and rgnsize variables
mm/memblock: introduce for_each_memblock_type()
mm/page_alloc.c: remove unused struct zone *z variable
Alexey Klimov (1):
mm/mlock.c: drop unneeded initialization in munlock_vma_pages_range()
Andrea Arcangeli (2):
ksm: introduce ksm_max_page_sharing per page deduplication limit
ksm: validate STABLE_NODE_DUP_HEAD conditional to gcc version
Andrew Morton (26):
account-certain-kmem-allocations-to-memcg-checkpatch-fixes
include-define-__phys_to_pfn-as-phys_pfn-fix
mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2
mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes
mm-zonelist-enumerate-zonelists-array-index-fix
mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes
fs/block_dev.c:bdev_write_page(): use blk_queue_enter(..., GFP_NOIO)
arm64-mm-support-arch_mmap_rnd_bits-fix
ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2
mm-fs-obey-gfp_mapping-for-add_to_page_cache-fix
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix
mm-hwpoison-adjust-for-new-thp-refcounting-fix
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes
thp-add-debugfs-handle-to-split-all-huge-pages-fix
mm-support-madvisemadv_free-fix-2-fix
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2
arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3
mm-oom-rework-oom-detection-checkpatch-fixes
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes
sched: add schedule_timeout_idle()
mm-mlockc-change-can_do_mlock-return-value-type-to-boolean-fix
mm-page_allocc-introduce-kernelcore=mirror-option-fix
mm/page_alloc.c: rework code layout in memmap_init_zone()
mm-hugetlbfs-unmap-pages-if-page-fault-raced-with-hole-punch-fix
mm-soft-offline-exit-with-failure-for-non-anonymous-thp-fix
Arnd Bergmann (3):
cpuset: Replace all instances of time_t with time64_t
mm: include linux/pfn.h for PHYS_PFN definition
ARM: thp: fix unterminated ifdef in header file
Chen Gang (3):
mm/mmap.c: remove redundant local variables for may_expand_vm()
mm: add PHYS_PFN, use it in __phys_to_pfn()
arch/*/include/uapi/asm/mman.h: : let MADV_FREE have same value for all architectures
Christoph Lameter (2):
vmstat: make vmstat_updater deferrable again and shut down on idle
vmstat-make-vmstat_updater-deferrable-again-and-shut-down-on-idle-fix
Dan Carpenter (1):
mm/huge_memory: add a missing tab
Dan Williams (28):
pmem, dax: clean up clear_pmem()
dax: increase granularity of dax_clear_blocks() operations
dax: guarantee page aligned results from bdev_direct_access()
dax: fix lifetime of in-kernel dax mappings with dax_map_atomic()
dax-fix-lifetime-of-in-kernel-dax-mappings-with-dax_map_atomic-v3
um: kill pfn_t
kvm: rename pfn_t to kvm_pfn_t
mm, dax, pmem: introduce pfn_t
mm: skip memory block registration for ZONE_DEVICE
mm: introduce find_dev_pagemap()
x86, mm: introduce vmem_altmap to augment vmemmap_populate()
libnvdimm, pfn, pmem: allocate memmap array in persistent memory
avr32: convert to asm-generic/memory_model.h
hugetlb: fix compile error on tile
frv: fix compiler warning from definition of __pmd()
x86, mm: introduce _PAGE_DEVMAP
mm, dax, gpu: convert vm_insert_mixed to pfn_t
mm, dax: convert vmf_insert_pfn_pmd() to pfn_t
libnvdimm, pmem: move request_queue allocation earlier in probe
mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup
list, perf: fix list_force_poison() build regression
mm, dax: dax-pmd vs thp-pmd vs hugetlbfs-pmd
mm, dax: dax-pmd vs thp-pmd vs hugetlbfs-pmd v5
mm: fix pmd_devmap compile error
mm, x86: get_user_pages() for dax mappings
mm, x86: get_user_pages() for dax mappings
dax: provide diagnostics for pmd mapping failures
dax: re-enable dax pmd mappings
Daniel Cashman (8):
mm: mmap: add new /proc tunable for mmap_base ASLR
arm: mm: support ARCH_MMAP_RND_BITS
arm: mm: support ARCH_MMAP_RND_BITS
arm64: mm: support ARCH_MMAP_RND_BITS
arm64-mm-support-arch_mmap_rnd_bits-v6
arm64-mm-support-arch_mmap_rnd_bits-v7
x86: mm: support ARCH_MMAP_RND_BITS
x86-mm-support-arch_mmap_rnd_bits-v7.txt
David Rientjes (1):
mm, vmalloc: remove VM_VPAGES
Dominik Dingel (2):
mm: bring in additional flag for fixup_user_fault to signal unlock
s390/mm: enable fixup_user_fault retrying
Ebru Akagunduz (3):
mm: add tracepoint for scanning pages
mm: make optimistic check for swapin readahead
mm: make swapin readahead to improve thp collapse rate
Florian Fainelli (1):
include/linux/memblock.h: fix ordering of 'flags' argument in comments
Geliang Tang (13):
mm/slab.c use list_first_entry_or_null()
mm/slab.c: use list_for_each_entry in cache_flusharray
mm/slab.c: add a helper function get_first_slab
mm/vmalloc.c: use list_{next,first}_entry
mm, thp: use list_first_entry_or_null()
mm/page_alloc.c: use list_{first,last}_entry instead of list_entry
mm/page_alloc.c: use list_for_each_entry in mark_free_pages()
mm/swapfile.c: use list_{next,first}_entry
mm/readahead.c, mm/vmscan.c: use lru_to_page instead of list_to_page
mm/ksm.c: use list_for_each_entry_safe
mm/swapfile.c: use list_for_each_entry_safe in free_swap_count_continuations
mm: move lru_to_page to mm_inline.h
mm/zbud.c: use list_last_entry() instead of list_tail_entry()
Guenter Roeck (1):
mn10300: Declare __pfn_to_phys() to fix build error
Hugh Dickins (2):
memcg: avoid vmpressure oops when memcg disabled
mm: make swapoff more robust against soft dirty
Jerome Marchand (2):
mm, shmem: add internal shmem resident memory accounting
mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status
Johannes Weiner (20):
cgroup: clean up the kernel configuration menu nomenclature
cgroup: put controller Kconfig options in meaningful order
mm: page_alloc: generalize the dirty balance reserve
proc: meminfo: estimate available memory more conservatively
mm: memcontrol: export root_mem_cgroup
net: tcp_memcontrol: properly detect ancestor socket pressure
net: tcp_memcontrol: remove bogus hierarchy pressure propagation
net: tcp_memcontrol: protect all tcp_memcontrol calls by jump-label
net: tcp_memcontrol: remove dead per-memcg count of allocated sockets
net: tcp_memcontrol: simplify the per-memcg limit access
net: tcp_memcontrol: sanitize tcp memory accounting callbacks
net: tcp_memcontrol: simplify linkage between socket and page counter
net-tcp_memcontrol-simplify-linkage-between-socket-and-page-counter
mm: memcontrol: generalize the socket accounting jump label
mm: memcontrol: do not account memory+swap on unified hierarchy
mm: memcontrol: move socket code for unified hierarchy accounting
mm: memcontrol: account socket memory in unified hierarchy memory controller
mm: memcontrol: hook up vmpressure to socket pressure
mm: memcontrol: switch to the updated jump-label API
mm/oom_kill.c: don't ignore oom score on exiting tasks
John Allen (1):
drivers/base/memory.c: fix kernel warning during memory hotplug on ppc64
Joonsoo Kim (5):
mm/page_isolation.c: return last tested pfn rather than failure indicator
mm/page_isolation.c: add new tracepoint, test_pages_isolated
mm/cma: always check which page caused allocation failure
mm/cma: always check which page cause allocation failure
mm/compaction.c: __compact_pgdat() code cleanuup
Joshua Clayton (1):
mm: fix noisy sparse warning in LIBCFS_ALLOC_PRE()
Juergen Gross (1):
x86/paravirt: Remove paravirt ops pmd_update[_defer] and pte_update_defer
Kirill A. Shutemov (86):
mm: make sure isolate_lru_page() is never called for tail page
khugepaged: avoid usage of uninitialized variable 'isolated'
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
page-flags: trivial cleanup for PageTrans* helpers
page-flags: move code around
page-flags: introduce page flags policies wrt compound pages
page-flags: do not corrupt caller 'page' in PF_NO_TAIL
page-flags: add documentation for policies
page-flags: hide PF_* validation check under separate config option
page-flags: define PG_locked behavior on compound pages
page-flags: define behavior of FS/IO-related flags on compound pages
page-flags: define behavior of LRU-related flags on compound pages
page-flags: define behavior SL*B-related flags on compound pages
page-flags: define behavior of Xen-related flags on compound pages
page-flags: define PG_reserved behavior on compound pages
hugetlb: clear PG_reserved before setting PG_head on gigantic pages
page-flags: define PG_swapbacked behavior on compound pages
page-flags: define PG_swapcache behavior on compound pages
page-flags: define PG_mlocked behavior on compound pages
page-flags: define PG_uncached behavior on compound pages
page-flags: define PG_uptodate behavior on compound pages
page-flags: look at head page if the flag is encoded in page->mapping
mm: sanitize page->mapping for tail pages
page-flags: drop __TestClearPage*() helpers
mm, proc: adjust PSS calculation
rmap: add argument to charge compound page
memcg: adjust to support new THP refcounting
mm, thp: adjust conditions when we can reuse the page on WP fault
mm: adjust FOLL_SPLIT for new refcounting
mm: handle PTE-mapped tail pages in gerneric fast gup implementaiton
thp, mlock: do not allow huge pages in mlocked area
khugepaged: ignore pmd tables with THP mapped with ptes
thp: rename split_huge_page_pmd() to split_huge_pmd()
mm, vmstats: new THP splitting event
mm: temporally mark THP broken
thp: drop all split_huge_page()-related code
mm: drop tail page refcounting
futex, thp: remove special case for THP in get_futex_key
futex-thp-remove-special-case-for-thp-in-get_futex_key-fix
ksm: prepare to new THP semantics
mm, thp: remove compound_lock()
arm64, thp: remove infrastructure for handling splitting PMDs
arm, thp: remove infrastructure for handling splitting PMDs
mips, thp: remove infrastructure for handling splitting PMDs
powerpc, thp: remove infrastructure for handling splitting PMDs
s390, thp: remove infrastructure for handling splitting PMDs
sparc, thp: remove infrastructure for handling splitting PMDs
tile, thp: remove infrastructure for handling splitting PMDs
x86, thp: remove infrastructure for handling splitting PMDs
mm, thp: remove infrastructure for handling splitting PMDs
mm-thp-remove-infrastructure-for-handling-splitting-pmds-fix
mm: rework mapcount accounting to enable 4k mapping of THPs
mm: do not crash on PageDoubleMap() for non-head pages
mm: duplicate rmap reference for hugetlb pages as compound
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-4
mm: differentiate page_mapped() from page_mapcount() for compound pages
mm, numa: skip PTE-mapped THP on numa fault
thp: implement split_huge_pmd()
thp: add option to setup migration entries during PMD split
thp, mm: split_huge_page(): caller need to lock page
thp: reintroduce split_huge_page()
thp-reintroduce-split_huge_page-fix-2
thp: fix split vs. unmap race
thp: fix leak due split_huge_page() vs. exit race
migrate_pages: try to split pages on queuing
mempolicy: add missed spin_unlock in queue_pages_pte_range
thp: introduce deferred_split_huge_page()
thp: fix split_huge_page vs. deferred_split_scan race
mm: re-enable THP
thp: update documentation
thp: allow mlocked THP again
mm: stop __munlock_pagevec_fill() if THP encountered
mm, thp: clear PG_mlocked when last mapping gone
mm: prepare page_referenced() and page_idle to new THP refcounting
mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-fix
mm: uninline slowpath of page_mapcount()
mm: fix __page_mapcount()
thp: add debugfs handle to split all huge pages
thp: increase split_huge_page() success rate
thp-increase-split_huge_page-success-rate-fix
mm-add-page_check_address_transhuge-helper-fix-fix
thp: fix regression in handling mlocked pages in __split_huge_pmd()
memblock: fix section mismatch
mm: fix locking order in mm_take_all_locks()
Konstantin Khlebnikov (1):
mm: rework virtual memory accounting
Kyeongdon Kim (1):
zram: try vmalloc() after kmalloc()
Laura Abbott (1):
dma-debug: switch check from _text to _stext
Liang Chen (1):
mm: mempolicy: skip non-migratable VMAs when setting MPOL_MF_LAZY
Mel Gorman (1):
mm/page_alloc.c: remove unnecessary parameter from __rmqueue
Michal Hocko (15):
Merge remote-tracking branch 'tj-cgroups/for-4.5' into mmotm-4.4
mm/page_alloc.c: get rid of __alloc_pages_high_priority()
mm/page_alloc.c: do not loop over ALLOC_NO_WATERMARKS without triggering reclaim
mm, vmscan: consider isolated pages in zone_reclaimable_pages
mm: allow GFP_{FS,IO} for page_cache_read page cache allocation
mm, oom: give __GFP_NOFAIL allocations access to memory reserves
memcg: ignore partial THP when moving task
mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-5-fix
mm, oom: rework oom detection
mm: throttle on IO only when there are too many dirty and writeback pages
mm: use watermark checks for __GFP_REPEAT high order allocations
mm, oom: introduce oom reaper
mm-oom-introduce-oom-reaper-v4
oom reaper: handle anonymous mlocked pages
oom: clear TIF_MEMDIE after oom_reaper managed to unmap the address space
Mike Kravetz (2):
fs/hugetlbfs/inode.c: fix bugs in hugetlb_vmtruncate_list()
mm/hugetlbfs: unmap pages if page fault raced with hole punch
Minchan Kim (14):
zram: pass gfp from zcomp frontend to backend
mm: support madvise(MADV_FREE)
mm-support-madvisemadv_free-fix
mm: account pglazyfreed exactly
mm: define MADV_FREE for some arches
mm/madvise.c: free swp_entry in madvise_free
mm: move lazily freed pages to inactive list
mm/ksm.c: mark stable page dirty
arch/x86/include/asm/pgtable.h: add pmd_[dirty|mkclean] for THP
arch/sparc/include/asm/pgtable_64.h: add pmd_[dirty|mkclean] for THP
arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP
arch/arm/include/asm/pgtable-3level.h: add pmd_mkclean for THP
arch/arm64/include/asm/pgtable.h: add pmd_mkclean for THP
mm/huge_memory.c: don't split THP page when MADV_FREE syscall is called
Naoya Horiguchi (8):
mm/page_alloc.c: fix warning in comparing enumerator
mm-zonelist-enumerate-zonelists-array-index-fix-fix-fix
mm/page_isolation: use macro to judge the alignment
mm: fix mapcount mismatch in hugepage migration
mm: soft-offline: check return value in second __get_any_page() call
mm: hwpoison: adjust for new thp refcounting
mm: soft-offline: clean up soft_offline_page()
mm: soft-offline: exit with failure for non anonymous thp
Nathan Zimmer (1):
mm/mempolicy.c: convert the shared_policy lock to a rwlock
Oleg Nesterov (2):
cgroup: kill cgrp_ss_priv[CGROUP_CANFORK_COUNT] and friends
mm: /proc/pid/clear_refs: no need to clear VM_SOFTDIRTY in clear_soft_dirty_pmd()
Paul Gortmaker (1):
hugetlb: make mm and fs code explicitly non-modular
Piotr Kwapulinski (1):
mm/mmap.c: remove incorrect MAP_FIXED flag comparison from mmap_region
Rami Rosen (2):
cgroup_pids: fix a typo.
cgroup: fix a typo.
Rodrigo Freire (1):
Documentation/filesystems: describe the shared memory usage/accounting
Ross Zwisler (2):
cgroup: Fix uninitialized variable warning
mm, dax: fix livelock, allow dax pmd mappings to become writeable
Sergey Senozhatsky (2):
zram/zcomp: use GFP_NOIO to allocate streams
zram/zcomp: do not zero out zcomp private pages
Seth Jennings (2):
drivers/base/memory.c: clean up section counting
drivers/base/memory.c: rename remove_memory_block() to remove_memory_section()
Sudip Mukherjee (3):
m32r: fix m32104ut_defconfig build fail
arch/*/include/uapi/asm/mman.h: correct uniform value of MADV_FREE
m68k: provide __phys_to_pfn() and __pfn_to_phys()
Taku Izumi (2):
mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()
mm/page_alloc.c: introduce kernelcore=mirror option
Tejun Heo (11):
cgroup: replace __DEVEL__sane_behavior with cgroup2 fs type
cgroup: rename Documentation/cgroups/ to Documentation/cgroup-legacy/
cgroup: replace unified-hierarchy.txt with a proper cgroup v2 documentation
cgroup: record ancestor IDs and reimplement cgroup_is_descendant() using it
kernfs: implement kernfs_walk_and_get()
cgroup: implement cgroup_get_from_path() and expose cgroup_put()
Merge branch 'for-4.4-fixes' into for-4.5
Merge branch 'for-4.5-ancestor-test' of git://git.kernel.org/.../tj/cgroup into for-4.5
cgroup: demote subsystem init messages to KERN_DEBUG
cgroup: rename cgroup documentations
cgroup, memcg, writeback: drop spurious rcu locking around mem_cgroup_css_from_page()
Tetsuo Handa (1):
tree wide: use kvfree() than conditional kfree()/vfree()
Toshi Kani (3):
x86/mm/pat: Add untrack_pfn_moved for mremap
x86/mm/pat: Change free_memtype() to support shrinking case
dax: Split pmd map when fallback on COW
Vitaly Kuznetsov (2):
memory-hotplug: don't BUG() in register_memory_resource()
memory-hotplug-dont-bug-in-register_memory_resource-v2
Vladimir Davydov (12):
Revert "kernfs: do not account ino_ida allocations to memcg"
Revert "gfp: add __GFP_NOACCOUNT"
memcg: only account kmem allocations marked as __GFP_ACCOUNT
slab: add SLAB_ACCOUNT flag
vmalloc: allow to account vmalloc to memcg
kmemcg: account certain kmem allocations to memcg
vmscan: do not force-scan file lru if its absolute size is small
vmscan-do-not-force-scan-file-lru-if-its-absolute-size-is-small-v2
memcg: do not allow to disable tcp accounting after limit is set
mm/khugepaged: fix scan not aborted on SCAN_EXCEED_SWAP_PTE
mm: add page_check_address_transhuge() helper
mm-add-page_check_address_transhuge-helper-fix
Vlastimil Babka (4):
mm, documentation: clarify /proc/pid/status VmSwap limitations for shmem
mm, proc: account for shmem swap in /proc/pid/smaps
mm, proc: reduce cost of /proc/pid/smaps for shmem mappings
mm, proc: reduce cost of /proc/pid/smaps for unpopulated shmem mappings
Wang Xiaoqiang (3):
mm/page_isolation: do some cleanup in "undo_isolate_page_range"
mm/vmalloc.c: use macro IS_ALIGNED to judge the aligment
mm/mlock.c: change can_do_mlock return value type to boolean
Weijie Yang (1):
zsmalloc: reorganize struct size_class to pack 4 bytes hole
Yaowei Bai (6):
include/linux/hugetlb.h: is_file_hugepages() can be boolean
mm/memblock.c: memblock_is_memory()/reserved() can be boolean
include/linux/mmzone.h: remove unused is_unevictable_lru()
mm/zonelist: enumerate zonelists array index
mm/mmzone.c: memmap_valid_within() can be boolean
mm/compaction: improve comment for compact_memory tunable knob handler
Yuan Sun (2):
Subject: cgroup: Fix incomplete dd command in blkio documentation
cgroup: Remove resource_counter.txt in Documentation/cgroup-legacy/00-INDEX.
nimisolo (1):
mm/memblock.c:memblock_add_range(): if nr_new is 0 just return
yalin wang (3):
mm/vmscan.c: change trace_mm_vmscan_writepage() proto type
mm: change mm_vmscan_lru_shrink_inactive() proto types
mm: fix kernel crash in khugepaged thread
zhong jiang (1):
arm64: fix add kasan bug
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* Re: linux-next: build failure after merge of the powerpc tree
From: Michael Ellerman @ 2016-01-13 7:44 UTC (permalink / raw)
To: Aneesh Kumar K.V, Stephen Rothwell, Benjamin Herrenschmidt,
linuxppc-dev
Cc: Michael Neuling, linux-next, linux-kernel
In-Reply-To: <87vb6yc9r1.fsf@linux.vnet.ibm.com>
On Wed, 2016-01-13 at 11:16 +0530, Aneesh Kumar K.V wrote:
> Michael Ellerman <mpe@ellerman.id.au> writes:
> > On Thu, 2016-01-07 at 19:16 +1100, Stephen Rothwell wrote:
> > > After merging the powerpc tree, today's linux-next build (powerpc64
> > > allnoconfig) failed like this:
> > >
> > > arch/powerpc/mm/hash_utils_64.c: In function 'get_paca_psize':
> > > arch/powerpc/mm/hash_utils_64.c:869:19: error: 'struct paca_struct' has no member named 'context'
> > > return get_paca()->context.user_psize;
> > > ^
> > > arch/powerpc/mm/hash_utils_64.c:870:1: error: control reaches end of non-void function [-Werror=return-type]
> > > }
> > > ^
> > >
> > > Caused by commit
> > >
> > > 2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
> >
> > Well that's rather embarrassing, for Mikey ;D
> > > This build has CONFIG_PPC_MM_SLICES not set ...
> >
> > Ugh, but it would seem none of our defconfigs do :/
>
> 4K page size with hugetlb disabled will get that
Yeah, but none of our defconfigs do that.
I've got a kisskb target for it now:
http://kisskb.ellerman.id.au/kisskb/target/28577/
cheers
^ permalink raw reply
* linux-next: Tree for Jan 13
From: Stephen Rothwell @ 2016-01-13 7:08 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any material for v4.6 to your linux-next included
branches until after v4.5-rc1 is released.
Changes since 20160112:
The rdma tree gained a build failure for which I added a merge fix patch.
The block tree gained a conflict against Linus' tree.
The aio tree still had a build failure so I used the version from
next-20160111.
The akpm-current tree gained a build failure for which I reverted
a commit.
The akpm tree lost a patch that turned up elsewhere and still had its
build failure that I just left broken for now.
Non-merge commits (relative to Linus' tree): 8758
8160 files changed, 411268 insertions(+), 160160 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 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 powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc,
sparc64 and arm defconfig.
Below is a summary of the state of the merge.
I am currently merging 238 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (4f31d774dd52 Merge branch 'for-linus-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed)
Merging m68k-current/for-linus (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys())
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (afd2ff9b7e1b Linux 4.4)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging net/master (ccdf6ce6a8db net: netlink: Fix multicast group storage allocation for families with more than one groups)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings)
Merging wireless-drivers/master (01d85b9b2b6b Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (cf1e05c63642 mac80211: handle width changes from opmode notification IE in beacon)
Merging sound-current/for-linus (98070576c4f7 ALSA: hda - Fix white noise on Dell Latitude E5550)
Merging pci-current/for-linus (5c3b99d05752 PCI: dra7xx: Mark driver as broken)
Merging driver-core.current/driver-core-linus (afd2ff9b7e1b Linux 4.4)
Merging tty.current/tty-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb.current/usb-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set)
Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging input-current/for-linus (009f77383651 Merge branch 'next' into for-linus)
Merging crypto-current/master (cd7e98414462 crypto: algif_skcipher - Add key check exception for cipher_null)
Merging ide/master (1b1050cdc5cd 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 (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode")
Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf)
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 (afd2ff9b7e1b Linux 4.4)
Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page)
Merging arc/for-next (4dc0323fd6bd ARCv2: STAR 9000950267: Handle return from intr to Delay Slot #2)
Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next)
Merging arm-perf/for-next/perf (8fcf04067cb5 Revert "arm64: kernel: enforce pmuserenr_el0 initialization and restore")
Merging arm-soc/for-next (ce504c3d4750 ARM: SoC: document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.)
Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836)
Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver)
Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig)
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 (c6abe665c94f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (64c3c928aef2 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (95c5bf2f0552 Merge branch 'omap-for-v4.4/fixes' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs)
Merging renesas/next (23a0d0a54a30 Merge branch 'heads/dt-fixes-for-v4.5' into next)
Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next)
Merging tegra/for-next (92b100361a4e Merge branch for-4.5/defconfig into for-next)
Merging arm64/for-next/core (2a803c4db615 arm64: head.S: use memset to clear BSS)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (2039b162f1cc Merge remote-tracking branch 'origin/master' into h8300-next)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys())
Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (544f742d0c2a Merge branch '4.4-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (9105b4a82439 parisc: Protect huge page pte changes with spinlocks)
Merging powerpc/next (2f10f1a7884e powerpc/mm: fix _PAGE_SWP_SOFT_DIRTY breaking swapoff)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c2ab7282f0fc s390/sclp: fix possible control register corruption)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (544f7d5a408e numa: remove stale node_has_online_mem() define)
Merging uml/linux-next (3e46b2537632 um: Use race-free temporary file creation)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only)
Merging cifs/for-next (181a15048df3 [SMB3] Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (bb00c898ad1c udf: Check output buffer length when converting name to CS0)
Merging ext4/dev (9f053aee1bb8 fs: clean up the flags definition in uapi/linux/fs.h)
Merging f2fs/dev (90d43c31be5a f2fs: read isize while holding i_mutex in fiemap)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (a93a99838248 gfs2: fix flock panic issue)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (44aab3e09ef9 NFS: Fix a compile warning about unused variable in nfs_generic_pg_pgios())
Merging nfsd/nfsd-next (ed97e830390a NFSv4: fix getacl ERANGE for some ACL buffer sizes)
Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION)
Applying: orangfs: update for follow_link to get_link change
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
Merging xfs/for-next (dde7f55bd000 Merge branch 'xfs-misc-fixes-for-4.5-2' into for-next)
Merging file-locks/linux-next (b4d629a39e10 locks: rename __posix_lock_file to posix_lock_inode)
Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in fs/nfs/nfs4file.c
CONFLICT (content): Merge conflict in drivers/s390/char/zcore.c
Merging pci/next (5c6c026b3867 Merge branch 'pci/trivial' into next)
Merging hid/for-next (0abcb3a84626 Merge branch 'for-4.4/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (dd4068192717 Merge branch 'i2c/for-4.5' into i2c/for-next)
Merging jdelvare-hwmon/master (ef0303d2bba0 hwmon: (emc2103) Fix typo in MODULE_PARM_DESC)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (91918d13eb17 hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards)
Merging v4l-dvb/master (fef24ea1b8c1 Merge branch 'topic/media-controller' into to_next)
Merging kbuild/for-next (9ab3e1d71e55 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (44858e07ff87 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (d9a7763582cd Merge branch 'pm-core-next' into linux-next)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (efa2498bb842 Merge branches 'thermal-core', 'thermal-soc' and 'thermal-intel' into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
Applying: thermal: fix for thermal_zone_device_update() API change
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (45f29dde4d57 Merge branch 'fixes' into next)
Merging net-next/master (415b6f19e87e net: bnxt: always return values from _bnxt_get_max_rings)
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning)
Merging wireless-drivers-next/master (42e0ed0d454c brcmfmac: Do not handle link downs for ibss.)
Merging bluetooth/master (8e69d71996e4 Bluetooth: add LED trigger for indicating HCI is powered up)
Merging mac80211-next/master (e6a0cd058e1b mac80211: Don't buffer non-bufferable MMPDUs)
Merging rdma/for-next (59caaed7a72a IB/iser: Support the remote invalidation exception)
CONFLICT (content): Merge conflict in include/linux/mlx5/vport.h
CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h
CONFLICT (content): Merge conflict in include/linux/mlx5/device.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/vport.c
Applying: fixup! Merge remote-tracking branch 'gerrit/ib-next' into HEAD
Applying: IB/mlx5: merge fix for mlx5_ib_port_link_layer API change
Merging mtd/master (a32d5b726ff8 mtd: spi-nor: fix stm_is_locked_sr() parameters)
Merging l2-mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (8a0d560f3e65 drm/amdgpu/powerplay: include asm/div64.h for do_div())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (d5f384de5bf1 drm/i915: Move Braswell stop_machine GGTT insertion workaround)
Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC)
Merging drm-misc/topic/drm-misc (3d7b75fdae9c apple-gmux: Add initial documentation)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (2651f437261f MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (98070576c4f7 ALSA: hda - Fix white noise on Dell Latitude E5550)
Merging sound-asoc/for-next (108915e8535a Merge tag 'asoc-v4.4-rc8' into asoc-next)
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
Merging input/next (1c0276d56737 Input: atmel_mxt_ts - improve touchscreen size/orientation handling)
Merging block/for-next (ec9f06590e22 Merge branch 'for-4.5/nvme' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/lightnvm.c
CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile
Applying: nvme: merge fix up for ns code movement
CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
Merging device-mapper/for-next (385277bfb57f dm snapshot: fix hung bios when copy error occurs)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (01a999e48995 mmc: dw_mmc: remove the unused quirks)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (649ce6e4af6d raid5-cache: handle journal hotadd in quiesce)
Merging mfd/for-mfd-next (f7e5cc49a39f mfd: davinci_voicecodec: Remove pointless 'out of memory' error message)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (6b9140f39c2a power: test_power: correctly handle empty writes)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (d3bd4e0a5fd4 Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next)
Merging security/next (607259e17b37 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next)
Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
Merging selinux/next (76319946f321 selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (ac36856fe432 watchdog: asm9260: remove __init and __exit annotations)
Merging iommu/next (dabc4de14132 Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86/amd' and 'x86/vt-d' into next)
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (000afe892ed6 DMA-API: fix confusing sentence in Documentation/DMA-API.txt)
Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static)
Merging audit/next (09eccd1da92b audit: always enable syscall auditing when supported and audit is enabled)
CONFLICT (content): Merge conflict in kernel/audit.c
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (fcd71d9cc6e3 of: fix declaration of of_io_request_and_map)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (cabeea980879 Merge remote-tracking branches 'spi/topic/sun4i', 'spi/topic/topcliff-pch' and 'spi/topic/zynq' into spi-next)
Merging tip/auto-latest (5852b88267ad Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (1cac5503fbf7 EDAC, i5100: Use to_delayed_work())
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (5156dca34a3e ftrace: Fix the race between ftrace and insmod)
Merging rcu/rcu/next (984cf355aeaa sysrq: Fix warning in sysrq generated crash.)
Merging kvm/linux-next (45bdbcfdf241 kvm: x86: Fix vmwrite to SECONDARY_VM_EXEC_CONTROL)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (696066f875bc KVM: PPC: Increase memslots to 512)
Merging kvms390/next (c6e5f166373a KVM: s390: implement the RI support of guest)
Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (6201171e3b2c workqueue: simplify the apply_workqueue_attrs_locked())
Merging drivers-x86/for-next (15adbe5ba066 tc1100-wmi: fix build warning when CONFIG_PM not enabled)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (6cb07abcc318 Merge remote-tracking branches 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/seq' into regmap-next)
Merging hsi/for-next (525e1abc6b5a HSI: omap_ssi_port: fix handling of_get_named_gpio result)
Merging leds/for-next (522f17e1214c leds: add HAS_IOMEM dependency to LEDS_BCM6328/LEDS_BCM6358)
Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.)
Merging driver-core/driver-core-next (afd2ff9b7e1b Linux 4.4)
Merging tty/tty-next (041497eb721d drivers/tty/serial: delete unused MODULE_DEVICE_TABLE from atmel_serial.c)
CONFLICT (content): Merge conflict in drivers/tty/serial/amba-pl011.c
Merging usb/usb-next (60d77b3d2229 MAINTAINERS: change my email address)
Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM)
Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages)
Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry)
Merging staging/staging-next (841e3ed977e0 Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC.")
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/symlink.c
Merging char-misc/char-misc-next (ed6dc538e5a3 mei: fix fasync return value on error)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (36ae3fad335f Merge branch 'for-4.5' into for-next)
Merging scsi/for-next (f6817f3450cb Merge branch 'misc' into for-next)
Merging target-updates/for-next (0de1be1c4dd0 target: Obtain se_node_acl->acl_kref during get_initiator_node_acl)
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (14da0a91bf4a pinctrl: mediatek: Modify pinctrl bindings for mt2701)
Merging vhost/linux-next (43e361f23c49 checkpatch: add virt barriers)
CONFLICT (content): Merge conflict in include/asm-generic/barrier.h
CONFLICT (content): Merge conflict in arch/s390/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/ia64/include/asm/barrier.h
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (de06c1db255f gpio: xilinx: Do not use gpiochip_get_data() in xgpio_save_regs())
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (074726402b82 pwm: omap-dmtimer: Potential NULL dereference on error)
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (b360ada3f153 Merge tag 'tegra-for-4.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-next)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (514c11dabdf2 aio: fix a compiler warning on 32 bit architectures in aio_renameat())
$ git reset --hard HEAD^
Merging next-20160111 version of aio
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (1b1fe542b6f0 selftests: firmware: add empty string and async tests)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (8735f8e16a70 selftests/x86: Add tests for UC_SIGCONTEXT_SS and UC_STRICT_RESTORE_SS)
Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)
Merging livepatching/for-next (5dc5f4089332 Merge branch 'for-4.5/core' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c
Merging coresight/next (d2b29c2f35a2 coresight: Fix a typo in Kconfig)
Merging rtc/rtc-next (079062b28fb4 rtc: cmos: prevent kernel warning on IRQ flags mismatch)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (8b63b6bfc1a5 Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm)
Merging akpm-current/current (f9372fa25548 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in scripts/tags.sh
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (content): Merge conflict in include/linux/memblock.h
CONFLICT (content): Merge conflict in fs/block_dev.c
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable_64.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/64/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs"
Applying: mm, dax, gpu: merge fix for convert vm_insert_mixed to pfn_t
Applying: mm, dax: convert vmf_insert_pfn_pmd() to pfn_t fix
Applying: fix up for bad merge of arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP
Applying: Revert "mm, vmalloc: remove VM_VPAGES"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs/overlayfs/super.c needs pagemap.h
Applying: fs/adfs/adfs.h: tidy up comments
Applying: iio: core: fix ptr_ret.cocci warnings
Applying: dma-mapping: make the generic coherent dma mmap implementation optional
Applying: arc: convert to dma_map_ops
Applying: arc: dma mapping fixes
Applying: ARC: dma mapping fixes #2
Applying: avr32: convert to dma_map_ops
Applying: blackfin: convert to dma_map_ops
Applying: c6x: convert to dma_map_ops
Applying: C6X: fix build breakage
Applying: c6x: dma mapping fixes
Applying: cris: convert to dma_map_ops
Applying: nios2: convert to dma_map_ops
Applying: nios2: dma mapping fixes
Applying: frv: convert to dma_map_ops
Applying: parisc: convert to dma_map_ops
Applying: mn10300: convert to dma_map_ops
Applying: m68k: convert to dma_map_ops
Applying: metag: convert to dma_map_ops
Applying: sparc: use generic dma_set_mask
Applying: tile: uninline dma_set_mask
Applying: dma-mapping: always provide the dma_map_ops based implementation
Applying: HAVE_DMA_ATTRS: remove leftovers in Kconfig
Applying: dma-mapping: remove <asm-generic/dma-coherent.h>
Applying: dma-mapping: use offset_in_page macro
Applying: memstick: use sector_div instead of do_div
Applying: mm: memcontrol: drop unused @css argument in memcg_init_kmem
Applying: mm: memcontrol: remove double kmem page_counter init
Applying: mm: memcontrol: give the kmem states more descriptive names
Applying: mm: memcontrol: group kmem init and exit functions together
Applying: mm: memcontrol: separate kmem code from legacy tcp accounting code
Applying: mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix
Applying: mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
Applying: mm: memcontrol: allow to disable kmem accounting for cgroup2
Applying: mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
Applying: mm: memcontrol: only manage socket pressure for CONFIG_INET
Applying: net: drop tcp_memcontrol.c
Applying: net-drop-tcp_memcontrolc-fix
Applying: mm: memcontrol: rein in the CONFIG space madness
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix-fix
Applying: mm: memcontrol: flatten struct cg_proto
Applying: mm: memcontrol: clean up alloc, online, offline, free functions
Applying: mm: memcontrol: clean up alloc, online, offline, free functions fix
Applying: memcg: fix SLOB build regression
Applying: mm: memcontrol: charge swap to cgroup2
Applying: mm: vmscan: pass memcg to get_scan_count()
Applying: mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
Applying: swap.h: move memcg related stuff to the end of the file
Applying: mm: vmscan: do not scan anon pages if memcg swap limit is hit
Applying: mm: free swap cache aggressively if memcg swap is full
Applying: Documentation: cgroup: add memory.swap.{current,max} description
Applying: MAINTAINERS: add git URL for APM driver
Applying: MAINTAINERS: add git URL for at91
Applying: MAINTAINERS: add git URL for Rockchip
Applying: MAINTAINERS: add git URL for ARM64
Applying: MAINTAINERS: update git URL for ath6kl
Applying: MAINTAINERS: add git URL for backlight
Applying: MAINTAINERS: add git URL for chrome
Applying: MAINTAINERS: add git URL for cris
Applying: MAINTAINERS: add git URL for cryptodev
Applying: MAINTAINERS: add git URL for devfreq
Applying: MAINTAINERS: update git URL for DLM
Applying: MAINTAINERS: add git URL for eCryptfs
Applying: MAINTAINERS: add git URL for ext4
Applying: MAINTAINERS: add git URL for hwspinlock
Applying: MAINTAINERS: add git URL for integrity
Applying: MAINTAINERS: add git URL for IPVS
Applying: MAINTAINERS: add git URL for nfsd
Applying: MAINTAINERS: add git URL for KVM/s390
Applying: MAINTAINERS: add git URL for kgdb
Applying: MAINTAINERS: add git URL for nvdimm
Applying: MAINTAINERS: add git URL for metag
Applying: MAINTAINERS: add git URL for wireless drivers
Applying: MAINTAINERS: add git URL for devicetree
Applying: MAINTAINERS: update git URL for PCMCIA
Applying: MAINTAINERS: update git URL for pstore
Applying: MAINTAINERS: update git URL for ath10k
Applying: MAINTAINERS: add git URL for hexagon
Applying: MAINTAINERS: add git URL for reset
Applying: MAINTAINERS: add git URL for s390
Applying: MAINTAINERS: fix tree format for SAMSUNG thermal
Applying: MAINTAINERS: add git URL for md
Applying: MAINTAINERS: add git URL for squashfs
Applying: MAINTAINERS: add git URL for swiotlb
Applying: MAINTAINERS: add git URL for xtensa
Applying: MAINTAINERS: fix tree format for TPM
Applying: MAINTAINERS: add git URL for UML
Applying: MAINTAINERS: add git URL for VFIO
Applying: MAINTAINERS: add git URL for vhost
Applying: MAINTAINERS: update git URL for XFS
Applying: MAINTAINERS: fix MIC maintainers entry
Applying: dax: fix NULL pointer dereference in __dax_dbg()
Applying: dax: fix conversion of holes to PMDs
Applying: pmem: add wb_cache_pmem() to the PMEM API
Applying: pmem-add-wb_cache_pmem-to-the-pmem-api-v6
Applying: dax: support dirty DAX entries in radix tree
Applying: dax-support-dirty-dax-entries-in-radix-tree-v6
Applying: mm: add find_get_entries_tag()
Applying: dax: add support for fsync/sync
Applying: dax-add-support-for-fsync-sync-v6
Applying: dax: fix dax_pmd_dbg build warning
Applying: dax: add support for fsync/msync
Applying: dax-add-support-for-fsync-msync-v8
Applying: ext2: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: ext4: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: xfs: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: tree wide: use kvfree() than conditional kfree()/vfree()
Merging akpm/master (f6c01f93dcaf tree wide: use kvfree() than conditional kfree()/vfree())
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-01-13 6:31 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Tetsuo Handa, David Rientjes
In-Reply-To: <20160113171830.57bc8089@canb.auug.org.au>
Hi Andrew,
On Wed, 13 Jan 2016 17:18:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the akpm-current tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> mm/vmalloc.c: In function '__vunmap':
> mm/vmalloc.c:1482:21: error: 'VM_VPAGES' undeclared (first use in this function)
> if (area->flags & VM_VPAGES)
> ^
>
> Caused by commit
>
> 7ab2843f2735 ("mm, vmalloc: remove VM_VPAGES")
>
> Yesterday, there was a previous commit (which seems to have been
> removed)
>
> "tree wide: use kvfree() than conditional kfree()/vfree()"
I see that this patch is now in the akpm tree i.e. later on. So I
guess you need to move the above patch as well.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-01-13 6:18 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Tetsuo Handa, David Rientjes
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
mm/vmalloc.c: In function '__vunmap':
mm/vmalloc.c:1482:21: error: 'VM_VPAGES' undeclared (first use in this function)
if (area->flags & VM_VPAGES)
^
Caused by commit
7ab2843f2735 ("mm, vmalloc: remove VM_VPAGES")
Yesterday, there was a previous commit (which seems to have been
removed)
"tree wide: use kvfree() than conditional kfree()/vfree()"
that removed this use of the VM_VPAGES flag.
I have reverted this commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: build failure after merge of the powerpc tree
From: Aneesh Kumar K.V @ 2016-01-13 5:46 UTC (permalink / raw)
To: Michael Ellerman, Stephen Rothwell, Benjamin Herrenschmidt,
linuxppc-dev
Cc: Michael Neuling, linux-next, linux-kernel
In-Reply-To: <1452162650.5826.2.camel@ellerman.id.au>
Michael Ellerman <mpe@ellerman.id.au> writes:
> On Thu, 2016-01-07 at 19:16 +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the powerpc tree, today's linux-next build (powerpc64
>> allnoconfig) failed like this:
>>
>> arch/powerpc/mm/hash_utils_64.c: In function 'get_paca_psize':
>> arch/powerpc/mm/hash_utils_64.c:869:19: error: 'struct paca_struct' has no member named 'context'
>> return get_paca()->context.user_psize;
>> ^
>> arch/powerpc/mm/hash_utils_64.c:870:1: error: control reaches end of non-void function [-Werror=return-type]
>> }
>> ^
>>
>> Caused by commit
>>
>> 2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
>
> Well that's rather embarrassing, for Mikey ;D
>
>> This build has CONFIG_PPC_MM_SLICES not set ...
>
> Ugh, but it would seem none of our defconfigs do :/
4K page size with hugetlb disabled will get that
-aneesh
^ permalink raw reply
* linux-next: manual merge of the block tree with Linus' tree
From: Stephen Rothwell @ 2016-01-13 2:07 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-next, linux-kernel, Christoph Hellwig, Keith Busch
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
drivers/nvme/host/Makefile
between commit:
c4699e70d1db ("lightnvm: Simplify config when disabled")
from Linus' tree and commit:
21d34711e1b5 ("nvme: split command submission helpers out of pci.c")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/nvme/host/Makefile
index a5fe23952586,baf9f52bbfa5..000000000000
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
@@@ -1,5 -1,5 +1,6 @@@
obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
- lightnvm-$(CONFIG_NVM) := lightnvm.o
- nvme-y += pci.o scsi.o $(lightnvm-y)
-nvme-y += core.o pci.o lightnvm.o
++lightnvm-$(CONFIG_NVM) := lightnvm.o
++nvme-y += core.o pci.o $(lightnvm-y)
+ nvme-$(CONFIG_BLK_DEV_NVME_SCSI) += scsi.o
^ permalink raw reply
* linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2016-01-13 1:35 UTC (permalink / raw)
To: Doug Ledford, David Miller, netdev
Cc: linux-next, linux-kernel, Maor Gottlieb, Achiad Shochat
Hi Doug,
After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/infiniband/hw/mlx5/main.c: In function 'mlx5_ib_add':
drivers/infiniband/hw/mlx5/main.c:2255:6: error: too few arguments to function 'mlx5_ib_port_link_layer'
if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
^
drivers/infiniband/hw/mlx5/main.c:89:1: note: declared here
mlx5_ib_port_link_layer(struct ib_device *device, u8 port_num)
^
Caused by commit
ebd61f68e1c7 ("IB/mlx5: Support IB device's callback for getting the link layer")
interacting with commit
038d2ef87572 ("IB/mlx5: Add flow steering support")
from the net-next tree.
I have added the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 13 Jan 2016 12:30:50 +1100
Subject: [PATCH] IB/mlx5: merge fix for mlx5_ib_port_link_layer API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/infiniband/hw/mlx5/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 307a8c040a11..a2613d828578 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -2252,7 +2252,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
(1ull << IB_USER_VERBS_CMD_CLOSE_XRCD);
}
- if (mlx5_ib_port_link_layer(&dev->ib_dev) ==
+ if (mlx5_ib_port_link_layer(&dev->ib_dev, 1) ==
IB_LINK_LAYER_ETHERNET) {
dev->ib_dev.create_flow = mlx5_ib_create_flow;
dev->ib_dev.destroy_flow = mlx5_ib_destroy_flow;
--
2.6.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* mmotm 2016-01-12-16-44 uploaded
From: akpm @ 2016-01-13 0: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-01-12-16-44 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.4:
(patches marked "*" will be included in linux-next)
origin.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
drivers-gpu-drm-i915-intel_spritec-fix-build.patch
drivers-gpu-drm-i915-intel_tvc-fix-build.patch
arm-mm-do-not-use-virt_to_idmap-for-nommu-systems.patch
* m32r-fix-m32104ut_defconfig-build-fail.patch
* dma-debug-switch-check-from-_text-to-_stext.patch
* scripts-bloat-o-meter-fix-python3-syntax-error.patch
* nfs-hangs-in-__ocfs2_cluster_lock-due-to-race-with-ocfs2_unblock_lock.patch
* fsnotify-use-list_next_entry-in-fsnotify_unmount_inodes.patch
* fsnotify-destroy-marks-with-call_srcu-instead-of-dedicated-thread.patch
* modpost-dont-add-a-trailing-wildcard-for-of-module-aliases.patch
* logfs-fix-logfs-build-errors-and-dependencies.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-optimize-bad-declarations-and-redundant-assignment.patch
* ocfs2-return-non-zero-st_blocks-for-inline-data.patch
* o2hb-increase-unsteady-iterations.patch
* ocfs2-dlm-fix-a-race-between-purge-and-migratio.patch
* ocfs2-dlm-fix-a-race-between-purge-and-migratio-v2.patch
* ocfs2-constify-ocfs2_extent_tree_operations-structures.patch
* ocfs2-dlm-wait-until-dlm_lock_res_setref_inprog-is-cleared-in-dlm_deref_lockres_worker.patch
* ocfs2-clean-up-redundant-null-check-before-iput.patch
* ocfs2-dlm-return-appropriate-value-when-dlm_grab-returns-null.patch
* ocfs2-fix-slot-overwritten-if-storage-link-down-during-mount.patch
* ocfs2-fix-slot-overwritten-if-storage-link-down-during-mount-checkpatch-fixes.patch
* ocfs2-do-not-lock-unlock-inode-dlm-lock.patch
* ocfs2-dlm-ignore-cleaning-the-migration-mle-that-is-inuse.patch
* ocfs2-dlm-do-not-insert-a-new-mle-when-another-process-is-already-migrating.patch
* ocfs2-access-orphan-dinode-before-delete-entry-in-ocfs2_orphan_del.patch
* ocfs2-dlm-remove-redundant-code.patch
* ocfs2-dlm-cleanup-redunant-lksb-flags-in-dlmcommonh.patch
* ocfs2-add-ocfs2_write_type_t-type-to-identify-the-caller-of-write.patch
* ocfs2-use-c_new-to-indicate-newly-allocated-extents.patch
* ocfs2-test-target-page-before-change-it.patch
* ocfs2-do-not-change-i_size-in-write_end-for-direct-io.patch
* ocfs2-return-the-physical-address-in-ocfs2_write_cluster.patch
* ocfs2-record-unwritten-extents-when-populate-write-desc.patch
* ocfs2-fix-sparse-file-data-ordering-issue-in-direct-io.patch
* ocfs2-code-clean-up-for-direct-io.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue.patch
* ocfs2-fix-ip_unaligned_aio-deadlock-with-dio-work-queue-fix.patch
* ocfs2-take-ip_alloc_sem-in-ocfs2_dio_get_block-ocfs2_dio_end_io_write.patch
* ocfs2-fix-disk-file-size-and-memory-file-size-mismatch.patch
* ocfs2-fix-a-deadlock-issue-in-ocfs2_dio_end_io_write.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v2.patch
* ocfs2-dlm-fix-race-between-convert-and-recovery-v3.patch
* ocfs2-dlm-fix-bug-in-dlm_move_lockres_to_recovery_list.patch
* ocfs2-extend-transaction-for-ocfs2_remove_rightmost_path-and-ocfs2_update_edge_lengths-before-to-avoid-inconsistency-between-inode-and-et.patch
* extend-enough-credits-for-freeing-one-truncate-record-while-replaying-truncate-records.patch
* ocfs2-avoid-occurring-deadlock-by-changing-ocfs2_wq-from-global-to-local.patch
* ocfs2-solve-a-problem-of-crossing-the-boundary-in-updating-backups.patch
* ocfs2-export-ocfs2_kset-for-online-file-check.patch
* ocfs2-sysfile-interfaces-for-online-file-check.patch
* ocfs2-create-remove-sysfile-for-online-file-check.patch
* ocfs2-check-fix-inode-block-for-online-file-check.patch
* ocfs2-add-feature-document-for-online-file-check.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch
mm.patch
* mm-slab-use-list_first_entry_or_null.patch
* mm-slab-use-list_for_each_entry-in-cache_flusharray.patch
* mm-slabc-add-a-helper-function-get_first_slab.patch
* revert-kernfs-do-not-account-ino_ida-allocations-to-memcg.patch
* revert-gfp-add-__gfp_noaccount.patch
* memcg-only-account-kmem-allocations-marked-as-__gfp_account.patch
* slab-add-slab_account-flag.patch
* vmalloc-allow-to-account-vmalloc-to-memcg.patch
* account-certain-kmem-allocations-to-memcg.patch
* account-certain-kmem-allocations-to-memcg-checkpatch-fixes.patch
* mm-mlockc-drop-unneeded-initialization-in-munlock_vma_pages_range.patch
* mm-mmapc-remove-redundant-local-variables-for-may_expand_vm.patch
* mm-change-trace_mm_vmscan_writepage-proto-type.patch
* include-define-__phys_to_pfn-as-phys_pfn.patch
* include-define-__phys_to_pfn-as-phys_pfn-fix.patch
* include-define-__phys_to_pfn-as-phys_pfn-fix-2.patch
* mempolicy-convert-the-shared_policy-lock-to-a-rwlock.patch
* mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch
* mm-page_isolation-return-last-tested-pfn-rather-than-failure-indicator.patch
* mm-page_isolation-add-new-tracepoint-test_pages_isolated.patch
* mm-cma-always-check-which-page-cause-allocation-failure.patch
* mm-cma-always-check-which-page-cause-allocation-failure-v2.patch
* mm-change-mm_vmscan_lru_shrink_inactive-proto-types.patch
* mm-hugetlb-is_file_hugepages-can-be-boolean.patch
* mm-memblock-memblock_is_memory-reserved-can-be-boolean.patch
* mm-lru-remove-unused-is_unevictable_lru-function.patch
* mm-zonelist-enumerate-zonelists-array-index.patch
* mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch
* mm-zonelist-enumerate-zonelists-array-index-fix.patch
* mm-zonelist-enumerate-zonelists-array-index-fix-fix.patch
* mm-zonelist-enumerate-zonelists-array-index-fix-fix-fix.patch
* mm-get-rid-of-__alloc_pages_high_priority.patch
* mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch
* mm-do-not-loop-over-alloc_no_watermarks-without-triggering-reclaim.patch
* mm-vmalloc-use-list_nextfirst_entry.patch
* mm-mmzone-memmap_valid_within-can-be-boolean.patch
* mm-documentation-clarify-proc-pid-status-vmswap-limitations-for-shmem.patch
* mm-proc-account-for-shmem-swap-in-proc-pid-smaps.patch
* mm-proc-reduce-cost-of-proc-pid-smaps-for-shmem-mappings.patch
* mm-proc-reduce-cost-of-proc-pid-smaps-for-unpopulated-shmem-mappings.patch
* mm-shmem-add-internal-shmem-resident-memory-accounting.patch
* mm-procfs-breakdown-rss-for-anon-shmem-and-file-in-proc-pid-status.patch
* mm-thp-use-list_first_entry_or_null.patch
* mm-vmalloc-remove-vm_vpages.patch
* vmscan-do-not-force-scan-file-lru-if-its-absolute-size-is-small.patch
* vmscan-do-not-force-scan-file-lru-if-its-absolute-size-is-small-v2.patch
* memcg-do-not-allow-to-disable-tcp-accounting-after-limit-is-set.patch
* fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch
* mm-vmscan-consider-isolated-pages-in-zone_reclaimable_pages.patch
* mm-mmapc-remove-incorrect-map_fixed-flag-comparison-from-mmap_region.patch
* mm-mmap-add-new-proc-tunable-for-mmap_base-aslr.patch
* arm-mm-support-arch_mmap_rnd_bits.patch
* arm-mm-support-arch_mmap_rnd_bits-v7.patch
* arm64-mm-support-arch_mmap_rnd_bits.patch
* arm64-mm-support-arch_mmap_rnd_bits-fix.patch
* arm64-mm-support-arch_mmap_rnd_bits-v6.patch
* arm64-mm-support-arch_mmap_rnd_bits-v7.patch
* x86-mm-support-arch_mmap_rnd_bits.patch
* x86-mm-support-arch_mmap_rnd_bits-v7.patch
* mm-compaction-improve-comment-for-compact_memory-tunable-knob-handler.patch
* mm-allow-gfp_iofs-for-page_cache_read-page-cache-allocation.patch
* mm-page_alloc-generalize-the-dirty-balance-reserve.patch
* proc-meminfo-estimate-available-memory-more-conservatively.patch
* drivers-memory-clean-up-section-counting.patch
* drivers-memory-rename-remove_memory_block-to-remove_memory_section.patch
* mm-page_alloc-remove-unnecessary-parameter-from-__rmqueue.patch
* mm-page_allocc-use-list_firstlast_entry-instead-of-list_entry.patch
* mm-page_allocc-use-list_for_each_entry-in-mark_free_pages.patch
* mm-oom-give-__gfp_nofail-allocations-access-to-memory-reserves.patch
* mm-memblock-remove-rgnbase-and-rgnsize-variables.patch
* mm-memblock-introduce-for_each_memblock_type.patch
* mm-swapfilec-use-list_nextfirst_entry.patch
* mm-compaction-__compact_pgdat-code-cleanuup.patch
* mm-readaheadc-mm-vmscanc-use-lru_to_page-instead-of-list_to_page.patch
* mm-ksmc-use-list_for_each_entry_safe.patch
* mm-memcontrol-export-root_mem_cgroup.patch
* net-tcp_memcontrol-properly-detect-ancestor-socket-pressure.patch
* net-tcp_memcontrol-remove-bogus-hierarchy-pressure-propagation.patch
* net-tcp_memcontrol-protect-all-tcp_memcontrol-calls-by-jump-label.patch
* net-tcp_memcontrol-remove-dead-per-memcg-count-of-allocated-sockets.patch
* net-tcp_memcontrol-simplify-the-per-memcg-limit-access.patch
* net-tcp_memcontrol-sanitize-tcp-memory-accounting-callbacks.patch
* net-tcp_memcontrol-simplify-linkage-between-socket-and-page-counter.patch
* net-tcp_memcontrol-simplify-linkage-between-socket-and-page-counter-fix.patch
* mm-memcontrol-generalize-the-socket-accounting-jump-label.patch
* mm-memcontrol-do-not-account-memoryswap-on-unified-hierarchy.patch
* mm-memcontrol-move-socket-code-for-unified-hierarchy-accounting.patch
* mm-memcontrol-account-socket-memory-in-unified-hierarchy-memory-controller.patch
* mm-memcontrol-hook-up-vmpressure-to-socket-pressure.patch
* mm-memcontrol-switch-to-the-updated-jump-label-api.patch
* mm-memcontrol-hook-up-vmpressure-to-socket-pressure-fix.patch
* vmstat-make-vmstat_updater-deferrable-again-and-shut-down-on-idle.patch
* vmstat-make-vmstat_updater-deferrable-again-and-shut-down-on-idle-fix.patch
* mm-make-sure-isolate_lru_page-is-never-called-for-tail-page.patch
* mm-proc-pid-clear_refs-no-need-to-clear-vm_softdirty-in-clear_soft_dirty_pmd.patch
* mm-swapfilec-use-list_for_each_entry_safe-in-free_swap_count_continuations.patch
* hugetlb-make-mm-and-fs-code-explicitly-non-modular.patch
* memory-hotplug-dont-bug-in-register_memory_resource.patch
* memory-hotplug-dont-bug-in-register_memory_resource-v2.patch
* documentation-describe-the-shared-memory-usage-accounting.patch
* mm-move-lru_to_page-to-mm_inlineh.patch
* mm-memblock-fix-ordering-of-flags-argument-in-comments.patch
* mm-rework-virtual-memory-accounting.patch
* mm-fix-noisy-sparse-warning-in-libcfs_alloc_pre.patch
* mm-page_isolation-use-micro-to-judge-the-alignment.patch
* memory-hotplug-fix-kernel-warning-during-memory-hotplug-on-ppc64.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-3.patch
* mm-add-tracepoint-for-scanning-pages.patch
* mm-add-tracepoint-for-scanning-pages-fix.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-fix-kernel-crash-in-khugepaged-thread.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
* arm64-fix-add-kasan-bug.patch
* zram-zcomp-use-gfp_noio-to-allocate-streams.patch
* zram-try-vmalloc-after-kmalloc.patch
* zram-pass-gfp-from-zcomp-frontend-to-backend.patch
* zram-zcomp-do-not-zero-out-zcomp-private-pages.patch
* mm-zbud-use-list_last_entry-instead-of-list_tail_entry.patch
* zsmalloc-reorganize-struct-size_class-to-pack-4-bytes-hole.patch
* page-flags-trivial-cleanup-for-pagetrans-helpers.patch
* page-flags-move-code-around.patch
* page-flags-introduce-page-flags-policies-wrt-compound-pages.patch
* page-flags-introduce-page-flags-policies-wrt-compound-pages-fix.patch
* page-flags-introduce-page-flags-policies-wrt-compound-pages-fix-fix.patch
* page-flags-introduce-page-flags-policies-wrt-compound-pages-fix-3.patch
* page-flags-define-pg_locked-behavior-on-compound-pages.patch
* page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch
* page-flags-define-behavior-of-fs-io-related-flags-on-compound-pages.patch
* page-flags-define-behavior-of-lru-related-flags-on-compound-pages.patch
* page-flags-define-behavior-slb-related-flags-on-compound-pages.patch
* page-flags-define-behavior-of-xen-related-flags-on-compound-pages.patch
* page-flags-define-pg_reserved-behavior-on-compound-pages.patch
* page-flags-define-pg_reserved-behavior-on-compound-pages-fix.patch
* page-flags-define-pg_swapbacked-behavior-on-compound-pages.patch
* page-flags-define-pg_swapcache-behavior-on-compound-pages.patch
* page-flags-define-pg_mlocked-behavior-on-compound-pages.patch
* page-flags-define-pg_uncached-behavior-on-compound-pages.patch
* page-flags-define-pg_uptodate-behavior-on-compound-pages.patch
* page-flags-look-at-head-page-if-the-flag-is-encoded-in-page-mapping.patch
* mm-sanitize-page-mapping-for-tail-pages.patch
* page-flags-drop-__testclearpage-helpers.patch
* mm-proc-adjust-pss-calculation.patch
* rmap-add-argument-to-charge-compound-page.patch
* rmap-add-argument-to-charge-compound-page-fix.patch
* memcg-adjust-to-support-new-thp-refcounting.patch
* mm-thp-adjust-conditions-when-we-can-reuse-the-page-on-wp-fault.patch
* mm-adjust-foll_split-for-new-refcounting.patch
* mm-handle-pte-mapped-tail-pages-in-gerneric-fast-gup-implementaiton.patch
* thp-mlock-do-not-allow-huge-pages-in-mlocked-area.patch
* khugepaged-ignore-pmd-tables-with-thp-mapped-with-ptes.patch
* thp-rename-split_huge_page_pmd-to-split_huge_pmd.patch
* mm-vmstats-new-thp-splitting-event.patch
* mm-temporally-mark-thp-broken.patch
* thp-drop-all-split_huge_page-related-code.patch
* mm-drop-tail-page-refcounting.patch
* futex-thp-remove-special-case-for-thp-in-get_futex_key.patch
* futex-thp-remove-special-case-for-thp-in-get_futex_key-fix.patch
* ksm-prepare-to-new-thp-semantics.patch
* mm-thp-remove-compound_lock.patch
* arm64-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* arm-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* arm-thp-remove-infrastructure-for-handling-splitting-pmds-fix.patch
* mips-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* powerpc-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* s390-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* sparc-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* tile-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* x86-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* mm-thp-remove-infrastructure-for-handling-splitting-pmds.patch
* mm-thp-remove-infrastructure-for-handling-splitting-pmds-fix.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-2.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-3.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-4.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-5.patch
* mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix-5-fix.patch
* mm-differentiate-page_mapped-from-page_mapcount-for-compound-pages.patch
* mm-numa-skip-pte-mapped-thp-on-numa-fault.patch
* thp-implement-split_huge_pmd.patch
* thp-add-option-to-setup-migration-entries-during-pmd-split.patch
* thp-mm-split_huge_page-caller-need-to-lock-page.patch
* mm-soft-offline-check-return-value-in-second-__get_any_page-call.patch
* mm-hwpoison-adjust-for-new-thp-refcounting.patch
* mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch
* thp-reintroduce-split_huge_page.patch
* thp-reintroduce-split_huge_page-fix-2.patch
* thp-reintroduce-split_huge_page-fix-3.patch
* thp-reintroduce-split_huge_page-fix-4.patch
* migrate_pages-try-to-split-pages-on-qeueuing.patch
* migrate_pages-try-to-split-pages-on-queuing-fix.patch
* thp-introduce-deferred_split_huge_page.patch
* thp-introduce-deferred_split_huge_page-fix.patch
* mm-re-enable-thp.patch
* thp-update-documentation.patch
* thp-allow-mlocked-thp-again.patch
* thp-allow-mlocked-thp-again-fix.patch
* thp-allow-mlocked-thp-again-fix-2.patch
* mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting.patch
* mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-fix.patch
* mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch
* mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-fix-fix.patch
* mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-fix-fix-fix.patch
* thp-add-debugfs-handle-to-split-all-huge-pages.patch
* thp-add-debugfs-handle-to-split-all-huge-pages-fix.patch
* thp-increase-split_huge_page-success-rate.patch
* thp-increase-split_huge_page-success-rate-fix.patch
* mm-add-page_check_address_transhuge-helper.patch
* mm-add-page_check_address_transhuge-helper-fix.patch
* mm-add-page_check_address_transhuge-helper-fix-fix.patch
* mm-support-madvisemadv_free.patch
* mm-support-madvisemadv_free-fix.patch
* mm-support-madvisemadv_free-fix-2.patch
* mm-support-madvisemadv_free-fix-2-fix.patch
* mm-define-madv_free-for-some-arches.patch
* arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures.patch
* arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix.patch
* arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2.patch
* arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-3.patch
* arch-uapi-asm-mmanh-let-madv_free-have-same-value-for-all-architectures-fix-fix-2-fix-4.patch
* mm-free-swp_entry-in-madvise_free.patch
* mm-move-lazily-freed-pages-to-inactive-list.patch
* mm-mark-stable-page-dirty-in-ksm.patch
* x86-add-pmd_-for-thp.patch
* sparc-add-pmd_-for-thp.patch
* powerpc-add-pmd_-for-thp.patch
* arm-add-pmd_mkclean-for-thp.patch
* arm64-add-pmd_mkclean-for-thp.patch
* mm-dont-split-thp-page-when-syscall-is-called.patch
* pmem-dax-clean-up-clear_pmem.patch
* dax-increase-granularity-of-dax_clear_blocks-operations.patch
* dax-guarantee-page-aligned-results-from-bdev_direct_access.patch
* dax-fix-lifetime-of-in-kernel-dax-mappings-with-dax_map_atomic.patch
* dax-fix-lifetime-of-in-kernel-dax-mappings-with-dax_map_atomic-v3.patch
* mm-dax-fix-livelock-allow-dax-pmd-mappings-to-become-writeable.patch
* dax-split-pmd-map-when-fallback-on-cow.patch
* um-kill-pfn_t.patch
* kvm-rename-pfn_t-to-kvm_pfn_t.patch
* mm-dax-pmem-introduce-pfn_t.patch
* mm-skip-memory-block-registration-for-zone_device.patch
* mm-introduce-find_dev_pagemap.patch
* x86-mm-introduce-vmem_altmap-to-augment-vmemmap_populate.patch
* x86-mm-introduce-vmem_altmap-to-augment-vmemmap_populate-fix.patch
* libnvdimm-pfn-pmem-allocate-memmap-array-in-persistent-memory.patch
* libnvdimm-pfn-pmem-allocate-memmap-array-in-persistent-memory-fix.patch
* avr32-convert-to-asm-generic-memory_modelh.patch
* hugetlb-fix-compile-error-on-tile.patch
* frv-fix-compiler-warning-from-definition-of-__pmd.patch
* x86-mm-introduce-_page_devmap.patch
* mm-dax-gpu-convert-vm_insert_mixed-to-pfn_t.patch
* mm-dax-convert-vmf_insert_pfn_pmd-to-pfn_t.patch
* libnvdimm-pmem-move-request_queue-allocation-earlier-in-probe.patch
* mm-dax-pmem-introduce-getput_dev_pagemap-for-dax-gup.patch
* mm-dax-pmem-introduce-getput_dev_pagemap-for-dax-gup-fix.patch
* mm-dax-dax-pmd-vs-thp-pmd-vs-hugetlbfs-pmd.patch
* mm-dax-dax-pmd-vs-thp-pmd-vs-hugetlbfs-pmd-fix.patch
* mm-dax-dax-pmd-vs-thp-pmd-vs-hugetlbfs-pmd-v5.patch
* mm-dax-dax-pmd-vs-thp-pmd-vs-hugetlbfs-pmd-v5-fix.patch
* mm-x86-get_user_pages-for-dax-mappings.patch
* mm-x86-get_user_pages-for-dax-mappings-v5.patch
* dax-provide-diagnostics-for-pmd-mapping-failures.patch
* dax-re-enable-dax-pmd-mappings.patch
* mm-bring-in-additional-flag-for-fixup_user_fault-to-signal-unlock.patch
* s390-mm-enable-fixup_user_fault-retrying.patch
* mm-oom-rework-oom-detection.patch
* mm-oom-rework-oom-detection-checkpatch-fixes.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations.patch
* mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations-checkpatch-fixes.patch
* memblock-fix-section-mismatch.patch
* mm-page_isolation-do-some-cleanup-in-undo_isolate_page_range.patch
* sched-add-schedule_timeout_idle.patch
* mm-oom-introduce-oom-reaper.patch
* mm-oom-introduce-oom-reaper-v4.patch
* oom-reaper-handle-anonymous-mlocked-pages.patch
* oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space.patch
* mm-oom_killc-dont-skip-pf_exiting-tasks-when-searching-for-a-victim.patch
* cgroup-memcg-writeback-drop-spurious-rcu-locking-around-mem_cgroup_css_from_page.patch
* mm-vmallocc-use-micro-is_aligned-to-judge-the-aligment.patch
* mm-mlockc-change-can_do_mlock-return-value-type-to-boolean.patch
* mm-mlockc-change-can_do_mlock-return-value-type-to-boolean-fix.patch
* mm-page_alloc-remove-unused-struct-zone-z-variable.patch
* mm-page_allocc-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
* mm-page_allocc-introduce-kernelcore=mirror-option.patch
* mm-page_allocc-introduce-kernelcore=mirror-option-fix.patch
* mm-page_allocc-rework-code-layout-in-memmap_init_zone.patch
* mm-mempolicy-skip-non-migratable-vmas-when-setting-mpol_mf_lazy.patch
* mm-fix-locking-order-in-mm_take_all_locks.patch
* mm-make-swapoff-more-robust-against-soft-dirty.patch
* mm-hugetlbfs-fix-bugs-in-hugetlb_vmtruncate_list.patch
* mm-hugetlbfs-unmap-pages-if-page-fault-raced-with-hole-punch.patch
* mm-hugetlbfs-unmap-pages-if-page-fault-raced-with-hole-punch-fix.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* mm-soft-offline-clean-up-soft_offline_page.patch
* mm-soft-offline-exit-with-failure-for-non-anonymous-thp.patch
* mm-soft-offline-exit-with-failure-for-non-anonymous-thp-fix.patch
* um-fix-build-error-and-kconfig-for-i386.patch
* use-poison_pointer_delta-for-poison-pointers.patch
* include-kernelh-change-abs-macro-so-it-uses-consistent-return-type.patch
* fs-statc-drop-the-last-new_valid_dev-check.patch
* include-linux-kdev_th-remove-new_valid_dev.patch
* kconfig-remove-have_latencytop_support.patch
* errh-add-missing-unlikely-to-is_err_or_null.patch
* uselib-default-depending-if-libc5-was-used.patch
* kernel-stop_machinec-remove-config_smp-dependencies.patch
* kernel-stop_machinec-remove-config_smp-dependencies-fix.patch
* kernel-hung_taskc-use-timeout-diff-when-timeout-is-updated.patch
* asm-sections-add-helpers-to-check-for-section-data.patch
* printk-only-unregister-boot-consoles-when-necessary.patch
* printk-do-cond_resched-between-lines-while-outputting-to-consoles.patch
* printk-do-cond_resched-between-lines-while-outputting-to-consoles-fix.patch
* lib-vsprintfc-pull-out-padding-code-from-dentry_name.patch
* lib-vsprintfc-move-string-below-widen_string.patch
* lib-vsprintfc-eliminate-potential-race-in-string.patch
* lib-vsprintfc-expand-field_width-to-24-bits.patch
* lib-vsprintfc-expand-field_width-to-24-bits-fix.patch
* lib-vsprintfc-help-gcc-make-number-smaller.patch
* lib-vsprintfc-warn-about-too-large-precisions-and-field-widths.patch
* lib-kasprintfc-add-sanity-check-to-kvasprintf.patch
* lib-test_printfc-dont-bug.patch
* lib-test_printfc-check-for-out-of-bound-writes.patch
* lib-test_printfc-test-precision-quirks.patch
* lib-test_printfc-add-a-few-number-tests.patch
* lib-test_printfc-account-for-kvasprintf-tests.patch
* lib-test_printfc-add-test-for-large-bitmaps.patch
* lib-test_printfc-test-dentry-printing.patch
* lib-test_printfc-test-dentry-printing-fix.patch
* printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments.patch
* printk-help-pr_debug-and-pr_devel-to-optimize-out-arguments-fix.patch
* printk-formatstxt-remove-unimplemented-%pt.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi-v4.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi-v4-fix.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi-v4-fix-fix.patch
* printk-nmi-use-irq-work-only-when-ready.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context-fix.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable-fix-2.patch
* lib-vsprintf-refactor-duplicate-code-to-special_hex_number.patch
* lib-vsprintf-factor-out-%pn-handler-as-netdev_bits.patch
* printk-change-recursion_bug-type-to-bool.patch
* scripts-get_maintainerpl-handle-file-names-beginning-with.patch
* string_helpers-fix-precision-loss-for-some-inputs.patch
* frv-io-accept-const-void-pointers-for-readbwl.patch
* lib-iomap_copy-add-__ioread32_copy.patch
* soc-qcom-smd-use-__ioread32_copy-instead-of-open-coding-it.patch
* firmware-bcm47xx_nvram-use-__ioread32_copy-instead-of-open-coding.patch
* test_hexdump-rename-to-test_hexdump.patch
* test_hexdump-introduce-test_hexdump_prepare_test-helper.patch
* test_hexdump-define-fill_char-constant.patch
* test_hexdump-go-through-all-possible-lengths-of-buffer.patch
* test_hexdump-replace-magic-numbers-by-their-meaning.patch
* test_hexdump-switch-to-memcmp.patch
* test_hexdump-check-all-bytes-in-real-buffer.patch
* test_hexdump-test-all-possible-group-sizes-for-overflow.patch
* test_hexdump-print-statistics-at-the-end.patch
* lib-radix_tree-fix-error-in-docs-about-locks.patch
* lib-clz_tabc-put-in-lib-y-rather-than-obj-y.patch
* mm-utilc-add-kstrimdup.patch
* lib-add-crc64-ecma-module.patch
* checkpatch-warn-when-casting-constants-to-c90-int-or-longer-types.patch
* checkpatch-improve-macros-with-flow-control-test.patch
* checkpatch-fix-a-number-of-complex_macro-false-positives.patch
* epoll-add-epollexclusive-flag.patch
* init-mainc-obsolete_checksetup-can-be-boolean.patch
* init-do_mounts-initrd_load-can-be-boolean.patch
* hfs-use-list_for_each_entry-in-hfs_cat_delete.patch
* fat-allow-time_offset-to-be-upto-24-hours.patch
* fat-add-simple-validation-for-directory-inode.patch
* fat-add-fat_fallocate-operation.patch
* fat-skip-cluster-allocation-on-fallocated-region.patch
* fat-permit-to-return-phy-block-number-by-fibmap-in-fallocated-region.patch
* documentation-filesystems-vfattxt-update-the-limitation-for-fat-fallocate.patch
* fat-constify-fatent_operations-structures.patch
* ptrace-make-wait_on_bitjobctl_trapping_bit-in-ptrace_attach-killable.patch
* ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task.patch
* ptrace-task_stopped_codeptrace-=-true-cant-see-task_stopped-task-fix.patch
* security-let-security-modules-use-ptrace_mode_-with-bitmasks.patch
* ptrace-use-fsuid-fsgid-effective-creds-for-fs-access-checks.patch
* ptrace-use-fsuid-fsgid-effective-creds-for-fs-access-checks-fix.patch
* fs-coredump-prevent-core-path-components.patch
* fs-coredump-prevent-core-path-components-fix.patch
* exit-remove-unneeded-declaration-of-exit_mm.patch
* powerpc-fadump-rename-cpu_online_mask-member-of-struct-fadump_crash_info_header.patch
* kernel-cpuc-change-type-of-cpu_possible_bits-and-friends.patch
* kernel-cpuc-export-__cpu__mask.patch
* drivers-base-cpuc-use-__cpu__mask-directly.patch
* kernel-cpuc-eliminate-cpu__mask.patch
* kernel-cpuc-make-set_cpu_-static-inlines.patch
* kexec-set-kexec_type_crash-before-sanity_check_segment_list.patch
* kexec-use-list_for_each_entry_safe-in-kimage_free_page_list.patch
* kexec-move-some-memembers-and-definitions-within-the-scope-of-config_kexec_file.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-use-kobj_to_dev.patch
* rbtree-use-read_once-in-rb_empty_root.patch
* sysctl-enable-strict-writes.patch
* kernel-printk-specify-alignment-for-struct-printk_log.patch
* mac80211-prevent-build-failure-with-config_ubsan=y.patch
* ubsan-run-time-undefined-behavior-sanity-checker.patch
* ubsan-run-time-undefined-behavior-sanity-checker-fix.patch
* ubsan-run-time-undefined-behavior-sanity-checker-fix-2.patch
* ubsan-run-time-undefined-behavior-sanity-checker-fix-3.patch
* ubsan-run-time-undefined-behavior-sanity-checker-fix-4.patch
* ubsan-run-time-undefined-behavior-sanity-checker-fix-5.patch
* powerpc-enable-ubsan-support.patch
* powerpc-enable-ubsan-support-fix.patch
* prctl-take-mmap-sem-for-writing-to-protect-against-others.patch
* proc-read-mms-argenv_startend-with-mmap-semaphore-taken.patch
* lz4-fix-wrong-compress-buffer-size-for-64-bits.patch
* ipc-shm-is_file_shm_hugepages-can-be-boolean.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* fs-overlayfs-superc-needs-pagemaph.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* powerpc-mm-fix-_page_swp_soft_dirty-breaking-swapoff.patch
* fs-adfs-adfsh-tidy-up-comments.patch
* iio-core-introduce-iio-software-triggers-fix.patch
* dma-mapping-make-the-generic-coherent-dma-mmap-implementation-optional.patch
* arc-convert-to-dma_map_ops.patch
* arc-convert-to-dma_map_ops-fix.patch
* arc-convert-to-dma_map_ops-fix-2.patch
* avr32-convert-to-dma_map_ops.patch
* blackfin-convert-to-dma_map_ops.patch
* c6x-convert-to-dma_map_ops.patch
* c6x-convert-to-dma_map_ops-fix.patch
* c6x-convert-to-dma_map_ops-fix-2.patch
* cris-convert-to-dma_map_ops.patch
* nios2-convert-to-dma_map_ops.patch
* nios2-convert-to-dma_map_ops-fix.patch
* frv-convert-to-dma_map_ops.patch
* parisc-convert-to-dma_map_ops.patch
* mn10300-convert-to-dma_map_ops.patch
* m68k-convert-to-dma_map_ops.patch
* metag-convert-to-dma_map_ops.patch
* sparc-use-generic-dma_set_mask.patch
* tile-uninline-dma_set_mask.patch
* dma-mapping-always-provide-the-dma_map_ops-based-implementation.patch
* dma-mapping-always-provide-the-dma_map_ops-based-implementation-fix.patch
* dma-mapping-remove-asm-generic-dma-coherenth.patch
* dma-mapping-use-offset_in_page-macro.patch
* memstick-use-sector_div-instead-of-do_div.patch
* mm-memcontrol-drop-unused-css-argument-in-memcg_init_kmem.patch
* mm-memcontrol-remove-double-kmem-page_counter-init.patch
* mm-memcontrol-give-the-kmem-states-more-descriptive-names.patch
* mm-memcontrol-group-kmem-init-and-exit-functions-together.patch
* mm-memcontrol-separate-kmem-code-from-legacy-tcp-accounting-code.patch
* mm-memcontrol-move-kmem-accounting-code-to-config_memcg.patch
* mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2.patch
* mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix.patch
* mm-memcontrol-account-kmem-consumers-in-cgroup2-memory-controller.patch
* mm-memcontrol-allow-to-disable-kmem-accounting-for-cgroup2.patch
* mm-memcontrol-introduce-config_memcg_legacy_kmem.patch
* mm-memcontrol-introduce-config_memcg_legacy_kmem-fix.patch
* net-drop-tcp_memcontrolc.patch
* net-drop-tcp_memcontrolc-fix.patch
* mm-memcontrol-reign-in-the-config-space-madness.patch
* mm-memcontrol-reign-in-the-config-space-madness-fix.patch
* mm-memcontrol-reign-in-the-config-space-madness-fix-fix.patch
* mm-memcontrol-flatten-struct-cg_proto.patch
* mm-memcontrol-clean-up-alloc-online-offline-free-functions.patch
* mm-memcontrol-clean-up-alloc-online-offline-free-functions-fix.patch
* mm-memcontrol-clean-up-alloc-online-offline-free-functions-fix-2.patch
* mm-memcontrol-charge-swap-to-cgroup2.patch
* mm-vmscan-pass-memcg-to-get_scan_count.patch
* mm-memcontrol-replace-mem_cgroup_lruvec_online-with-mem_cgroup_online.patch
* swaph-move-memcg-related-stuff-to-the-end-of-the-file.patch
* mm-vmscan-do-not-scan-anon-pages-if-memcg-swap-limit-is-hit.patch
* mm-free-swap-cache-aggressively-if-memcg-swap-is-full.patch
* documentation-cgroup-add-memoryswapcurrentmax-description.patch
* maintainers-add-git-url-for-apm-driver.patch
* maintainers-add-git-url-for-at91.patch
* maintainers-add-git-url-for-rockchip.patch
* maintainers-add-git-url-for-arm64.patch
* maintainers-add-git-url-for-ath6kl.patch
* maintainers-add-git-url-for-backlight.patch
* maintainers-add-git-url-for-chrome.patch
* maintainers-add-git-url-for-cris.patch
* maintainers-add-git-url-for-cryptodev.patch
* maintainers-add-git-url-for-devfreq.patch
* maintainers-update-git-url-for-dlm.patch
* maintainers-add-git-url-for-ecryptfs.patch
* maintainers-add-git-url-for-ext4.patch
* maintainers-add-git-url-for-hwspinlock.patch
* maintainers-add-git-url-for-integrity.patch
* maintainers-add-git-url-for-ipvs.patch
* maintainers-add-git-url-for-nfsd.patch
* maintainers-add-git-url-for-kvm-s390.patch
* maintainers-add-git-url-for-kgdb.patch
* maintainers-add-git-url-for-nvdimm.patch
* maintainers-add-git-url-for-metag.patch
* maintainers-add-git-url-for-wireless-drivers.patch
* maintainers-add-git-url-for-devicetree.patch
* maintainers-update-git-url-for-pcmcia.patch
* maintainers-update-git-url-for-pstore.patch
* maintainers-update-git-url-for-ath10k.patch
* maintainers-add-git-url-for-hexagon.patch
* maintainers-add-git-url-for-reset.patch
* maintainers-add-git-url-for-s390.patch
* maintainers-fix-tree-format-for-samsung-thermal.patch
* maintainers-add-git-url-for-md.patch
* maintainers-add-git-url-for-squashfs.patch
* maintainers-add-git-url-for-swiotlb.patch
* maintainers-add-git-url-for-xtensa.patch
* maintainers-fix-tree-format-for-tpm.patch
* maintainers-add-git-url-for-uml.patch
* maintainers-add-git-url-for-vfio.patch
* maintainers-add-git-url-for-vhost.patch
* maintainers-update-git-url-for-xfs.patch
* maintainers-fix-mic-maintainers-entry.patch
* dax-fix-null-pointer-dereference-in-__dax_dbg.patch
* dax-fix-conversion-of-holes-to-pmds.patch
* pmem-add-wb_cache_pmem-to-the-pmem-api.patch
* pmem-add-wb_cache_pmem-to-the-pmem-api-v6.patch
* dax-support-dirty-dax-entries-in-radix-tree.patch
* dax-support-dirty-dax-entries-in-radix-tree-v6.patch
* mm-add-find_get_entries_tag.patch
* dax-add-support-for-fsync-sync.patch
* dax-add-support-for-fsync-sync-v6.patch
* dax-add-support-for-fsync-sync-v6-fix.patch
* dax-add-support-for-fsync-msync-v7.patch
* dax-add-support-for-fsync-msync-v8.patch
* ext2-call-dax_pfn_mkwrite-for-dax-fsync-msync.patch
* ext4-call-dax_pfn_mkwrite-for-dax-fsync-msync.patch
* xfs-call-dax_pfn_mkwrite-for-dax-fsync-msync.patch
* tree-wide-use-kvfree-than-conditional-kfree-vfree.patch
mm-add-strictlimit-knob-v2.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
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
* Re: linux-next: strange commit in the parisc-hd tree
From: Helge Deller @ 2016-01-12 21:43 UTC (permalink / raw)
To: Michael Ellerman, Stephen Rothwell, Parisc List; +Cc: linux-next, linux-kernel
In-Reply-To: <1452551991.23317.3.camel@ellerman.id.au>
On 11.01.2016 23:39, Michael Ellerman wrote:
> On Mon, 2016-01-11 at 22:46 +0100, Helge Deller wrote:
>> On 10.01.2016 23:28, Stephen Rothwell wrote:
>>> I noticed the following commit in the parisc-hd tree today:
>>>
>>> 43122681dd75 ("Fix __ARCH_SI_PREAMBLE_SIZE on parisc")
>>>
>>> which among other things says:
>>>
>>> This patch is not planned to be committed as it currently is.
>>
>> Right, I split it up into two.
>>
>>> [...] Please remove it from linux-next inclusion until it is ready.
>>
>> Sure, I just removed it now.
>>
>>> Delibeately introducing a patch to linux-next that may well cause build breakage
>>> in other architectures just before the merge window opens is a bit antisocial.
>>
>> That was in no way my intention.
>> In contrary, I wanted to see if other platforms are affected by the same bug without knowing.
>> Do you by any chance know if it broke some of the existing platforms?
>> If yes, that would be valuable info...
>>
>> Just in case people want to know what this is all about:
>> On parisc I found __ARCH_SI_PREAMBLE_SIZE to have a wrong value in 64bit kernel builds.
>> Patch which fixes it is here:
>> https://patchwork.kernel.org/patch/7994821/
>>
>> To prevent other (existing and future) architectures to run into the same
>> problem I wanted to test this patch via linux-next and inform them:
>> http://git.kernel.org/cgit/linux/kernel/git/deller/parisc-linux.git/commit/?h=test__ARCH_SI_PREAMBLE_SIZE
>
> That doesn't fire on powerpc, ie. we have it correct.
It really seems that parisc was the only architecture left which had a wrong value for __ARCH_SI_PREAMBLE_SIZE.
I followed Stephens suggestion to try it via the zero day build farm and it was only reported one problem (for parisc).
Tree is here: http://git.kernel.org/cgit/linux/kernel/git/deller/parisc-linux.git/log/?h=for-next-test
> Though I wonder why it's not just defined using offsetof? Possibly just that
> it's awkward with the way the headers are organised.
Yes.
Helge
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: David Miller @ 2016-01-12 20:20 UTC (permalink / raw)
To: sfr; +Cc: idosch, netdev, linux-next, linux-kernel, jiri
In-Reply-To: <20160112225811.2c70c1a4@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 12 Jan 2016 22:58:11 +1100
> Hi Ido,
>
> On Tue, 12 Jan 2016 11:11:02 +0200 Ido Schimmel <idosch@mellanox.com> wrote:
>>
>> The lock can be moved further down, just before mlxsw_reg_sfd_pack.
>> Other than that everything looks fine. Thank you!
>
> Thanks, I wasn't sure but I will do that tomorrow (unless Dave beats me to it).
I did the merge but did not move the locking. Feel free to send me
a patch to do so.
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Benjamin LaHaise @ 2016-01-12 16:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160112164034.0fe945a7@canb.auug.org.au>
On Tue, Jan 12, 2016 at 04:40:34PM +1100, Stephen Rothwell wrote:
> Hi Benjamin,
>
> After merging the aio tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> fs/built-in.o: In function `aio_thread_op_foo_at':
> file.c:(.text+0x43808): undefined reference to `__get_user_bad'
> file.c:(.text+0x43838): undefined reference to `__get_user_bad'
This is very strange. It seems to imply that __get_user() doesn't
handle 64 bit values, which is completely broken behaviour on the
architecture's part if true. Can any ARM folks comment on the right
fix here?
-ben
> Caused by commit
>
> 150a0b4905f1 ("aio: add support for async openat()")
>
> I have used the aio tree from next-20160111 for today.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
--
"Thought is the essence of where you are now."
^ permalink raw reply
* next-20160112 build: 1 failures 6 warnings (next-20160112)
From: Build bot for Mark Brown @ 2016-01-12 14:08 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160112
Git describe: next-20160112
Commit: d299f5e5d5 Add linux-next specific files for 20160112
Build Time: 153 min 42 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 2
Warnings: 6
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../drivers/mfd/asic3.c:505:12: error: expected ';' before ')' token
../drivers/mfd/asic3.c:505:12: error: expected statement before ')' token
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
3 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 2
1 ../drivers/mfd/asic3.c:505:12: error: expected statement before ')' token
1 ../drivers/mfd/asic3.c:505:12: error: expected ';' before ')' token
Warnings Summary: 6
6 <stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
1 ../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 3 warnings, 0 section mismatches
Errors:
../drivers/mfd/asic3.c:505:12: error: expected ';' before ')' token
../drivers/mfd/asic3.c:505:12: error: expected statement before ')' token
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the powerpc tree
From: Michael Ellerman @ 2016-01-12 12:32 UTC (permalink / raw)
To: Stephen Rothwell, Benjamin Herrenschmidt, linuxppc-dev
Cc: Michael Neuling, linux-next, linux-kernel
In-Reply-To: <20160107191613.0228560b@canb.auug.org.au>
On Thu, 2016-07-01 at 08:16:13 UTC, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc64
> allnoconfig) failed like this:
>
> arch/powerpc/mm/hash_utils_64.c: In function 'get_paca_psize':
> arch/powerpc/mm/hash_utils_64.c:869:19: error: 'struct paca_struct' has no member named 'context'
> return get_paca()->context.user_psize;
> ^
> arch/powerpc/mm/hash_utils_64.c:870:1: error: control reaches end of non-void function [-Werror=return-type]
> }
> ^
>
> Caused by commit
>
> 2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
>
> This build has CONFIG_PPC_MM_SLICES not set ...
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 7 Jan 2016 19:07:18 +1100
> Subject: [PATCH] powerpc: restore the user_psize member of the mm_context_t in
> the paca
>
> It is used when CONFIG_PPC_MM_SLICES is not set.
>
> Fixes: 2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/c33e54fafacaf83b3e345aae0e
cheers
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-01-12 11:58 UTC (permalink / raw)
To: Ido Schimmel; +Cc: David Miller, netdev, linux-next, linux-kernel, Jiri Pirko
In-Reply-To: <20160112091102.GA12607@colbert.idosch.org>
Hi Ido,
On Tue, 12 Jan 2016 11:11:02 +0200 Ido Schimmel <idosch@mellanox.com> wrote:
>
> The lock can be moved further down, just before mlxsw_reg_sfd_pack.
> Other than that everything looks fine. Thank you!
Thanks, I wasn't sure but I will do that tomorrow (unless Dave beats me to it).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Ido Schimmel @ 2016-01-12 9:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Jiri Pirko
In-Reply-To: <20160112131505.2228f559@canb.auug.org.au>
Tue, Jan 12, 2016 at 04:15:05AM IST, sfr@canb.auug.org.au wrote:
Hi Stephen,
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>
>between commit:
>
> 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
>
>from the net tree and commit:
>
> 54a732018d8e ("mlxsw: spectrum: Adjust switchdev ops for VLAN devices")
>
>from the net-next tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).
>
>--
>Cheers,
>Stephen Rothwell sfr@canb.auug.org.au
>
>diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>index 80e266063aee,4cdc18e72222..000000000000
>--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
>@@@ -650,7 -1057,14 +1057,15 @@@ static int mlxsw_sp_port_fdb_dump(struc
> if (!sfd_pl)
> return -ENOMEM;
>
> + mutex_lock(&mlxsw_sp_port->mlxsw_sp->fdb_lock);
The lock can be moved further down, just before mlxsw_reg_sfd_pack.
Other than that everything looks fine. Thank you!
>+ if (mlxsw_sp_port_is_vport(mlxsw_sp_port)) {
>+ u16 tmp;
>+
>+ tmp = mlxsw_sp_vport_vfid_get(mlxsw_sp_port);
>+ vport_fid = mlxsw_sp_vfid_to_fid(tmp);
>+ vport_vid = mlxsw_sp_vport_vid_get(mlxsw_sp_port);
>+ }
>+
> mlxsw_reg_sfd_pack(sfd_pl, MLXSW_REG_SFD_OP_QUERY_DUMP, 0);
> do {
> mlxsw_reg_sfd_num_rec_set(sfd_pl, MLXSW_REG_SFD_REC_MAX_COUNT);
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the nettree
From: Ido Schimmel @ 2016-01-12 9:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Jiri Pirko
In-Reply-To: <20160112131507.4509e7bf@canb.auug.org.au>
Tue, Jan 12, 2016 at 04:15:07AM IST, sfr@canb.auug.org.au wrote:
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlxsw/spectrum.h
>
>between commit:
>
> 366ce6031529 ("mlxsw: spectrum: Add FDB lock to prevent session interleaving")
>
>from the net tree and commit:
>
> 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave")
>
>from the net-next tree.
>
>I fixed it up (see below) and can carry the fix as necessary (no action
>is required).
Acked-by: Ido Schimmel <idosch@mellanox.com>
Thanks!
^ permalink raw reply
* RE: linux-next: build failure after merge of the drm tree
From: Zhu, Rex @ 2016-01-12 7:48 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Deucher, Alexander
In-Reply-To: <20160112153509.77f8858a@canb.auug.org.au>
Hi,
In my end, this declaration of function 'do_div' can be founded.
In file included from ./arch/x86/include/asm/div64.h:63:0,
from include/linux/math64.h:5,
from ./arch/x86/include/asm/processor.h:30,
from ./arch/x86/include/asm/atomic.h:6,
from include/linux/atomic.h:4,
from include/linux/mutex.h:18,
from include/linux/seq_file.h:7,
from drivers/gpu/drm/amd/powerplay/inc/hwmgr.h:26,
from drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.h:27,
from drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.c:24:
drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/tonga_thermal.c: In function 'tonga_fan_ctrl_get_fan_speed_info'
So I will add "#include <asm/div64.h>" to fix the warning.
Best Regards
Rex
-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
Sent: Tuesday, January 12, 2016 12:35 PM
To: Dave Airlie
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Zhu, Rex; Deucher, Alexander
Subject: Re: linux-next: build failure after merge of the drm tree
Hi Dave,
[This time keeping cc's]
On Tue, 12 Jan 2016 00:31:17 +0000 (GMT) Dave Airlie <airlied@linux.ie> wrote:
>
> >
> > Did this get fixed in some non-obvious way?
> >
>
> I don't think so, I just applied it as is.
/me refetches the drm tree
Ah, there it is! :-)
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ 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