* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Sudeep Holla @ 2016-01-06 10:32 UTC (permalink / raw)
To: Steve Capper
Cc: Sudeep Holla, Mark Brown, Andrew Morton,
linux-arm-kernel@lists.infradead.org, Stephen Rothwell, Tony Luck,
Russell King, Kernel Build Reports Mailman List, Mel Gorman,
Tyler Baker, Dave Hansen, Kevin.Hilman, linux-next,
Kamezawa Hiroyuki, Xishi Qiu, Taku Izumi, Matt Fleming
In-Reply-To: <CAPvkgC3w0oy53HTwDtqEXKoabL44i06hAXndno-Ms83L0Tm0CA@mail.gmail.com>
On 05/01/16 19:59, Steve Capper wrote:
> On 5 January 2016 at 12:21, Sudeep Holla <sudeep.holla@arm.com> wrote:
>>
>>
>> On 05/01/16 11:45, Mark Brown wrote:
>>>
>>> On Mon, Jan 04, 2016 at 04:35:28PM -0800, Andrew Morton wrote:
>>>>
>>>> On Mon, 4 Jan 2016 23:55:12 +0000 Mark Brown <broonie@kernel.org> wrote:
>>>>>
>>>>> On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
>>>
>>>
>>>>>> Thanks. That patch has rather a blooper if
>>>>>> CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
>>>
>>>
>>>>> Seems to be what's making a difference from a quick run through, yes.
>>>
>>>
>>>> OK, thanks.
>>>
>>>
>>> Seems like I was mistaken here somehow or there's some other problem -
>>> I've kicked off another bisect for today's -next:
>>>
>>>
>>> https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/137/console
>>>
>>> and will follow up with any results.
>>>
>>
>> With both patches applied(one already in today's -next), I am able to
>> boot on ARM64 platform but I get huge load(for each pfn) of below warning:
>>
>> -->8
>>
>> BUG: Bad page state in process swapper pfn:900000
>> page:ffffffbde4000000 count:0 mapcount:1 mapping: (null) index:0x0
>> flags: 0x0()
>> page dumped because: nonzero mapcount
>> Modules linked in:
>> Hardware name: ARM Juno development board (r0) (DT)
>> Call trace:
>> [<ffffffc000089830>] dump_backtrace+0x0/0x180
>> [<ffffffc0000899c4>] show_stack+0x14/0x20
>> [<ffffffc000335008>] dump_stack+0x90/0xc8
>> [<ffffffc0001531f8>] bad_page+0xd8/0x138
>> [<ffffffc000153470>] free_pages_prepare+0x218/0x290
>> [<ffffffc000154d4c>] __free_pages_ok+0x1c/0xb8
>> [<ffffffc000155638>] __free_pages+0x30/0x50
>> [<ffffffc00092fa9c>] __free_pages_bootmem+0xa0/0xa8
>> [<ffffffc0009321d0>] free_all_bootmem+0x11c/0x184
>> [<ffffffc000925264>] mem_init+0x48/0x1b4
>> [<ffffffc0009217e0>] start_kernel+0x224/0x3b4
>> [<0000000080663000>] 0x80663000
>> Disabling lock debugging due to kernel taint
>>
>> --
>
> I managed to get 904769ac82ebf60cb54f225f59ae7c064772a4d7 booting on
> an arm64 machine without errors with the following changes:
>
> =====================================
>
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index a8bb70d..0edb608 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -5013,6 +5013,15 @@ static inline unsigned long __meminit
> zone_spanned_pages_in_node(int nid,
> unsigned long *zone_end_pfn,
> unsigned long *zones_size)
> {
> + unsigned int zone;
> +
> + *zone_start_pfn = node_start_pfn;
> + for (zone = 0; zone < zone_type; zone++) {
> + *zone_start_pfn += zones_size[zone];
> + }
> +
> + *zone_end_pfn = *zone_start_pfn + zones_size[zone_type];
> +
> return zones_size[zone_type];
> }
>
> @@ -5328,6 +5337,8 @@ void __paginginit free_area_init_node(int nid,
> unsigned long *zones_size,
> pr_info("Initmem setup node %d [mem %#018Lx-%#018Lx]\n", nid,
> (u64)start_pfn << PAGE_SHIFT,
> end_pfn ? ((u64)end_pfn << PAGE_SHIFT) - 1 : 0);
> +#else
> + start_pfn = node_start_pfn;
> #endif
> calculate_node_totalpages(pgdat, start_pfn, end_pfn,
> zones_size, zholes_size);
>
> =====================================
>
> My understanding is that 904769a ("mm/page_alloc.c: calculate
> zone_start_pfn at zone_spanned_pages_in_node()") inadvertently
> discards information when pgdat->node_start_pfn is removed from
> free_area_init_core (and zone_start_pfn is no longer updated by "size"
> in the loop inside free_area_init_core). This isn't an issue with
> systems where CONFIG_HAVE_MEMBLOCK_NODE_MAP is enabled as
> zone_start_pfn is set correctly. On systems without
> CONFIG_HAVE_MEMBLOCK_NODE_MAP, zone_start_pfn is always 0.
>
> When I ported the above fix to linux-next
> (8ef79cd05e6894c01ab9b41aa918a402fa8022a7) I was able to boot in a VM
> but not on my actual machine, I'll investigate that tomorrow.
>
It fixes the issue on real hardware too(Juno).
--
Regards,
Sudeep
^ permalink raw reply
* Re: linux-next: manual merge of the pm tree with the i2c tree
From: Wolfram Sang @ 2016-01-06 8:20 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Stephen Rothwell, linux-next, linux-kernel, Suravee Suthikulpanit,
Loc Ho
In-Reply-To: <3075970.WbB6DJDsOa@vostro.rjw.lan>
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Looks good to me and thanks for taking care of this!
Ditto. Thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the kbuild tree
From: Michal Marek @ 2016-01-06 8:07 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton
Cc: linux-next, linux-kernel, Kirill A. Shutemov
In-Reply-To: <20160106175423.07e00c12@canb.auug.org.au>
On 2016-01-06 07:54, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> scripts/tags.sh
>
> between commit:
>
> 93209d65c1d3 ("tags: Unify emacs and exuberant rules")
>
> from the kbuild tree and commit:
>
> ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
That's correct, thanks.
Michal
^ permalink raw reply
* linux-next: Tree for Jan 6
From: Stephen Rothwell @ 2016-01-06 8:01 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160105:
Dropped tree: rdma (complex conflicts)
The i2c tree lost its build failure.
The pm tree gained a conflict against the i2c tree.
The rdma tree still had its hard conflicts against the net-next tree so
I dropped the rdma tree again for today.
The drm tree still had its build failure for which I added a fix patch.
The spi tree gained a build failure so I used the version from
next-20160105.
The tip tree gained a conflict against the h8300 tree.
The rcu tree still had its build failure for which I reverted 2 commits.
The akpm-current tree gained a conflict against the kbuild tree.
The akpm tree still had its build failure that I just left broken for now.
Non-merge commits (relative to Linus' tree): 9057
8752 files changed, 422452 insertions(+), 159922 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 (ee9a7d2cb0cf Merge tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
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 (21d380e54c30 m68k: Wire up mlock2)
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 (036592fbbe75 powerpc/opal-irqchip: Fix deadlock introduced by "Fix double endian conversion")
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 (ff62198553e4 bridge: Only call /sbin/bridge-stp for the initial network namespace)
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 (c7b60a89516b ALSA: hda - Add keycode map for alc input device)
Merging pci-current/for-linus (1dbe162d53e1 PCI: hisi: Fix hisi_pcie_cfg_read() 32-bit reads)
Merging driver-core.current/driver-core-linus (4ef7675344d6 Linux 4.4-rc6)
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 (dd0d0d4de582 Input: i8042 - add Fujitsu Lifebook U745 to the nomux list)
Merging crypto-current/master (9f47e11b9e31 crypto: algif_skcipher - Require setkey before accept(2))
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 (168309855a7d Linux 4.4-rc8)
Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page)
Merging arc/for-next (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next)
Merging arm-perf/for-next/perf (5d7ee87708d4 arm64: perf: add support for Cortex-A72)
Merging arm-soc/for-next (4909c459092b Merge branches 'next/drivers' and 'next/multiplatform' into for-next)
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 (12bd4032ea2f Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (06cdbbe9902d Merge tag 'omap-for-v4.5/81xx-fix-signed' 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 (fdb8ed9f727f 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)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
Merging arm64/for-next/core (c9cd0ed925c0 arm64: traps: address fallout from printk -> pr_* conversion)
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 (918fc2ee791e cris: Drop reference to get_cmos_time())
Merging h8300/h8300-next (5e7d4e401029 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 (ea8d65ad6958 m68k/defconfig: Update defconfigs for v4.4-rc1)
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 (9f84a5f9ae3a Merge branch '4.4-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3)
Merging powerpc/next (e9d764f80396 powerpc/pseries: Enable kernel CPU dlpar from sysfs)
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 (9236b4dd6bfa s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK)
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 (887a9853092c um: fix returns without va_end)
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 (511711af91f2 btrfs: don't run delayed references while we are creating the free space tree)
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 (880cec3449e0 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 (614bdee254f8 Merge branch 'bugfixes')
Merging nfsd/nfsd-next (9f5c08db7d68 lockd: constify nlmsvc_binding structure)
Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION)
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 (3053600ed4f7 9p: trans_fd, bail out if recv fcall if missing)
Merging ubifs/linux-next (6b238de189f6 mtd: ubi: don't leak e if schedule_erase() fails)
Merging xfs/for-next (4922be51ef1a Merge branch 'xfs-dax-fixes-for-4.5' into for-next)
Merging file-locks/linux-next (9189922675ec fs: make locks.c explicitly non-modular)
Merging vfs/for-next (e3d994cc0636 Merge branches 'work.misc', '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 drivers/s390/char/zcore.c
Applying: orangfs: update for follow_link to get_link change
Merging pci/next (c6123e06042d Merge branches 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-rcar' into next)
Merging hid/for-next (817b1df9945e Merge branch 'for-4.4/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d9794cfe8c46 Merge branch 'i2c/for-4.5' into i2c/for-next)
Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (072151bb0154 firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (449278d92442 hwmon: (ibmaem) constify aem_rw_sensor_template and aem_ro_sensor_template structures)
Merging v4l-dvb/master (e27bc2ab8e77 Merge ../mc_dvb into to_next)
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
Merging kbuild/for-next (e03445d23fdc Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (101f6dbe1444 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (b18bafa5491a Merge branch 'pm-cpufreq' 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 (1d296eb7260a Merge branches 'thermal-core' and 'thermal-intel' of .git into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
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 (f9166b3aaff0 Merge branch 'topic/univ_api' into next)
Merging net-next/master (2fbf575867e5 include/uapi/linux/sockios.h: mark SIOCRTMSG unused)
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 (49f2a47d9131 prism54: fix checks for dma mapping errors)
Merging bluetooth/master (78b781ca0d35 Bluetooth: Add support for Start Limited Discovery command)
Merging mac80211-next/master (c45932df5612 regulatory: fix world regulatory domain data)
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
$ git merge --abort
Merging mtd/master (472b444eef93 mtd: fix cmdlinepart parser, early naming for auto-filled MTD)
Merging l2-mtd/master (1873315fb156 mtd: sh_flctl: pass FIFO as physical address)
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Applying: mtd: nand: fix for drop unnecessary partition parser data
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (c11b89896351 Merge tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Applying: drm/amdgpu/powerplay: include asm/div64.h for do_div()
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 (8815b23aa093 drm: Remove opencoded drm_gem_object_release_handle())
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 (d8c5ed752e5b ALSA: dummy: constify dummy_timer_ops structures)
Merging sound-asoc/for-next (fef94ea8055a Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next)
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
Merging input/next (fa68e2777cbc Input: pcap_ts - use to_delayed_work)
Merging block/for-next (d49ed8e45ac0 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 (ead3db62bf10 dm ioctl: do not directly deference user memory in check_version())
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 (4734eb989638 async_tx: use GFP_NOWAIT rather than GFP_IO)
Merging mfd/for-mfd-next (526c0ab13672 mfd: syscon: Add a DT property to set value width)
Merging backlight/for-backlight-next (ee65ad0e2a9e backlight: pwm_bl: Avoid backlight flicker when probed from DT)
Merging battery/master (f96576bd63e5 power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (88fc5e6c99c2 Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next)
Merging security/next (aa98b942cbf3 Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (6427e6c71c8b ima: ima_write_policy() limit locking)
Merging selinux/next (92f190d2a1ec selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (3b8d058cfe6a hwmon: (sch56xx) Drop watchdog driver data reference count callbacks)
Merging iommu/next (d5ffaf1db92c Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu' and 'x86/amd' 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 (9daacf51b428 Documentation/kernel-parameters: update KMG units)
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 (52868430cf41 Merge remote-tracking branches 'spi/topic/sun4i', 'spi/topic/topcliff-pch' and 'spi/topic/zynq' into spi-next)
$ git reset --hard HEAD^
Merging next-20160105 version of spi
Merging tip/auto-latest (f29c2e03f0b3 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/h8300/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
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 (05a724bd44a6 tracing: Fix comment to use tracing_on over tracing_enable)
Merging rcu/rcu/next (6d1951645253 irq: Privatize irq_common_data::state_use_accessors)
Applying: Revert "Merge with 97702524eb17 (rcutorture: Add RCU grace-period performance tests)"
Applying: Revert "rcutorture: Add RCU grace-period performance tests"
Merging kvm/linux-next (da3f7ca3e856 Merge tag 'kvm-s390-next-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
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 (32e6b236d269 KVM: s390: consider system MHA for guest storage)
Merging xen-tip/linux-next (b9fcbcf55dc4 xen/time: use READ_ONCE)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (82607adcf9cd workqueue: implement lockup detector)
Merging drivers-x86/for-next (c9abbe63aa08 asus-wmi: drop to_platform_driver macro)
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 (403c5c065081 HSI: Remove struct hsi_client private fields from kernel-doc)
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 (4ef7675344d6 Linux 4.4-rc6)
Merging tty/tty-next (462a1196a578 Merge 4.4-rc6 into tty-next)
Merging usb/usb-next (48346892ff2a Merge tag 'usb-serial-4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
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 (02c34ccc1d2d Merge tag 'iio-for-4.5c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/symlink.c
Merging char-misc/char-misc-next (d7a26beb6fe6 Merge tag 'extcon-next-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (75e6107a60a2 Merge branch 'for-4.5' into for-next)
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in include/linux/cgroup_subsys.h
Merging scsi/for-next (3196a8641050 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (beccdd6ac780 qla2xxx: Check for online flag instead of active reset when transmitting responses)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (c9f294ff6584 pinctrl: lantiq: 2 pins have the wrong mux list)
Merging vhost/linux-next (675358982eae 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 (446f59acb70b Revert "pinctrl: lantiq: Implement gpio_chip.to_irq")
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 (6ff33f3902c3 Linux 4.3-rc1)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (ed2d26d7cbcc tools, testing, add test for intel_pstate driver)
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 (cab572b82c4b rtc: fix overflow and incorrect calculation in rtc_time64_to_tm)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (d23a0e707dd6 Merge branch 'for-4.5/pfn' into for-4.5/libnvdimm)
Merging akpm-current/current (055bd02ec563 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/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.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: 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: 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: 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: sched: check tgid in is_global_init
Merging akpm/master (7cdc6a8f918b sched: check tgid in is_global_init)
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the kbuild tree
From: Stephen Rothwell @ 2016-01-06 6:54 UTC (permalink / raw)
To: Andrew Morton, Michal Marek; +Cc: linux-next, linux-kernel, Kirill A. Shutemov
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
scripts/tags.sh
between commit:
93209d65c1d3 ("tags: Unify emacs and exuberant rules")
from the kbuild tree and commit:
ef0e95208c33 ("page-flags: drop __TestClearPage*() helpers")
from the akpm-current 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 scripts/tags.sh
index bcc1d8cb142b,76f131ebc192..000000000000
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@@ -145,108 -150,8 +145,107 @@@ dogtags(
all_target_sources | gtags -i -f -
}
+# Basic regular expressions with an optional /kind-spec/ for ctags and
+# the following limitations:
+# - No regex modifiers
+# - Use \{0,1\} instead of \?, because etags expects an unescaped ?
+# - \s is not working with etags, use a space or [ \t]
+# - \w works, but does not match underscores in etags
+# - etags regular expressions have to match at the start of a line;
+# a ^[^#] is prepended by setup_regex unless an anchor is already present
+regex_asm=(
+ '/^\(ENTRY\|_GLOBAL\)(\([[:alnum:]_\\]*\)).*/\2/'
+)
+regex_c=(
+ '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
+ '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
+ '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
+ '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
+ '/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1/'
+ '/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
+ '/^PAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
+ '/^PAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
+ '/^PAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
+ '/^TESTSETFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
+ '/^TESTPAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
+ '/^SETPAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
+ '/\<__SETPAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
+ '/\<TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+ '/\<__TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+ '/\<CLEARPAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
+ '/\<__CLEARPAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
+ '/^__PAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
+ '/^__PAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
+ '/^PAGEFLAG_FALSE(\([[:alnum:]_]*\).*/Page\1/'
+ '/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
+ '/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+ '/\<SETPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/SetPage\1/'
+ '/\<CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/ClearPage\1/'
+ '/\<__CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/__ClearPage\1/'
+ '/\<TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/TestClearPage\1/'
- '/\<__TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/__TestClearPage\1/'
+ '/^TASK_PFA_TEST([^,]*, *\([[:alnum:]_]*\))/task_\1/'
+ '/^TASK_PFA_SET([^,]*, *\([[:alnum:]_]*\))/task_set_\1/'
+ '/^TASK_PFA_CLEAR([^,]*, *\([[:alnum:]_]*\))/task_clear_\1/'
+ '/^DEF_MMIO_\(IN\|OUT\)_[XD](\([[:alnum:]_]*\),[^)]*)/\2/'
+ '/^DEBUGGER_BOILERPLATE(\([[:alnum:]_]*\))/\1/'
+ '/^DEF_PCI_AC_\(\|NO\)RET(\([[:alnum:]_]*\).*/\2/'
+ '/^PCI_OP_READ(\(\w*\).*[1-4])/pci_bus_read_config_\1/'
+ '/^PCI_OP_WRITE(\(\w*\).*[1-4])/pci_bus_write_config_\1/'
+ '/\<DEFINE_\(MUTEX\|SEMAPHORE\|SPINLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+ '/\<DEFINE_\(RAW_SPINLOCK\|RWLOCK\|SEQLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+ '/\<DECLARE_\(RWSEM\|COMPLETION\)(\([[:alnum:]_]\+\)/\2/v/'
+ '/\<DECLARE_BITMAP(\([[:alnum:]_]*\)/\1/v/'
+ '/\(^\|\s\)\(\|L\|H\)LIST_HEAD(\([[:alnum:]_]*\)/\3/v/'
+ '/\(^\|\s\)RADIX_TREE(\([[:alnum:]_]*\)/\2/v/'
+ '/\<DEFINE_PER_CPU([^,]*, *\([[:alnum:]_]*\)/\1/v/'
+ '/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'
+ '/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'
+ '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
+ '/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'
+ '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
+ '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
+ '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
+)
+regex_kconfig=(
+ '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'
+ '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/CONFIG_\2/'
+)
+setup_regex()
+{
+ local mode=$1 lang tmp=() r
+ shift
+
+ regex=()
+ for lang; do
+ case "$lang" in
+ asm) tmp=("${regex_asm[@]}") ;;
+ c) tmp=("${regex_c[@]}") ;;
+ kconfig) tmp=("${regex_kconfig[@]}") ;;
+ esac
+ for r in "${tmp[@]}"; do
+ if test "$mode" = "exuberant"; then
+ regex[${#regex[@]}]="--regex-$lang=${r}b"
+ else
+ # Remove ctags /kind-spec/
+ case "$r" in
+ /*/*/?/)
+ r=${r%?/}
+ esac
+ # Prepend ^[^#] unless already anchored
+ case "$r" in
+ /^*) ;;
+ *)
+ r="/^[^#]*${r#/}"
+ esac
+ regex[${#regex[@]}]="--regex=$r"
+ fi
+ done
+ done
+}
+
exuberant()
{
+ setup_regex exuberant asm c
all_target_sources | xargs $1 -a \
-I __initdata,__exitdata,__initconst, \
-I __initdata_memblock \
^ permalink raw reply
* linux-next: manual merge of the tip tree with the h8300 tree
From: Stephen Rothwell @ 2016-01-06 3:43 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Yoshinori Sato
Cc: linux-next, linux-kernel, Daniel Lezcano
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/h8300/Kconfig
between commit:
ff2b670fcb7b ("h8300: KGDB support")
from the h8300 tree and commit:
97a23beb8db9 ("clocksource/drivers/h8300_timer8: Separate the Kconfig option from the arch")
from the tip 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 arch/h8300/Kconfig
index dc99ee1a86cf,2e20333cbce9..000000000000
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -17,8 -17,7 +17,9 @@@ config H830
select HAVE_MEMBLOCK
select HAVE_DMA_ATTRS
select CLKSRC_OF
+ select HAVE_ARCH_KGDB
+ select HAVE_KERNEL_LZO
+ select H8300_TMR8
config RWSEM_GENERIC_SPINLOCK
def_bool y
^ permalink raw reply
* linux-next: build failure after merge of the spi tree
From: Stephen Rothwell @ 2016-01-06 3:34 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, Martin Sperl
Hi Mark,
After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/spi/spi-loopback-test.c: In function 'spi_loopback_test_probe':
drivers/spi/spi-loopback-test.c:292:7: error: 'check_rx_buf' undeclared (first use in this function)
if (!check_rx_buf && (spi->master->mode_bits & SPI_LOOP)) {
^
Caused by commit
b0632bfe5ec4 ("spi: loopback-test: added support for HW-loopback mode")
I have used the spi tree from next-20160105 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: manual merge of the pm tree with the i2c tree
From: Rafael J. Wysocki @ 2016-01-06 2:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Wolfram Sang, linux-next, linux-kernel, Suravee Suthikulpanit,
Loc Ho
In-Reply-To: <20160106123911.2fff44b3@canb.auug.org.au>
On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/i2c/busses/i2c-designware-platdrv.c
>
> between commit:
>
> 90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
>
> from the i2c tree and commit:
>
> a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me and thanks for taking care of this!
Rafael
^ permalink raw reply
* linux-next: manual merge of the pm tree with the i2c tree
From: Stephen Rothwell @ 2016-01-06 1:39 UTC (permalink / raw)
To: Rafael J. Wysocki, Wolfram Sang
Cc: linux-next, linux-kernel, Suravee Suthikulpanit, Loc Ho
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/i2c/busses/i2c-designware-platdrv.c
between commit:
90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
from the i2c tree and commit:
a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
from the pm 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/i2c/busses/i2c-designware-platdrv.c
index 4f86d0795f7f,bf72ae740fc1..000000000000
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -122,7 -123,7 +123,8 @@@ static const struct acpi_device_id dw_i
{ "80860F41", 0 },
{ "808622C1", 0 },
{ "AMD0010", ACCESS_INTR_MASK },
+ { "AMDI0510", 0 },
+ { "APMC0D0F", 0 },
{ }
};
MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match);
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Guenter Roeck @ 2016-01-06 0:22 UTC (permalink / raw)
To: Mark Brown
Cc: Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu, Dave Hansen,
Matt Fleming, Kamezawa Hiroyuki, Andrew Morton,
kernel-build-reports, linux-next, Kevin.Hilman, Tyler.Baker,
linux-arm-kernel, Russell King, Arnd Bergmann
In-Reply-To: <20160104224233.GU16023@sirena.org.uk>
On Mon, Jan 04, 2016 at 10:42:33PM +0000, Mark Brown wrote:
> Since 20151231 -next has been failing to boot on a wide range of ARM
> platforms in the kernelci.org boot tests[1]. Doing bisections with
> Arndale and BeagleBone Black identifies 904769ac82ebf (mm/page_alloc.c:
> calculate zone_start_pfn at zone_spanned_pages_in_node()) from the akpm
> tree as the first broken commit[2,3]. An example bootlog from the
> failure is:
>
> http://storage.kernelci.org/next/next-20151231/arm-multi_v7_defconfig/lab-cambridge/boot-exynos5250-arndale.html
>
> which shows no output on the console once we start the kernel, a brief
> sampling of failing boards suggests this is the normal failure mode.
> x86 and arm64 targets seem fine (juno shows up as failing but the boot
> log seems fine so it's probably a false positive, Mustang was failing
> already) and there are a small number of ARM platforms that boot. I've
> not yet had any time to investigate further than that (including trying
> a revert of that commit), sorry.
>
I see the same problem with my qemu tests for arm.
Reverting the offending commit together with cd31fe16b585 ("mm/page_alloc.c:
set a zone_start_pfn value in zone_spanned_pages_in_node") fixes the problem.
Guenter
^ permalink raw reply
* mmotm 2016-01-05-15-24 uploaded
From: akpm @ 2016-01-05 23:25 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-05-15-24 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-rc8:
(patches marked "*" will be included in linux-next)
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
* virtio_balloon-fix-race-by-fill-and-leak.patch
* virtio_balloon-fix-race-between-migration-and-ballooning.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-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
* tree-wide-use-kvfree-than-conditional-kfree-vfree.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
* 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
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-2.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit-fix-3.patch
* mm-make-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
* memory-hotplug-keep-the-request_resource-error-code.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
* 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-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
* 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-debug-fix-wrongly-filtered-flags-in-dump_vma.patch
* mm-debug-fix-wrongly-filtered-flags-in-dump_vma-fix.patch
* mm-page_owner-print-symbolic-migratetype-of-both-page-and-pageblock.patch
* mm-page_owner-convert-page_owner_inited-to-static-key.patch
* mm-page_owner-copy-page-owner-info-during-migration.patch
* mm-page_owner-track-and-print-last-migrate-reason.patch
* mm-page_owner-track-and-print-last-migrate-reason-fix.patch
* mm-debug-introduce-dump_gfpflag_names-for-symbolic-printing-of-gfp_flags.patch
* mm-page_owner-dump-page-owner-info-from-dump_page.patch
* mm-page_owner-dump-page-owner-info-from-dump_page-fix.patch
* mm-page_alloc-print-symbolic-gfp_flags-on-allocation-failure.patch
* mm-oom-print-symbolic-gfp_flags-in-oom-warning.patch
* mm-printk-introduce-new-format-string-for-flags.patch
* mm-printk-introduce-new-format-string-for-flags-fix.patch
* mm-printk-introduce-new-format-string-for-flags-fix-2.patch
* mm-page_owner-provide-symbolic-page-flags-and-gfp_flags.patch
* mm-debug-move-bad-flags-printing-to-bad_page.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
* 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-fix.patch
* mm-oom-introduce-oom-reaper-fix-fix.patch
* mm-oom-introduce-oom-reaper-fix-fix-2.patch
* mm-oom-introduce-oom-reaper-checkpatch-fixes.patch
* mm-oom-introduce-oom-reaper-fix-3.patch
* mm-oom-introduce-oom-reaper-fix-4.patch
* mm-oom-introduce-oom-reaper-fix-4-fix.patch
* mm-oom-introduce-oom-reaper-fix-5.patch
* mm-oom-introduce-oom-reaper-fix-5-fix.patch
* mm-oom-introduce-oom-reaper-fix-6.patch
* mmoom-exclude-tif_memdie-processes-from-candidates.patch
* proc-add-a-reschedule-point-in-proc_readfd_common.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
* 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
* 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
* dmi_scan-uuid-fix-endianess-for-smbios-=-0x206.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
* sysctl-enable-strict-writes.patch
* fs-affs-replace-time_t-with-time64_t.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
* 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
* fs-overlayfs-superc-needs-pagemaph.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.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
* 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
* 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
* sched-check-tgid-in-is_global_init.patch
mm-add-strictlimit-knob-v2.patch
do_shared_fault-check-that-mmap_sem-is-held.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Stephen Rothwell @ 2016-01-05 20:51 UTC (permalink / raw)
To: Or Gerlitz
Cc: Doug Ledford, David Miller, netdev, linux-next, linux-kernel,
Saeed Mahameed, Achiad Shochat, Matan Barak, Leon Romanovsky
In-Reply-To: <568BF7D4.8080304@mellanox.com>
Hi Or,
On Tue, 5 Jan 2016 19:05:24 +0200 Or Gerlitz <ogerlitz@mellanox.com> wrote:
>
> On 1/5/2016 3:51 AM, Stephen Rothwell wrote:
> > Hi Doug,
> >
> > Today's linux-next merge of the rdma tree got conflicts in:
> >
> > drivers/net/ethernet/mellanox/mlx5/core/vport.c
> > include/linux/mlx5/mlx5_ifc.h
> > include/linux/mlx5/vport.h
> >
> > between commits:
> >
> > e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address")
> > e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state")
> >
> > from the net-next tree and commit:
> >
> > e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function")
> >
> > from the rdma tree and maybe some others.
> >
> > I have no hope of fixing this stuff up, so I have dropped the rdma tree
> > again for today. There is similar functionality being introduced in
> > both trees ... please sort this mess out ...
>
> Hi Stephen,
>
> Saeed/Matan and Co are working here on a fix which would solve the
> conflict.
Wonderful.
> We have the basic patch and people will be testing it later/tomorrow.
>
> Could you please advice how would it be possible to provide you the
> git rerere output -- the pre-image and post-images files from .git/rr-cache?
Just send me a (private) email (no need to bother the list) with the
pre and post image files attached, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Steve Capper @ 2016-01-05 19:59 UTC (permalink / raw)
To: Sudeep Holla
Cc: Mark Brown, Andrew Morton, linux-arm-kernel@lists.infradead.org,
Stephen Rothwell, Tony Luck, Russell King,
Kernel Build Reports Mailman List, Mel Gorman, Tyler Baker,
Dave Hansen, Kevin.Hilman, linux-next, Kamezawa Hiroyuki,
Xishi Qiu, Taku Izumi, Matt Fleming
In-Reply-To: <568BB55F.2020709@arm.com>
On 5 January 2016 at 12:21, Sudeep Holla <sudeep.holla@arm.com> wrote:
>
>
> On 05/01/16 11:45, Mark Brown wrote:
>>
>> On Mon, Jan 04, 2016 at 04:35:28PM -0800, Andrew Morton wrote:
>>>
>>> On Mon, 4 Jan 2016 23:55:12 +0000 Mark Brown <broonie@kernel.org> wrote:
>>>>
>>>> On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
>>
>>
>>>>> Thanks. That patch has rather a blooper if
>>>>> CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
>>
>>
>>>> Seems to be what's making a difference from a quick run through, yes.
>>
>>
>>> OK, thanks.
>>
>>
>> Seems like I was mistaken here somehow or there's some other problem -
>> I've kicked off another bisect for today's -next:
>>
>>
>> https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/137/console
>>
>> and will follow up with any results.
>>
>
> With both patches applied(one already in today's -next), I am able to
> boot on ARM64 platform but I get huge load(for each pfn) of below warning:
>
> -->8
>
> BUG: Bad page state in process swapper pfn:900000
> page:ffffffbde4000000 count:0 mapcount:1 mapping: (null) index:0x0
> flags: 0x0()
> page dumped because: nonzero mapcount
> Modules linked in:
> Hardware name: ARM Juno development board (r0) (DT)
> Call trace:
> [<ffffffc000089830>] dump_backtrace+0x0/0x180
> [<ffffffc0000899c4>] show_stack+0x14/0x20
> [<ffffffc000335008>] dump_stack+0x90/0xc8
> [<ffffffc0001531f8>] bad_page+0xd8/0x138
> [<ffffffc000153470>] free_pages_prepare+0x218/0x290
> [<ffffffc000154d4c>] __free_pages_ok+0x1c/0xb8
> [<ffffffc000155638>] __free_pages+0x30/0x50
> [<ffffffc00092fa9c>] __free_pages_bootmem+0xa0/0xa8
> [<ffffffc0009321d0>] free_all_bootmem+0x11c/0x184
> [<ffffffc000925264>] mem_init+0x48/0x1b4
> [<ffffffc0009217e0>] start_kernel+0x224/0x3b4
> [<0000000080663000>] 0x80663000
> Disabling lock debugging due to kernel taint
>
> --
I managed to get 904769ac82ebf60cb54f225f59ae7c064772a4d7 booting on
an arm64 machine without errors with the following changes:
=====================================
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a8bb70d..0edb608 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5013,6 +5013,15 @@ static inline unsigned long __meminit
zone_spanned_pages_in_node(int nid,
unsigned long *zone_end_pfn,
unsigned long *zones_size)
{
+ unsigned int zone;
+
+ *zone_start_pfn = node_start_pfn;
+ for (zone = 0; zone < zone_type; zone++) {
+ *zone_start_pfn += zones_size[zone];
+ }
+
+ *zone_end_pfn = *zone_start_pfn + zones_size[zone_type];
+
return zones_size[zone_type];
}
@@ -5328,6 +5337,8 @@ void __paginginit free_area_init_node(int nid,
unsigned long *zones_size,
pr_info("Initmem setup node %d [mem %#018Lx-%#018Lx]\n", nid,
(u64)start_pfn << PAGE_SHIFT,
end_pfn ? ((u64)end_pfn << PAGE_SHIFT) - 1 : 0);
+#else
+ start_pfn = node_start_pfn;
#endif
calculate_node_totalpages(pgdat, start_pfn, end_pfn,
zones_size, zholes_size);
=====================================
My understanding is that 904769a ("mm/page_alloc.c: calculate
zone_start_pfn at zone_spanned_pages_in_node()") inadvertently
discards information when pgdat->node_start_pfn is removed from
free_area_init_core (and zone_start_pfn is no longer updated by "size"
in the loop inside free_area_init_core). This isn't an issue with
systems where CONFIG_HAVE_MEMBLOCK_NODE_MAP is enabled as
zone_start_pfn is set correctly. On systems without
CONFIG_HAVE_MEMBLOCK_NODE_MAP, zone_start_pfn is always 0.
When I ported the above fix to linux-next
(8ef79cd05e6894c01ab9b41aa918a402fa8022a7) I was able to boot in a VM
but not on my actual machine, I'll investigate that tomorrow.
Cheers,
--
Steve
^ permalink raw reply related
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Mark Brown @ 2016-01-05 19:24 UTC (permalink / raw)
To: Sudeep Holla
Cc: Andrew Morton, linux-arm-kernel, Stephen Rothwell, Tony Luck,
Russell King, kernel-build-reports, Mel Gorman, Tyler.Baker,
Dave Hansen, Kevin.Hilman, linux-next, Kamezawa Hiroyuki,
Xishi Qiu, Taku Izumi, Matt Fleming
In-Reply-To: <568BB55F.2020709@arm.com>
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
On Tue, Jan 05, 2016 at 12:21:51PM +0000, Sudeep Holla wrote:
> On 05/01/16 11:45, Mark Brown wrote:
> >On Mon, Jan 04, 2016 at 04:35:28PM -0800, Andrew Morton wrote:
> >>On Mon, 4 Jan 2016 23:55:12 +0000 Mark Brown <broonie@kernel.org> wrote:
> >>>On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
> >>>>Thanks. That patch has rather a blooper if
> >>>>CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
> >>>Seems to be what's making a difference from a quick run through, yes.
> >>OK, thanks.
> >Seems like I was mistaken here somehow or there's some other problem -
> >I've kicked off another bisect for today's -next:
> > https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/137/console
> >and will follow up with any results.
> With both patches applied(one already in today's -next), I am able to
> boot on ARM64 platform but I get huge load(for each pfn) of below warning:
Bisect on today's -next with Arndale (an ARM platform) flags the same
patch:
https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/137/console
as does Juno which is an arm64 platform:
https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/138/console
(it does get to a console but with lots of the backtraces Sudeep
indicated).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Or Gerlitz @ 2016-01-05 17:05 UTC (permalink / raw)
To: Stephen Rothwell, Doug Ledford
Cc: David Miller, netdev, linux-next, linux-kernel, Saeed Mahameed,
Achiad Shochat, Matan Barak, Leon Romanovsky
In-Reply-To: <20160105125154.36d9a0c4@canb.auug.org.au>
On 1/5/2016 3:51 AM, Stephen Rothwell wrote:
> Hi Doug,
>
> Today's linux-next merge of the rdma tree got conflicts in:
>
> drivers/net/ethernet/mellanox/mlx5/core/vport.c
> include/linux/mlx5/mlx5_ifc.h
> include/linux/mlx5/vport.h
>
> between commits:
>
> e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address")
> e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state")
>
> from the net-next tree and commit:
>
> e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function")
>
> from the rdma tree and maybe some others.
>
> I have no hope of fixing this stuff up, so I have dropped the rdma tree
> again for today. There is similar functionality being introduced in
> both trees ... please sort this mess out ...
Hi Stephen,
Saeed/Matan and Co are working here on a fix which would solve the
conflict.
We have the basic patch and people will be testing it later/tomorrow.
Could you please advice how would it be possible to provide you the
git rerere output -- the pre-image and post-images files from .git/rr-cache?
Or.
^ permalink raw reply
* Re: linux-next: build failure after merge of the mmc-uh tree
From: Thierry Reding @ 2016-01-05 16:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ulf Hansson, Stephen Warren, Colin Cross, Olof Johansson,
linux-next, linux-kernel, Lucas Stach
In-Reply-To: <20151231145329.63b42c86@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1968 bytes --]
On Thu, Dec 31, 2015 at 02:53:29PM +1100, Stephen Rothwell wrote:
> Hi Ulf,
>
> After merging the mmc-uh tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/mmc/host/sdhci-tegra.c:361:38: error: redefinition of 'sdhci_tegra210_pdata'
> static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
> ^
> drivers/mmc/host/sdhci-tegra.c:343:38: note: previous definition of 'sdhci_tegra210_pdata' was here
> static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
> ^
> drivers/mmc/host/sdhci-tegra.c:370:42: error: redefinition of 'soc_data_tegra210'
> static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
> ^
> drivers/mmc/host/sdhci-tegra.c:354:42: note: previous definition of 'soc_data_tegra210' was here
> static const struct sdhci_tegra_soc_data soc_data_tegra210 = {
> ^
> drivers/mmc/host/sdhci-tegra.c:372:14: error: 'NVQUIRK_DISABLE_SDR50' undeclared here (not in a function)
> .nvquirks = NVQUIRK_DISABLE_SDR50 |
> ^
> drivers/mmc/host/sdhci-tegra.c:373:7: error: 'NVQUIRK_DISABLE_DDR50' undeclared here (not in a function)
> NVQUIRK_DISABLE_DDR50 |
> ^
> drivers/mmc/host/sdhci-tegra.c:374:7: error: 'NVQUIRK_DISABLE_SDR104' undeclared here (not in a function)
> NVQUIRK_DISABLE_SDR104,
> ^
>
> Caused by patch
>
> "mmc: tegra: Add Tegra210 support"
>
> turning up in two trees (mmc-uh and tegra) as separate commits and then
> further changes to this file in the mmc-uh tree.
>
> I used the version of the file from the mmc-uh tree.
Sorry about this. I had meant to send this to Ulf as a pull request
before the Christmas break but then got side-tracked and never got
around to it.
I've now removed that branch from the Tegra tree.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Sudeep Holla @ 2016-01-05 12:21 UTC (permalink / raw)
To: Mark Brown, Andrew Morton
Cc: Sudeep Holla, linux-arm-kernel, Stephen Rothwell, Tony Luck,
Russell King, kernel-build-reports, Mel Gorman, Tyler.Baker,
Dave Hansen, Kevin.Hilman, linux-next, Kamezawa Hiroyuki,
Xishi Qiu, Taku Izumi, Matt Fleming
In-Reply-To: <20160105114549.GX16023@sirena.org.uk>
On 05/01/16 11:45, Mark Brown wrote:
> On Mon, Jan 04, 2016 at 04:35:28PM -0800, Andrew Morton wrote:
>> On Mon, 4 Jan 2016 23:55:12 +0000 Mark Brown <broonie@kernel.org> wrote:
>>> On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
>
>>>> Thanks. That patch has rather a blooper if
>>>> CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
>
>>> Seems to be what's making a difference from a quick run through, yes.
>
>> OK, thanks.
>
> Seems like I was mistaken here somehow or there's some other problem -
> I've kicked off another bisect for today's -next:
>
> https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/137/console
>
> and will follow up with any results.
>
With both patches applied(one already in today's -next), I am able to
boot on ARM64 platform but I get huge load(for each pfn) of below warning:
-->8
BUG: Bad page state in process swapper pfn:900000
page:ffffffbde4000000 count:0 mapcount:1 mapping: (null) index:0x0
flags: 0x0()
page dumped because: nonzero mapcount
Modules linked in:
Hardware name: ARM Juno development board (r0) (DT)
Call trace:
[<ffffffc000089830>] dump_backtrace+0x0/0x180
[<ffffffc0000899c4>] show_stack+0x14/0x20
[<ffffffc000335008>] dump_stack+0x90/0xc8
[<ffffffc0001531f8>] bad_page+0xd8/0x138
[<ffffffc000153470>] free_pages_prepare+0x218/0x290
[<ffffffc000154d4c>] __free_pages_ok+0x1c/0xb8
[<ffffffc000155638>] __free_pages+0x30/0x50
[<ffffffc00092fa9c>] __free_pages_bootmem+0xa0/0xa8
[<ffffffc0009321d0>] free_all_bootmem+0x11c/0x184
[<ffffffc000925264>] mem_init+0x48/0x1b4
[<ffffffc0009217e0>] start_kernel+0x224/0x3b4
[<0000000080663000>] 0x80663000
Disabling lock debugging due to kernel taint
--
Regards,
Sudeep
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Mark Brown @ 2016-01-05 11:45 UTC (permalink / raw)
To: Andrew Morton
Cc: Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu, Dave Hansen,
Matt Fleming, Kamezawa Hiroyuki, kernel-build-reports, linux-next,
Kevin.Hilman, Tyler.Baker, linux-arm-kernel, Russell King,
Stephen Rothwell
In-Reply-To: <20160104163528.be56a4b1.akpm@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
On Mon, Jan 04, 2016 at 04:35:28PM -0800, Andrew Morton wrote:
> On Mon, 4 Jan 2016 23:55:12 +0000 Mark Brown <broonie@kernel.org> wrote:
> > On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
> > > Thanks. That patch has rather a blooper if
> > > CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
> > Seems to be what's making a difference from a quick run through, yes.
> OK, thanks.
Seems like I was mistaken here somehow or there's some other problem -
I've kicked off another bisect for today's -next:
https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/137/console
and will follow up with any results.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* next-20160105 build: 4 failures 16 warnings (next-20160105)
From: Build bot for Mark Brown @ 2016-01-05 10:12 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160105
Git describe: next-20160105
Commit: 8ef79cd05e Add linux-next specific files for 20160105
Build Time: 65 min 8 sec
Passed: 5 / 9 ( 55.56 %)
Failed: 4 / 9 ( 44.44 %)
Errors: 1
Warnings: 16
Section Mismatches: 0
Failed defconfigs:
arm64-allnoconfig
arm64-allmodconfig
arm-allmodconfig
arm64-defconfig
Errors:
arm64-allmodconfig
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
arm64-defconfig
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
7 warnings 0 mismatches : arm64-allmodconfig
5 warnings 0 mismatches : arm-multi_v5_defconfig
9 warnings 0 mismatches : arm-multi_v7_defconfig
8 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-allnoconfig
3 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Warnings Summary: 16
7 ../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
7 ../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
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]
2 ../fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
1 arch/arm/configs/multi_v7_defconfig:435:warning: symbol value 'm' invalid for MFD_DA9063
1 ../net/bluetooth/mgmt.c:5471:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5471:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/orangefs/symlink.c:32:2: warning: initialization from incompatible pointer type [enabled by default]
1 ../fs/orangefs/symlink.c:32:2: warning: (near initialization for 'orangefs_symlink_inode_operations.get_link') [enabled by default]
1 ../fs/orangefs/symlink.c:32:14: warning: initialization from incompatible pointer type
1 ../fs/orangefs/symlink.c:32:14: warning: (near initialization for 'orangefs_symlink_inode_operations.get_link')
1 ../fs/dax.c:916:17: warning: passing argument 1 of '__dax_dbg' from incompatible pointer type
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 ../drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:5: warning: comparison of distinct pointer types lacks a cast [enabled by default]
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-allnoconfig : FAIL, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 2 errors, 7 warnings, 0 section mismatches
Errors:
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Warnings:
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../fs/orangefs/symlink.c:32:14: warning: initialization from incompatible pointer type
../fs/orangefs/symlink.c:32:14: warning: (near initialization for 'orangefs_symlink_inode_operations.get_link')
../fs/dax.c:916:17: warning: passing argument 1 of '__dax_dbg' from incompatible pointer type
../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, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 9 warnings, 0 section mismatches
Warnings:
arch/arm/configs/multi_v7_defconfig:435:warning: symbol value 'm' invalid for MFD_DA9063
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
../net/bluetooth/mgmt.c:5471:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5471: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, 0 errors, 8 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:5: warning: comparison of distinct pointer types lacks a cast [enabled by default]
../fs/orangefs/symlink.c:32:2: warning: initialization from incompatible pointer type [enabled by default]
../fs/orangefs/symlink.c:32:2: warning: (near initialization for 'orangefs_symlink_inode_operations.get_link') [enabled by default]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-defconfig : FAIL, 1 errors, 3 warnings, 0 section mismatches
Errors:
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Warnings:
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../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
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Jan 5
From: Stephen Rothwell @ 2016-01-05 6:44 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160104:
New tree: configfs
Dropped tree: rdma (complex conflicts)
The ext4 tree lost its build failure.
The i2c tree still had its build failure for which I applied a patch.
The rdma tree lost its considerable conflicts against the nfsd tree,
but that exposed hard conflicts against the net-next tree so I dropped
the rdma tree again for today.
The l2-mtd tree gained a conflict against the mtd tree.
The drm tree still had its build failure for which I added a fix patch.
The rcu tree still had its build failure for which I reverted 2 commits.
The akpm-current tree gained a supplied patch for a widespread boot problem.
The akpm tree still had its build failure that I just left broken for now.
Non-merge commits (relative to Linus' tree): 8747
8585 files changed, 414168 insertions(+), 156578 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 (168309855a7d Linux 4.4-rc8)
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 (21d380e54c30 m68k: Wire up mlock2)
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 (036592fbbe75 powerpc/opal-irqchip: Fix deadlock introduced by "Fix double endian conversion")
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 (3934aa4c1f7f cxgb4: correctly handling failed allocation)
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 (c7b60a89516b ALSA: hda - Add keycode map for alc input device)
Merging pci-current/for-linus (1dbe162d53e1 PCI: hisi: Fix hisi_pcie_cfg_read() 32-bit reads)
Merging driver-core.current/driver-core-linus (4ef7675344d6 Linux 4.4-rc6)
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 (dd0d0d4de582 Input: i8042 - add Fujitsu Lifebook U745 to the nomux list)
Merging crypto-current/master (9f47e11b9e31 crypto: algif_skcipher - Require setkey before accept(2))
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 (168309855a7d Linux 4.4-rc8)
Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page)
Merging arc/for-next (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm/for-next (ddb5941f5cec Merge branch 'amba-pl011' into for-next)
Merging arm-perf/for-next/perf (5d7ee87708d4 arm64: perf: add support for Cortex-A72)
Merging arm-soc/for-next (4909c459092b Merge branches 'next/drivers' and 'next/multiplatform' into for-next)
Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
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 (12bd4032ea2f Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (06cdbbe9902d Merge tag 'omap-for-v4.5/81xx-fix-signed' 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 (fdb8ed9f727f 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 (f4dc1ae37415 Merge branch for-4.5/defconfig into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
Merging arm64/for-next/core (c9cd0ed925c0 arm64: traps: address fallout from printk -> pr_* conversion)
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 (918fc2ee791e cris: Drop reference to get_cmos_time())
Merging h8300/h8300-next (82271533321d irqchip: renesas-h8s: Replace ctrl_outw/ctrl_inw with writew/readw)
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 (ea8d65ad6958 m68k/defconfig: Update defconfigs for v4.4-rc1)
Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value)
Merging metag/for-next (f23d0e2468bc MAINTAINERS: Change Meta arch port status to Odd Fixes)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (1e4cec6ff5a6 Merge branch '4.4-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3)
Merging powerpc/next (e9d764f80396 powerpc/pseries: Enable kernel CPU dlpar from sysfs)
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 (9236b4dd6bfa s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (19b2535055b4 arch/tile: move user_exit() to early kernel entry sequence)
Merging uml/linux-next (887a9853092c um: fix returns without va_end)
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 (511711af91f2 btrfs: don't run delayed references while we are creating the free space tree)
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 (4ef7675344d6 Linux 4.4-rc6)
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 (880cec3449e0 fs: clean up the flags definition in uapi/linux/fs.h)
Merging f2fs/dev (4cf185379b75 f2fs: add a tracepoint for sync_dirty_inodes)
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 (614bdee254f8 Merge branch 'bugfixes')
Merging nfsd/nfsd-next (2b2d085590b4 Revert "svcrdma: Do not send XDR roundup bytes for a write chunk")
Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION)
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 (3053600ed4f7 9p: trans_fd, bail out if recv fcall if missing)
Merging ubifs/linux-next (6b238de189f6 mtd: ubi: don't leak e if schedule_erase() fails)
Merging xfs/for-next (4922be51ef1a Merge branch 'xfs-dax-fixes-for-4.5' into for-next)
Merging file-locks/linux-next (9189922675ec fs: make locks.c explicitly non-modular)
Merging vfs/for-next (e3d994cc0636 Merge branches 'work.misc', '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 drivers/s390/char/zcore.c
Applying: orangfs: update for follow_link to get_link change
Merging pci/next (c6123e06042d Merge branches 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-rcar' into next)
Merging hid/for-next (817b1df9945e Merge branch 'for-4.4/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (bdcadbaaf804 Merge branch 'i2c/for-4.5' into i2c/for-next)
Applying: ii2c: rename i2c_timings struct due to clash with generic version
Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (072151bb0154 firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (449278d92442 hwmon: (ibmaem) constify aem_rw_sensor_template and aem_ro_sensor_template structures)
Merging v4l-dvb/master (e27bc2ab8e77 Merge ../mc_dvb into to_next)
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
Merging kbuild/for-next (45538834d1f5 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (101f6dbe1444 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (3237c5576ac5 Merge branch 'powercap' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (1d296eb7260a Merge branches 'thermal-core' and 'thermal-intel' of .git into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
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 (f9166b3aaff0 Merge branch 'topic/univ_api' into next)
Merging net-next/master (197c949e7798 udp: properly support MSG_PEEK with truncated buffers)
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 (49f2a47d9131 prism54: fix checks for dma mapping errors)
Merging bluetooth/master (29663b0cc1d5 mac802154: constify ieee802154_llsec_ops structure)
Merging mac80211-next/master (c45932df5612 regulatory: fix world regulatory domain data)
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 drivers/net/ethernet/mellanox/mlx5/core/vport.c
$ git merge --abort
Merging mtd/master (472b444eef93 mtd: fix cmdlinepart parser, early naming for auto-filled MTD)
Merging l2-mtd/master (1873315fb156 mtd: sh_flctl: pass FIFO as physical address)
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Applying: mtd: nand: fix for drop unnecessary partition parser data
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (c11b89896351 Merge tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Applying: drm/amdgpu/powerplay: include asm/div64.h for do_div()
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 (3a848662c751 vga_switcheroo: Prettify 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 sound/for-next (d8c5ed752e5b ALSA: dummy: constify dummy_timer_ops structures)
Merging sound-asoc/for-next (c57241212b14 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next)
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
Merging input/next (fa68e2777cbc Input: pcap_ts - use to_delayed_work)
Merging block/for-next (d49ed8e45ac0 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 (18d03e8c25f1 dm thin: fix race condition when destroying thin pool workqueue)
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 (25cc20daff0f mmc: dw_mmc: remove the unused quirks)
Applying: mmc: tegra: fix bad merge
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (4734eb989638 async_tx: use GFP_NOWAIT rather than GFP_IO)
Merging mfd/for-mfd-next (526c0ab13672 mfd: syscon: Add a DT property to set value width)
Merging backlight/for-backlight-next (ee65ad0e2a9e backlight: pwm_bl: Avoid backlight flicker when probed from DT)
Merging battery/master (f96576bd63e5 power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (e1eadd8e89ae Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/tps6105x', 'regulator/topic/tps65086', 'regulator/topic/tps65218' and 'regulator/topic/wm831x' into regulator-next)
Merging security/next (aa98b942cbf3 Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (6427e6c71c8b ima: ima_write_policy() limit locking)
Merging selinux/next (92f190d2a1ec selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (3b8d058cfe6a hwmon: (sch56xx) Drop watchdog driver data reference count callbacks)
Merging iommu/next (d5ffaf1db92c Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu' and 'x86/amd' into next)
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
Merging vfio/next (03a76b60f8ba vfio: Include No-IOMMU mode)
Merging jc_docs/docs-next (9daacf51b428 Documentation/kernel-parameters: update KMG units)
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 (006fa61e79e6 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/spidev', 'spi/topic/sun4i' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (f29c2e03f0b3 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/h8300/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
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 (05a724bd44a6 tracing: Fix comment to use tracing_on over tracing_enable)
Merging rcu/rcu/next (6d1951645253 irq: Privatize irq_common_data::state_use_accessors)
Applying: Revert "Merge with 97702524eb17 (rcutorture: Add RCU grace-period performance tests)"
Applying: Revert "rcutorture: Add RCU grace-period performance tests"
Merging kvm/linux-next (da3f7ca3e856 Merge tag 'kvm-s390-next-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
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 (32e6b236d269 KVM: s390: consider system MHA for guest storage)
Merging xen-tip/linux-next (b9fcbcf55dc4 xen/time: use READ_ONCE)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (82607adcf9cd workqueue: implement lockup detector)
Merging drivers-x86/for-next (c9abbe63aa08 asus-wmi: drop to_platform_driver macro)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (027617b52003 Merge remote-tracking branches 'regmap/topic/64bit', 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next)
Merging hsi/for-next (403c5c065081 HSI: Remove struct hsi_client private fields from kernel-doc)
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 (4ef7675344d6 Linux 4.4-rc6)
Merging tty/tty-next (462a1196a578 Merge 4.4-rc6 into tty-next)
Merging usb/usb-next (48346892ff2a Merge tag 'usb-serial-4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
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 (02c34ccc1d2d Merge tag 'iio-for-4.5c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/symlink.c
Merging char-misc/char-misc-next (d7a26beb6fe6 Merge tag 'extcon-next-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (694f447eca18 Merge branch 'for-4.5' into for-next)
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in include/linux/cgroup_subsys.h
Merging scsi/for-next (3196a8641050 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (beccdd6ac780 qla2xxx: Check for online flag instead of active reset when transmitting responses)
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (bda7c4c2b976 pinctrl: qcom: make PMIC drivers bool)
Merging vhost/linux-next (675358982eae 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 (e28ecca6eac4 gpio: fix warning about iterator)
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 (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
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 (49dea76aebab Merge branch 'clk-rockchip' into clk-next)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (ed2d26d7cbcc tools, testing, add test for intel_pstate driver)
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 (cab572b82c4b rtc: fix overflow and incorrect calculation in rtc_time64_to_tm)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (d23a0e707dd6 Merge branch 'for-4.5/pfn' into for-4.5/libnvdimm)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
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 akpm-current/current (cd31fe16b585 mm/page_alloc.c: set a zone_start_pfn value in zone_spanned_pages_in_node)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in mm/page_alloc.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/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.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
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
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: 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: 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
Merging akpm/master (dbfd1563f3aa xfs: call dax_pfn_mkwrite() for DAX fsync/msync)
^ permalink raw reply
* linux-next: build warning after merge of the ext4 tree
From: Stephen Rothwell @ 2016-01-05 6:01 UTC (permalink / raw)
To: Theodore Ts'o
Cc: linux-next, linux-kernel, Li Xi, Andreas Dilger, Jan Kara
Hi Ted,
After merging the ext4 tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
fs/ext4/ioctl.c: In function 'ext4_ioctl_setproject':
fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
Introduced by commit
e14c6dbc6429 ("ext4: add FS_IOC_FSSETXATTR/FS_IOC_FSGETXATTR interface support")
CONFIG_QUOTA is not set for this build.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Andrew Morton @ 2016-01-05 5:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu,
Dave Hansen, Matt Fleming, Kamezawa Hiroyuki,
kernel-build-reports, linux-next, Kevin.Hilman, Tyler.Baker,
linux-arm-kernel, Russell King
In-Reply-To: <20160105164716.44b9db6d@canb.auug.org.au>
On Tue, 5 Jan 2016 16:47:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> On Tue, 5 Jan 2016 11:49:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 4 Jan 2016 16:35:28 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> > >
> > > Stephen, can we please retain
> > >
> > > mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
> > > mm-introduce-kernelcore=mirror-option.patch
> > > mm-introduce-kernelcore=mirror-option-fix.patch
> > > mm-introduce-kernelcore=mirror-option-fix-2.patch
> > >
> > > and add the below?
> >
> > Sure, that is easier than dropping the above patches, anyway.
>
> I have done that *except* that
> mm-introduce-kernelcore=mirror-option-fix-2.patch is not in mmotm and I
> cannot find it anywhere.
oops sorry, I took it out so it isn't in today's
http://ozlabs.org/~akpm/mmots/broken-out/. Here:
From: Arnd Bergmann <arnd@arndb.de>
Subject: mm: avoid unused variables in memmap_init_zone
A quick fix on mm/page_alloc.c introduced a harmless warning:
mm/page_alloc.c: In function 'memmap_init_zone':
mm/page_alloc.c:4617:44: warning: unused variable 'tmp' [-Wunused-variable]
mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
This uses another #ifdef to avoid declaring the two variables when the
code is not built.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/page_alloc.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/page_alloc.c~mm-introduce-kernelcore=mirror-option-fix-2 mm/page_alloc.c
--- a/mm/page_alloc.c~mm-introduce-kernelcore=mirror-option-fix-2
+++ a/mm/page_alloc.c
@@ -4465,7 +4465,9 @@ void __meminit memmap_init_zone(unsigned
unsigned long pfn;
struct zone *z;
unsigned long nr_initialised = 0;
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
struct memblock_region *r = NULL, *tmp;
+#endif
if (highest_memmap_pfn < end_pfn - 1)
highest_memmap_pfn = end_pfn - 1;
_
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Stephen Rothwell @ 2016-01-05 5:47 UTC (permalink / raw)
To: Andrew Morton
Cc: Mark Brown, Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu,
Dave Hansen, Matt Fleming, Kamezawa Hiroyuki,
kernel-build-reports, linux-next, Kevin.Hilman, Tyler.Baker,
linux-arm-kernel, Russell King
In-Reply-To: <20160105114918.2641f95d@canb.auug.org.au>
Hi Andrew,
On Tue, 5 Jan 2016 11:49:18 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 4 Jan 2016 16:35:28 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> >
> > Stephen, can we please retain
> >
> > mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
> > mm-introduce-kernelcore=mirror-option.patch
> > mm-introduce-kernelcore=mirror-option-fix.patch
> > mm-introduce-kernelcore=mirror-option-fix-2.patch
> >
> > and add the below?
>
> Sure, that is easier than dropping the above patches, anyway.
I have done that *except* that
mm-introduce-kernelcore=mirror-option-fix-2.patch is not in mmotm and I
cannot find it anywhere.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* linux-next: manual merge of the l2-mtd tree with the mtd tree
From: Stephen Rothwell @ 2016-01-05 2:05 UTC (permalink / raw)
To: Brian Norris, David Woodhouse; +Cc: linux-next, linux-kernel
Hi Brian,
Today's linux-next merge of the l2-mtd tree got a conflict in:
drivers/mtd/mtdcore.c
between commit:
472b444eef93 ("mtd: fix cmdlinepart parser, early naming for auto-filled MTD")
from the mtd tree and commit:
07fd2f871c5e ("mtd: partitions: pass around 'mtd_partitions' wrapper struct")
from the l2-mtd 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/mtd/mtdcore.c
index ffa288474820,89d811e7b04a..000000000000
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@@ -590,22 -589,20 +595,22 @@@ int mtd_device_parse_register(struct mt
const struct mtd_partition *parts,
int nr_parts)
{
+ struct mtd_partitions parsed;
int ret;
- struct mtd_partition *real_parts = NULL;
+ mtd_set_dev_defaults(mtd);
+
- ret = parse_mtd_partitions(mtd, types, &real_parts, parser_data);
- if (ret <= 0 && nr_parts && parts) {
- real_parts = kmemdup(parts, sizeof(*parts) * nr_parts,
- GFP_KERNEL);
- if (!real_parts)
- ret = -ENOMEM;
- else
- ret = nr_parts;
- }
- /* Didn't come up with either parsed OR fallback partitions */
- if (ret < 0) {
+ memset(&parsed, 0, sizeof(parsed));
+
+ ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
+ if ((ret < 0 || parsed.nr_parts == 0) && parts && nr_parts) {
+ /* Fall back to driver-provided partitions */
+ parsed = (struct mtd_partitions){
+ .parts = parts,
+ .nr_parts = nr_parts,
+ };
+ } else if (ret < 0) {
+ /* Didn't come up with parsed OR fallback partitions */
pr_info("mtd: failed to find partitions; one or more parsers reports errors (%d)\n",
ret);
/* Don't abort on errors; we can still use unpartitioned MTD */
^ permalink raw reply
* linux-next: manual merge of the rdma tree with the net-next tree
From: Stephen Rothwell @ 2016-01-05 1:51 UTC (permalink / raw)
To: Doug Ledford, David Miller, netdev
Cc: linux-next, linux-kernel, Saeed Mahameed, Achiad Shochat,
Or Gerlitz
Hi Doug,
Today's linux-next merge of the rdma tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/vport.c
include/linux/mlx5/mlx5_ifc.h
include/linux/mlx5/vport.h
between commits:
e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address")
e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state")
from the net-next tree and commit:
e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function")
from the rdma tree and maybe some others.
I have no hope of fixing this stuff up, so I have dropped the rdma tree
again for today. There is similar functionality being introduced in
both trees ... please sort this mess out ...
--
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