* linux-next: build warning after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-04-29 6:45 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Arnd Bergmann, Josh Poimboeuf,
Quinn Tran
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (x86_64
allmodconfig) produced this warning:
drivers/scsi/ipr.c: In function 'ipr_show_device_id':
drivers/scsi/ipr.c:4462:34: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'long unsigned int' [-Wformat=]
len = snprintf(buf, PAGE_SIZE, "0x%llx\n", be64_to_cpu(res->dev_id));
^
Lots and lots like this :-(
Probably introduced by commit
eef17fb79096 ("byteswap: try to avoid __builtin_constant_p gcc bug")
I guess __builtin_bswap64() has type "unsigned long int" :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: efi_enabled(EFI_PARAVIRT) use
From: Ingo Molnar @ 2016-04-29 6:39 UTC (permalink / raw)
To: Stephen Rothwell, Luis R. Rodriguez
Cc: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Shannon Zhao,
Ard Biesheuvel, Matt Fleming, Borislav Petkov
In-Reply-To: <20160429142020.4499e185@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
> drivers/firmware/efi/arm-runtime.c
>
> between commit:
>
> 14c43be60166 ("efi/arm*: Drop writable mapping of the UEFI System table")
>
> from the tip tree and commit:
>
> 21c8dfaa2327 ("Xen: EFI: Parse DT parameters for Xen specific UEFI")
>
> from the xen-tip tree.
(I've attached 21c8dfaa2327 below, for reference.)
Argh:
With considerable pain we just got rid of paravirt_enabled() in the x86 tree, and
Xen is now reintroducing it in the EFI code. Please don't: if you have to do
capability flags then name the flag accordingly to what it does, don't use some
generic catch-all naming that will inevitably cause the kind of problems
paravirt_enabled() caused...
So: NAKed-by: Ingo Molnar <mingo@kernel.org>
Also, it would be nice to have all things EFI in a single tree, the conflicts are
going to be painful! There's very little reason not to carry this kind of commit:
arch/arm/xen/enlighten.c | 6 +++++
drivers/firmware/efi/arm-runtime.c | 17 +++++++++-----
drivers/firmware/efi/efi.c | 45 ++++++++++++++++++++++++++++++++------
3 files changed, 56 insertions(+), 12 deletions(-)
in the EFI tree.
Thanks,
Ingo
=======================>
>From 21c8dfaa23276be2ae6d580331d8d252cc41e8d9 Mon Sep 17 00:00:00 2001
From: Shannon Zhao <shannon.zhao@linaro.org>
Date: Thu, 7 Apr 2016 20:03:34 +0800
Subject: [PATCH] Xen: EFI: Parse DT parameters for Xen specific UEFI
Add a new function to parse DT parameters for Xen specific UEFI just
like the way for normal UEFI. Then it could reuse the existing codes.
If Xen supports EFI, initialize runtime services.
CC: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Tested-by: Julien Grall <julien.grall@arm.com>
---
arch/arm/xen/enlighten.c | 6 +++++
drivers/firmware/efi/arm-runtime.c | 17 +++++++++-----
drivers/firmware/efi/efi.c | 45 ++++++++++++++++++++++++++++++++------
3 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 13e3e9f9b094..e130562d3283 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -261,6 +261,12 @@ static int __init fdt_find_hyper_node(unsigned long node, const char *uname,
!strncmp(hyper_node.prefix, s, strlen(hyper_node.prefix)))
hyper_node.version = s + strlen(hyper_node.prefix);
+ if (IS_ENABLED(CONFIG_XEN_EFI)) {
+ /* Check if Xen supports EFI */
+ if (of_get_flat_dt_subnode_by_name(node, "uefi") > 0)
+ set_bit(EFI_PARAVIRT, &efi.flags);
+ }
+
return 0;
}
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 6ae21e41a429..ac609b9f0b99 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -27,6 +27,7 @@
#include <asm/mmu.h>
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
+#include <asm/xen/xen-ops.h>
extern u64 efi_system_table;
@@ -107,13 +108,19 @@ static int __init arm_enable_runtime_services(void)
}
set_bit(EFI_SYSTEM_TABLES, &efi.flags);
- if (!efi_virtmap_init()) {
- pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
- return -ENOMEM;
+ if (IS_ENABLED(CONFIG_XEN_EFI) && efi_enabled(EFI_PARAVIRT)) {
+ /* Set up runtime services function pointers for Xen Dom0 */
+ xen_efi_runtime_setup();
+ } else {
+ if (!efi_virtmap_init()) {
+ pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
+ return -ENOMEM;
+ }
+
+ /* Set up runtime services function pointers */
+ efi_native_runtime_setup();
}
- /* Set up runtime services function pointers */
- efi_native_runtime_setup();
set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
efi.runtime_version = efi.systab->hdr.revision;
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 3a69ed5ecfcb..519c096a7c33 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -469,12 +469,14 @@ device_initcall(efi_load_efivars);
FIELD_SIZEOF(struct efi_fdt_params, field) \
}
-static __initdata struct {
+struct params {
const char name[32];
const char propname[32];
int offset;
int size;
-} dt_params[] = {
+};
+
+static struct params fdt_params[] __initdata = {
UEFI_PARAM("System Table", "linux,uefi-system-table", system_table),
UEFI_PARAM("MemMap Address", "linux,uefi-mmap-start", mmap),
UEFI_PARAM("MemMap Size", "linux,uefi-mmap-size", mmap_size),
@@ -482,24 +484,45 @@ static __initdata struct {
UEFI_PARAM("MemMap Desc. Version", "linux,uefi-mmap-desc-ver", desc_ver)
};
+static struct params xen_fdt_params[] __initdata = {
+ UEFI_PARAM("System Table", "xen,uefi-system-table", system_table),
+ UEFI_PARAM("MemMap Address", "xen,uefi-mmap-start", mmap),
+ UEFI_PARAM("MemMap Size", "xen,uefi-mmap-size", mmap_size),
+ UEFI_PARAM("MemMap Desc. Size", "xen,uefi-mmap-desc-size", desc_size),
+ UEFI_PARAM("MemMap Desc. Version", "xen,uefi-mmap-desc-ver", desc_ver)
+};
+
struct param_info {
int found;
void *params;
+ struct params *dt_params;
+ int size;
};
static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
int depth, void *data)
{
struct param_info *info = data;
+ struct params *dt_params = info->dt_params;
const void *prop;
void *dest;
u64 val;
- int i, len;
+ int i, len, offset;
- if (depth != 1 || strcmp(uname, "chosen") != 0)
- return 0;
+ if (efi_enabled(EFI_PARAVIRT)) {
+ if (depth != 1 || strcmp(uname, "hypervisor") != 0)
+ return 0;
- for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
+ offset = of_get_flat_dt_subnode_by_name(node, "uefi");
+ if (offset < 0)
+ return 0;
+ node = offset;
+ } else {
+ if (depth != 1 || strcmp(uname, "chosen") != 0)
+ return 0;
+ }
+
+ for (i = 0; i < info->size; i++) {
prop = of_get_flat_dt_prop(node, dt_params[i].propname, &len);
if (!prop)
return 0;
@@ -530,12 +553,20 @@ int __init efi_get_fdt_params(struct efi_fdt_params *params)
info.found = 0;
info.params = params;
+ if (efi_enabled(EFI_PARAVIRT)) {
+ info.dt_params = xen_fdt_params;
+ info.size = ARRAY_SIZE(xen_fdt_params);
+ } else {
+ info.dt_params = fdt_params;
+ info.size = ARRAY_SIZE(fdt_params);
+ }
+
ret = of_scan_flat_dt(fdt_find_uefi_params, &info);
if (!info.found)
pr_info("UEFI not found.\n");
else if (!ret)
pr_err("Can't find '%s' in device tree!\n",
- dt_params[info.found].name);
+ info.dt_params[info.found].name);
return ret;
}
^ permalink raw reply related
* Re: linux-next: manual merge of the akpm-current tree with the tip tree
From: Ingo Molnar @ 2016-04-29 6:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, linux-next, linux-kernel, Andy Shevchenko,
Matt Fleming, Ard Biesheuvel
In-Reply-To: <20160429161248.7e17f45b@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/efi.h
>
> between commit:
>
> 2c23b73c2d02 ("Ard Biesheuvel <ard.biesheuvel@linaro.org>")
>
> from the tip tree and commit:
>
> 9f2c36a7b097 ("include/linux/efi.h: redefine type, constant, macro from generic code")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Btw., while looking at this, I noticed that akpm-current introduced this namespace
collision:
include/acpi/acconfig.h:#define UUID_STRING_LENGTH 36 /* Total length of a UUID string */
include/linux/uuid.h:#define UUID_STRING_LEN 36
I suspect the include/acpi/acconfig.h define should be renamed:
UUID_STRING_LENGTH -> ACPI_UUID_STRING_LENGTH
UUID_BUFFER_LENGTH -> ACPI_UUID_BUFFER_LENGTH
... before the collision causes any trouble.
Thanks,
Ingo
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the tip tree
From: Stephen Rothwell @ 2016-04-29 6:12 UTC (permalink / raw)
To: Andrew Morton, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Andy Shevchenko, Matt Fleming,
Ard Biesheuvel
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
include/linux/efi.h
between commit:
2c23b73c2d02 ("Ard Biesheuvel <ard.biesheuvel@linaro.org>")
from the tip tree and commit:
9f2c36a7b097 ("include/linux/efi.h: redefine type, constant, macro from generic code")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/efi.h
index aa36fb8bea4b,5b1d5c5b4080..000000000000
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@@ -21,7 -21,7 +21,8 @@@
#include <linux/pfn.h>
#include <linux/pstore.h>
#include <linux/reboot.h>
+#include <linux/screen_info.h>
+ #include <linux/uuid.h>
#include <asm/page.h>
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the tile tree
From: Stephen Rothwell @ 2016-04-29 6:08 UTC (permalink / raw)
To: Andrew Morton, Chris Metcalf; +Cc: linux-next, linux-kernel, Jiri Slaby
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/tile/Kconfig
between commit:
4ef00aa30a3f ("tile: sort the "select" lines in the TILE/TILEGX configs")
from the tile tree and commits:
628b7a1e7049 ("exit_thread: remove empty bodies")
803ae84888bb ("printk/nmi: generic solution for safe printk in NMI")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/tile/Kconfig
index c3bbb295bc4a,76989b878f3c..000000000000
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -18,21 -35,17 +18,23 @@@ config TIL
select GENERIC_STRNCPY_FROM_USER
select GENERIC_STRNLEN_USER
select HAVE_ARCH_SECCOMP_FILTER
-
-# FIXME: investigate whether we need/want these options.
-# select HAVE_IOREMAP_PROT
-# select HAVE_OPTPROBES
-# select HAVE_REGS_AND_STACK_ACCESS_API
-# select HAVE_HW_BREAKPOINT
-# select PERF_EVENTS
-# select HAVE_USER_RETURN_NOTIFIER
-# config NO_BOOTMEM
-# config ARCH_SUPPORTS_DEBUG_PAGEALLOC
-# config HUGETLB_PAGE_SIZE_VARIABLE
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_CONTEXT_TRACKING
+ select HAVE_DEBUG_BUGVERBOSE
+ select HAVE_DEBUG_KMEMLEAK
+ select HAVE_DEBUG_STACKOVERFLOW
+ select HAVE_DMA_API_DEBUG
++ select HAVE_EXIT_THREAD
+ select HAVE_KVM if !TILEGX
++ select HAVE_NMI if USE_PMC
+ select HAVE_PERF_EVENTS
+ select HAVE_SYSCALL_TRACEPOINTS
+ select MODULES_USE_ELF_RELA
+ select SYSCTL_EXCEPTION_TRACE
+ select SYS_HYPERVISOR
+ select USER_STACKTRACE_SUPPORT
+ select USE_PMC if PERF_EVENTS
+ select VIRT_TO_BUS
config MMU
def_bool y
^ permalink raw reply
* linux-next: manual merge of the xen-tip tree with the tip tree
From: Stephen Rothwell @ 2016-04-29 4:20 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Konrad Rzeszutek Wilk, Stefano Stabellini,
Xen Devel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: linux-next, linux-kernel, Shannon Zhao, Ard Biesheuvel
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in:
drivers/firmware/efi/arm-runtime.c
between commit:
14c43be60166 ("efi/arm*: Drop writable mapping of the UEFI System table")
from the tip tree and commit:
21c8dfaa2327 ("Xen: EFI: Parse DT parameters for Xen specific UEFI")
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/firmware/efi/arm-runtime.c
index 17ccf0a8787a,ac609b9f0b99..000000000000
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@@ -109,24 -90,41 +110,30 @@@ static int __init arm_enable_runtime_se
pr_info("Remapping and enabling EFI services.\n");
- mapsize = memmap.map_end - memmap.map;
- memmap.map = (__force void *)ioremap_cache(memmap.phys_map,
- mapsize);
- if (!memmap.map) {
- pr_err("Failed to remap EFI memory map\n");
- return -ENOMEM;
- }
- memmap.map_end = memmap.map + mapsize;
- efi.memmap = &memmap;
+ mapsize = efi.memmap.map_end - efi.memmap.map;
- efi.systab = (__force void *)ioremap_cache(efi_system_table,
- sizeof(efi_system_table_t));
- if (!efi.systab) {
- pr_err("Failed to remap EFI System Table\n");
+ efi.memmap.map = memremap(efi.memmap.phys_map, mapsize, MEMREMAP_WB);
+ if (!efi.memmap.map) {
+ pr_err("Failed to remap EFI memory map\n");
return -ENOMEM;
}
- set_bit(EFI_SYSTEM_TABLES, &efi.flags);
+ efi.memmap.map_end = efi.memmap.map + mapsize;
- if (!efi_virtmap_init()) {
- pr_err("UEFI virtual mapping missing or invalid -- runtime services will not be available\n");
- return -ENOMEM;
+ if (IS_ENABLED(CONFIG_XEN_EFI) && efi_enabled(EFI_PARAVIRT)) {
+ /* Set up runtime services function pointers for Xen Dom0 */
+ xen_efi_runtime_setup();
+ } else {
+ if (!efi_virtmap_init()) {
- pr_err("No UEFI virtual mapping was installed -- runtime services will not be available\n");
++ pr_err("UEFI virtual mapping missing or invalid -- runtime services will not be available\n");
+ return -ENOMEM;
+ }
+
+ /* Set up runtime services function pointers */
+ efi_native_runtime_setup();
}
- /* Set up runtime services function pointers */
- efi_native_runtime_setup();
set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
- efi.runtime_version = efi.systab->hdr.revision;
-
return 0;
}
early_initcall(arm_enable_runtime_services);
^ permalink raw reply
* linux-next: manual merge of the tip tree with the arm64 tree
From: Stephen Rothwell @ 2016-04-29 3:56 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Catalin Marinas
Cc: linux-next, linux-kernel, Matt Fleming, Ard Biesheuvel,
Arnd Bergmann, Will Deacon
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/arm-init.c
between commits:
500899c2cc3e ("efi: ARM/arm64: ignore DT memory nodes instead of removing them")
7464b6e3a5fb ("efi: ARM: avoid warning about phys_addr_t cast")
from the arm64 tree and commits:
78ce248faa3c ("efi: Iterate over efi.memmap in for_each_efi_memory_desc()")
884f4f66ffd6 ("efi: Remove global 'memmap' EFI memory map")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/firmware/efi/arm-init.c
index fac567c3b66a,ef90f0c4b70a..000000000000
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@@ -143,15 -178,7 +178,15 @@@ static __init void reserve_regions(void
if (efi_enabled(EFI_DBG))
pr_info("Processing EFI memory map:\n");
+ /*
+ * Discard memblocks discovered so far: if there are any at this
+ * point, they originate from memory nodes in the DT, and UEFI
+ * uses its own memory map instead.
+ */
+ memblock_dump_all();
+ memblock_remove(0, (phys_addr_t)ULLONG_MAX);
+
- for_each_efi_memory_desc(&memmap, md) {
+ for_each_efi_memory_desc(md) {
paddr = md->phys_addr;
npages = md->num_pages;
^ permalink raw reply
* linux-next: manual merge of the pm tree with the arm-soc tree
From: Stephen Rothwell @ 2016-04-29 1:18 UTC (permalink / raw)
To: Rafael J. Wysocki, Olof Johansson, Arnd Bergmann,
linux-arm-kernel
Cc: linux-next, linux-kernel, Thomas Petazzoni, Gregory CLEMENT,
Viresh Kumar
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
MAINTAINERS
between commit:
e269777f72b3 ("MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers")
from the arm-soc tree and commit:
9f123def55d3 ("cpufreq: mvebu: Move cpufreq code into drivers/cpufreq/")
from the pm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index e7ad57a3c1f5,0bb566e7df9b..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1328,8 -1322,9 +1328,9 @@@ F: drivers/rtc/rtc-armada38x.
F: arch/arm/boot/dts/armada*
F: arch/arm/boot/dts/kirkwood*
F: arch/arm64/boot/dts/marvell/armada*
+F: arch/arm/configs/mvebu_*_defconfig
+ F: drivers/cpufreq/mvebu-cpufreq.c
-
ARM/Marvell Berlin SoC support
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
^ permalink raw reply
* mmotm 2016-04-28-17-16 uploaded
From: akpm @ 2016-04-29 0:16 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-04-28-17-16 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.6-rc5:
(patches marked "*" will be included in linux-next)
origin.patch
* kexec-update-vmcoreinfo-for-compound_order-dtor.patch
* kexec-export-offsetpagecompound_head-to-find-out-compound-tail-page.patch
* mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch
* thp-keep-huge-zero-page-pinned-until-tlb-flush.patch
* mailmap-fix-krzysztof-kozlowskis-misspelled-name.patch
* mm-huge_memory-replace-vm_no_thp-vm_bug_on-with-actual-vma-check.patch
* numa-fix-proc-pid-numa_maps-for-thp.patch
* mm-vmscan-reclaim-highmem-zone-if-buffer_heads-is-over-limit.patch
* mm-call-swap_slot_free_notify-with-holding-page-lock.patch
* mm-hwpoison-fix-wrong-num_poisoned_pages-account.patch
* mailmap-add-frank-rowand.patch
* mm-wake-kcompactd-before-kswapds-short-sleep.patch
* kcov-dont-trace-the-code-coverage-code.patch
* kcov-dont-profile-branches-in-kcov.patch
* update-email-address.patch
* ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.patch
* mm-memory-failure-fix-race-with-compound-page-split-merge.patch
* rapidio-fix-potential-null-pointer-dereference.patch
* lib-stackdepotc-allow-the-stack-trace-hash-to-be-zero.patch
* mm-update-the-document-of-numa_zonelist_order.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* mm-thp-correct-split_huge_pages-file-permission.patch
* mm-memcontrol-let-v2-cgroups-follow-changes-in-system-swappiness.patch
* rapidio-mport_cdev-fix-uapi-type-definitions.patch
* huge-pagecache-mmap_sem-is-unlocked-when-truncation-splits-pmd.patch
* mm-update-min_free_kbytes-from-khugepaged-after-core-initialization.patch
* mm-cma-prevent-nr_isolated_-counters-from-going-negative.patch
* maintainers-fix-rajendra-nayaks-address.patch
* mm-thp-kvm-fix-memory-corruption-in-kvm-with-thp-enabled.patch
* mm-zswap-provide-unique-zpool-name.patch
* byteswap-try-to-avoid-__builtin_constant_p-gcc-bug.patch
* proc-prevent-accessing-proc-pid-environ-until-its-ready.patch
* dax-add-dax_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-blk-call-dax_get_unmapped_area-for-dax-pmd-mappings.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fsnotify-avoid-spurious-emfile-errors-from-inotify_init.patch
* fsnotify-avoid-spurious-emfile-errors-from-inotify_init-checkpatch-fixes.patch
* scripts-decode_stacktracesh-handle-symbols-in-modules.patch
* scripts-spellingtxt-add-fimware-misspelling.patch
* debugobjects-make-fixup-functions-return-bool-instead-of-int.patch
* debugobjects-correct-the-usage-of-fixup-call-results.patch
* workqueue-update-debugobjects-fixup-callbacks-return-type.patch
* timer-update-debugobjects-fixup-callbacks-return-type.patch
* rcu-update-debugobjects-fixup-callbacks-return-type.patch
* percpu_counter-update-debugobjects-fixup-callbacks-return-type.patch
* documentation-update-debugobjects-doc.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-error-code-comments-and-amendments-the-comment-of-ocfs2_extended_slot-should-be-0x08.patch
* ocfs2-clean-up-an-unused-variable-wants_rotate-in-ocfs2_truncate_rec.patch
* ocfs2-clean-up-unused-parameter-count-in-o2hb_read_block_input.patch
* ocfs2-clean-up-an-unuseful-goto-in-ocfs2_put_slot-function.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-negotiate-timer-v2.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-nego_timeout-message-v2.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-negotiate_approve-message-v2.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-add-some-user-debug-log-v2.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* padata-removed-unused-code.patch
* kernel-padata-hide-unused-functions.patch
* kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
* mm-slab-fix-the-theoretical-race-by-holding-proper-lock.patch
* mm-slab-remove-bad_alien_magic-again.patch
* mm-slab-drain-the-free-slab-as-much-as-possible.patch
* mm-slab-factor-out-kmem_cache_node-initialization-code.patch
* mm-slab-factor-out-kmem_cache_node-initialization-code-fix.patch
* mm-slab-clean-up-kmem_cache_node-setup.patch
* mm-slab-dont-keep-free-slabs-if-free_objects-exceeds-free_limit.patch
* mm-slab-racy-access-modify-the-slab-color.patch
* mm-slab-make-cache_grow-handle-the-page-allocated-on-arbitrary-node.patch
* mm-slab-separate-cache_grow-to-two-parts.patch
* mm-slab-refill-cpu-cache-through-a-new-slab-without-holding-a-node-lock.patch
* mm-slab-lockless-decision-to-grow-cache.patch
* mm-slub-replace-kick_all_cpus_sync-with-synchronize_sched-in-kmem_cache_shrink.patch
* mm-slab-freelist-randomization-v4.patch
* mm-slab-freelist-randomization-v5.patch
* mm-slab-freelist-randomization-v5-fix.patch
* mm-page_ref-use-page_ref-helper-instead-of-direct-modification-of-_count.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix-fix.patch
* compilerh-add-support-for-malloc-attribute.patch
* include-linux-apply-__malloc-attribute.patch
* include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
* include-linux-nodemaskh-create-next_node_in-helper.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
* mm-hugetlb-optimize-minimum-size-min_size-accounting.patch
* mm-hugetlb-introduce-hugetlb_bad_size.patch
* arm64-mm-use-hugetlb_bad_size.patch
* metag-mm-use-hugetlb_bad_size.patch
* powerpc-mm-use-hugetlb_bad_size.patch
* tile-mm-use-hugetlb_bad_size.patch
* x86-mm-use-hugetlb_bad_size.patch
* mm-hugetlb-is_vm_hugetlb_page-can-be-boolean.patch
* mm-memory_hotplug-is_mem_section_removable-can-be-boolean.patch
* mm-vmalloc-is_vmalloc_addr-can-be-boolean.patch
* mm-mempolicy-vma_migratable-can-be-boolean.patch
* mm-memcontrolc-mem_cgroup_select_victim_node-clarify-comment.patch
* mm-page_alloc-remove-useless-parameter-of-__free_pages_boot_core.patch
* mm-hugetlbc-use-first_memory_node.patch
* mm-mempolicyc-offset_il_node-document-and-clarify.patch
* mm-rmap-replace-bug_onanon_vma-degree-with-vm_warn_on.patch
* mm-compaction-wrap-calculating-first-and-last-pfn-of-pageblock.patch
* compaction-wrap-calculating-first-and-last-pfn-of-pageblock-fix.patch
* mm-compaction-reduce-spurious-pcplist-drains.patch
* mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction.patch
* mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction-fix.patch
* mm-highmem-simplify-is_highmem.patch
* mm-uninline-page_mapped.patch
* mm-uninline-page_mapped-checkpatch-fixes.patch
* mm-hugetlb-add-same-zone-check-in-pfn_range_valid_gigantic.patch
* mm-memory_hotplug-add-comment-to-some-functions-related-to-memory-hotplug.patch
* mm-vmstat-add-zone-range-overlapping-check.patch
* mm-page_owner-add-zone-range-overlapping-check.patch
* power-add-zone-range-overlapping-check.patch
* mm-workingset-only-do-workingset-activations-on-reads.patch
* mm-filemap-only-do-access-activations-on-reads.patch
* mm-vmscan-reduce-size-of-inactive-file-list.patch
* mm-writeback-correct-dirty-page-calculation-for-highmem.patch
* mm-page_alloc-correct-highmem-memory-statistics.patch
* mm-highmem-make-nr_free_highpages-handles-all-highmem-zones-by-itself.patch
* mm-vmstat-make-node_page_state-handles-all-zones-by-itself.patch
* mm-mmap-kill-hook-arch_rebalance_pgtables.patch
* mm-update_lru_size-warn-and-reset-bad-lru_size.patch
* mm-update_lru_size-do-the-__mod_zone_page_state.patch
* mm-use-__setpageswapbacked-and-dont-clearpageswapbacked.patch
* tmpfs-preliminary-minor-tidyups.patch
* tmpfs-mem_cgroup-charge-fault-to-vm_mm-not-current-mm.patch
* mm-proc-sys-vm-stat_refresh-to-force-vmstat-update.patch
* huge-mm-move_huge_pmd-does-not-need-new_vma.patch
* huge-pagecache-extend-mremap-pmd-rmap-lockout-to-files.patch
* arch-fix-has_transparent_hugepage.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
* memory_hotplug-introduce-memhp_default_state=-command-line-parameter.patch
* mm-oom-move-gfp_nofs-check-to-out_of_memory.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper-clear-oom_reaper_list-before-clearing-tif_memdie.patch
* mm-page_alloc-only-check-pagecompound-for-high-order-pages.patch
* mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch
* mm-page_alloc-use-new-pageanonhead-helper-in-the-free-page-fast-path.patch
* mm-page_alloc-reduce-branches-in-zone_statistics.patch
* mm-page_alloc-inline-zone_statistics.patch
* mm-page_alloc-inline-the-fast-path-of-the-zonelist-iterator.patch
* mm-page_alloc-use-__dec_zone_state-for-order-0-page-allocation.patch
* mm-page_alloc-avoid-unnecessary-zone-lookups-during-pageblock-operations.patch
* mm-page_alloc-convert-alloc_flags-to-unsigned.patch
* mm-page_alloc-convert-nr_fair_skipped-to-bool.patch
* mm-page_alloc-remove-unnecessary-local-variable-in-get_page_from_freelist.patch
* mm-page_alloc-remove-unnecessary-initialisation-in-get_page_from_freelist.patch
* mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask.patch
* mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask-fix.patch
* mm-page_alloc-simplify-last-cpupid-reset.patch
* mm-page_alloc-move-__gfp_hardwall-modifications-out-of-the-fastpath.patch
* mm-page_alloc-check-once-if-a-zone-has-isolated-pageblocks.patch
* mm-page_alloc-check-once-if-a-zone-has-isolated-pageblocks-fix.patch
* mm-page_alloc-shorten-the-page-allocator-fast-path.patch
* mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
* mm-page_alloc-reduce-cost-of-fair-zone-allocation-policy-retry.patch
* mm-page_alloc-shortcut-watermark-checks-for-order-0-pages.patch
* mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice.patch
* mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
* mm-page_alloc-remove-field-from-alloc_context.patch
* mm-page_alloc-check-multiple-page-fields-with-a-single-branch.patch
* mm-page_alloc-un-inline-the-bad-part-of-free_pages_check.patch
* mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch
* mm-page_alloc-pull-out-side-effects-from-free_pages_check.patch
* mm-page_alloc-remove-unnecessary-variable-from-free_pcppages_bulk.patch
* mm-page_alloc-inline-pageblock-lookup-in-page-free-fast-paths.patch
* cpuset-use-static-key-better-and-convert-to-new-api.patch
* mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain.patch
* mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch
* mm-page_alloc-defer-debugging-checks-of-pages-allocated-from-the-pcp.patch
* mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare.patch
* mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch
* mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix-fix.patch
* mm-page_alloc-uninline-the-bad-page-part-of-check_new_page.patch
* vmscan-consider-classzone_idx-in-compaction_ready.patch
* mm-compaction-change-compact_-constants-into-enum.patch
* mm-compaction-cover-all-compaction-mode-in-compact_zone.patch
* mm-compaction-distinguish-compact_deferred-from-compact_skipped.patch
* mm-compaction-distinguish-between-full-and-partial-compact_complete.patch
* mm-compaction-update-compaction_result-ordering.patch
* mm-compaction-simplify-__alloc_pages_direct_compact-feedback-interface.patch
* mm-compaction-abstract-compaction-feedback-to-helpers.patch
* mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
* mm-use-compaction-feedback-for-thp-backoff-conditions.patch
* mm-oom-rework-oom-detection.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-oom-protect-costly-allocations-some-more.patch
* mm-consider-compaction-feedback-also-for-costly-allocation.patch
* mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders.patch
* mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
* mm-oom_reaper-hide-oom-reaped-tasks-from-oom-killer-more-carefully.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix.patch
* z3fold-the-3-fold-allocator-for-compressed-pages.patch
* z3fold-the-3-fold-allocator-for-compressed-pages-v3.patch
* mm-thp-simplify-the-implementation-of-mk_huge_pmd.patch
* memory-failure-replace-mce-with-memory-failure.patch
* memory-failure-replace-mce-with-memory-failure-fix.patch
* mm-memblock-move-memblock_addreserve_region-into-memblock_addreserve.patch
* mm-vmalloc-keep-a-separate-lazy-free-list.patch
* mm-fix-incorrect-pfn-passed-to-untrack_pfn-in-remap_pfn_range-v2.patch
* mm-enable-rlimit_data-by-default-with-workaround-for-valgrind.patch
* tmpfs-fix-vm_mayshare-mappings-for-nommu.patch
* mm-hugetlb_cgroup-round-limit_in_bytes-down-to-hugepage-size.patch
* mm-tighten-fault_in_pages_writeable.patch
* mm-put-activate_page_pvecs-and-others-pagevec-together.patch
* include-linux-hugetlb-clean-up-code.patch
* include-linux-hugetlbh-use-bool-instead-of-int-for-hugepage_migration_supported.patch
* mm-fix-commmets-if-sparsemem-pgdata-doesnt-have-page_ext.patch
* documentation-vm-fix-spelling-mistakes.patch
* mmwriteback-dont-use-memory-reserves-for-wb_start_writeback.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* mm-vmstat-calculate-particular-vm-event.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
* mm-kasan-initial-memory-quarantine-implementation.patch
* mm-kasan-initial-memory-quarantine-implementation-v8.patch
* mm-kasan-dont-call-kasan_krealloc-from-ksize.patch
* mm-kasan-add-a-ksize-test.patch
* zsmalloc-use-first_page-rather-than-page.patch
* zsmalloc-clean-up-many-bug_on.patch
* zsmalloc-reordering-function-parameter.patch
* zsmalloc-remove-unused-pool-param-in-obj_free.patch
* zsmalloc-require-gfp-in-zs_malloc.patch
* zram-user-per-cpu-compression-streams.patch
* mm-zswap-use-workqueue-to-destroy-pool.patch
* mm-zsmalloc-dont-fail-if-cant-create-debugfs-info.patch
* procfs-expose-umask-in-proc-pid-status.patch
* procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable.patch
* procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch
* mn10300-let-exit_fpu-accept-a-task.patch
* exit_thread-remove-empty-bodies.patch
* exit_thread-remove-empty-bodies-fix.patch
* exit_thread-accept-a-task-parameter-to-be-exited.patch
* exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
* fork-free-thread-in-copy_process-on-failure.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* printk-nmi-flush-nmi-messages-on-the-system-panic.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* maintainers-remove-linux-listsopenriscnet.patch
* maintainers-remove-defunct-spear-mailing-list.patch
* lib-vsprintf-simplify-uuid-printing.patch
* ima-use-%pu-to-output-uuid-in-printable-format.patch
* lib-uuid-move-generate_random_uuid-to-uuidc.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid-fix.patch
* lib-uuid-remove-fsf-address.patch
* sysctl-use-generic-uuid-library.patch
* efi-redefine-type-constant-macro-from-generic-code.patch
* efivars-use-generic-uuid-library.patch
* genhd-move-to-use-generic-uuid-library.patch
* ldm-use-generic-uuid-library.patch
* wmi-use-generic-uuid-library.patch
* radix-tree-introduce-radix_tree_empty.patch
* radix-tree-test-suite-fix-build.patch
* radix-tree-test-suite-add-tests-for-radix_tree_locate_item.patch
* radix-tree-test-suite-allow-testing-other-fan-out-values.patch
* radix-tree-test-suite-keep-regression-test-runs-short.patch
* radix-tree-test-suite-rebuild-when-headers-change.patch
* radix-tree-remove-unused-looping-macros.patch
* introduce-config_radix_tree_multiorder.patch
* radix-tree-add-missing-sibling-entry-functionality.patch
* radix-tree-fix-sibling-entry-insertion.patch
* radix-tree-fix-deleting-a-multi-order-entry-through-an-alias.patch
* radix-tree-remove-restriction-on-multi-order-entries.patch
* radix-tree-introduce-radix_tree_load_root.patch
* radix-tree-fix-extending-the-tree-for-multi-order-entries-at-offset-0.patch
* radix-tree-test-suite-start-adding-multiorder-tests.patch
* radix-tree-fix-several-shrinking-bugs-with-multiorder-entries.patch
* radix-tree-rewrite-__radix_tree_lookup.patch
* radix-tree-fix-multiorder-bug_on-in-radix_tree_insert.patch
* radix-tree-add-support-for-multi-order-iterating.patch
* radix-tree-test-suite-multi-order-iteration-test.patch
* radix-tree-rewrite-radix_tree_tag_set.patch
* radix-tree-rewrite-radix_tree_tag_clear.patch
* radix-tree-rewrite-radix_tree_tag_get.patch
* radix-tree-test-suite-add-multi-order-tag-test.patch
* radix-tree-fix-radix_tree_create-for-sibling-entries.patch
* radix-tree-rewrite-radix_tree_locate_item.patch
* radix-tree-fix-radix_tree_range_tag_if_tagged-for-multiorder-entries.patch
* radix-tree-fix-radix_tree_dump-for-multi-order-entries.patch
* radix-tree-add-copyright-statements.patch
* drivers-hwspinlock-use-correct-radix-tree-api.patch
* radix-tree-miscellaneous-fixes.patch
* radix-tree-split-node-path-into-offset-and-height.patch
* radix-tree-replace-node-height-with-node-shift.patch
* radix-tree-remove-a-use-of-root-height-from-delete_node.patch
* radix-tree-test-suite-remove-dependencies-on-height.patch
* radix-tree-remove-root-height.patch
* radix-tree-rename-indirect_ptr-to-internal_node.patch
* radix-tree-rename-ptr_to_indirect-to-node_to_entry.patch
* radix-tree-rename-indirect_to_ptr-to-entry_to_node.patch
* radix-tree-rename-radix_tree_is_indirect_ptr.patch
* radix-tree-change-naming-conventions-in-radix_tree_shrink.patch
* radix-tree-tidy-up-next_chunk.patch
* radix-tree-tidy-up-range_tag_if_tagged.patch
* radix-tree-tidy-up-__radix_tree_create.patch
* radix-tree-introduce-radix_tree_replace_clear_tags.patch
* radix-tree-make-radix_tree_descend-more-useful.patch
* dax-move-radix_dax_-definitions-to-daxc.patch
* radix-tree-free-up-the-bottom-bit-of-exceptional-entries-for-reuse.patch
* lib-add-crc64-ecma-module.patch
* checkpatch-add-prefer_is_enabled-test.patch
* checkpatch-improve-constant_comparison-test-for-structure-members.patch
* checkpatch-add-test-for-keywords-not-starting-on-tabstops.patch
* checkpatch-whine-about-access_once.patch
* checkpatch-advertise-the-fix-and-fix-inplace-options-more.patch
* checkpatch-add-list-types-to-show-message-types-to-show-or-ignore.patch
* checkpatch-add-support-to-check-already-applied-git-commits.patch
* init-mainc-simplify-initcall_blacklisted.patch
* kprobes-add-the-tls-argument-for-j_do_fork.patch
* nilfs2-constify-nilfs_sc_operations-structures.patch
* wait-ptrace-assume-__wall-if-the-child-is-traced.patch
* wait-allow-sys_waitid-to-accept-__wnothread-__wclone-__wall.patch
* signal-make-oom_flags-a-bool.patch
* kernel-signalc-convert-printkkern_level-to-pr_level.patch
* fs-execc-fix-minor-memory-leak.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-make-a-pair-of-map-unmap-reserved-pages-in-error-path.patch
* kexec-do-a-cleanup-for-function-kexec_load.patch
* s390-kexec-consolidate-crash_map-unmap_reserved_pages-and-arch_kexec_protectunprotect_crashkres.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* futex-fix-shared-futex-operations-on-nommu.patch
* arch-defconfig-remove-config_resource_counters.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
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* mm-make-mmap_sem-for-write-waits-killable-for-mm-syscalls.patch
* mm-make-vm_mmap-killable.patch
* mm-make-vm_munmap-killable.patch
* mm-aout-handle-vm_brk-failures.patch
* mm-elf-handle-vm_brk-error.patch
* mm-make-vm_brk-killable.patch
* mm-proc-make-clear_refs-killable.patch
* mm-fork-make-dup_mmap-wait-for-mmap_sem-for-write-killable.patch
* ipc-shm-make-shmem-attach-detach-wait-for-mmap_sem-killable.patch
* vdso-make-arch_setup_additional_pages-wait-for-mmap_sem-for-write-killable.patch
* coredump-make-coredump_wait-wait-for-mmap_sem-for-write-killable.patch
* aio-make-aio_setup_ring-killable.patch
* exec-make-exec-path-waiting-for-mmap_sem-killable.patch
* prctl-make-pr_set_thp_disable-wait-for-mmap_sem-killable.patch
* uprobes-wait-for-mmap_sem-for-write-killable.patch
* drm-i915-make-i915_gem_mmap_ioctl-wait-for-mmap_sem-killable.patch
* drm-radeon-make-radeon_mn_get-wait-for-mmap_sem-killable.patch
* drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable.patch
* drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable-fix.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
* linux-next: manual merge of the arm64 tree with Linus' tree
From: Stephen Rothwell @ 2016-04-28 23:59 UTC (permalink / raw)
To: Catalin Marinas
Cc: linux-next, linux-kernel, Sudeep Holla, Christoffer Dall,
AKASHI Takahiro, Will Deacon
Hi Catalin,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm/kvm/arm.c
between commit:
06a71a24bae5 ("arm64: KVM: unregister notifiers in hyp mode teardown path")
from Linus' tree and commit:
67f691976662 ("arm64: kvm: allows kvm cpu hotplug")
from the arm64 tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/kvm/arm.c
index dded1b763c16,1687e1450c3a..000000000000
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@@ -1198,8 -1226,6 +1233,7 @@@ static void teardown_hyp_mode(void
free_hyp_pgds();
for_each_possible_cpu(cpu)
free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
- unregister_cpu_notifier(&hyp_init_cpu_nb);
+ hyp_cpu_pm_exit();
}
static int init_vhe_mode(void)
^ permalink raw reply
* next-20160428 build: 0 failures 15 warnings (next-20160428)
From: Build bot for Mark Brown @ 2016-04-28 9:30 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160428
Git describe: next-20160428
Commit: 86137b6241 Add linux-next specific files for 20160428
Build Time: 88 min 36 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 15
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
9 warnings 0 mismatches : arm64-allmodconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
12 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
3 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 15
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
2 ../drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c:237:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1304:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 9 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c:237:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c:237:10: warning: return makes pointer from integer without a cast [-Wint-conversion]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1304:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: build failure after merge of the tpmdd tree
From: Jarkko Sakkinen @ 2016-04-28 9:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Christophe Ricard
In-Reply-To: <20160428153232.0d6eb076@canb.auug.org.au>
On Thu, 2016-04-28 at 15:32 +1000, Stephen Rothwell wrote:
> Hi Jarkko,
>
> After merging the tpmdd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
> from /home/sfr/next/next/include/linux/idr.h:18,
> from /home/sfr/next/next/include/linux/kernfs.h:14,
> from /home/sfr/next/next/include/linux/sysfs.h:15,
> from /home/sfr/next/next/include/linux/kobject.h:21,
> from /home/sfr/next/next/include/linux/device.h:17,
> from /home/sfr/next/next/include/linux/dma-mapping.h:6,
> from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
> /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
> /home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
> do { \
> ^
> /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro
> 'spin_lock_init'
> spin_lock_init(&ibmvtpm->rtce_lock);
> ^
>
> Caused by commit
>
> 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
>
> A ';' was missed.
>
> I added the following patch for today.
Sorry about this and thank you.
/Jarkko
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 28 Apr 2016 15:27:17 +1000
> Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c
>
> Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> index 6b22826f0e11..946025a7413b 100644
> --- a/drivers/char/tpm/tpm_ibmvtpm.c
> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> @@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
>
> crq_q->index = 0;
>
> - dev_set_drvdata(&chip->dev, ibmvtpm)
> + dev_set_drvdata(&chip->dev, ibmvtpm);
>
> spin_lock_init(&ibmvtpm->rtce_lock);
>
> --
> 2.7.0
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Jani Nikula @ 2016-04-28 8:11 UTC (permalink / raw)
To: Stephen Rothwell, Dave Airlie, Daniel Vetter, intel-gfx,
dri-devel
Cc: linux-next, linux-kernel
In-Reply-To: <20160428115745.55890c80@canb.auug.org.au>
On Thu, 28 Apr 2016, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/gpu/drm/i915/intel_ddi.c: In function 'intel_prepare_ddi_buffer':
> drivers/gpu/drm/i915/intel_ddi.c:447:15: error: 'struct drm_i915_private' has no member named 'edp_low_vswing'
> if (dev_priv->edp_low_vswing) {
> ^
>
> Caused by commit
>
> 06411f08b3f3 ("drm/i915: move edp low vswing config to vbt data")
>
> interacting with commit
>
> 992e7a41f9fc ("drm/i915: Fix eDP low vswing for Broadwell")
>
> from the drm-intel-fixes tree.
>
> I applied the following merge fixup patch (which is suggested by the "v3:
> Change dev_priv->edp_low_vswing to use dev_priv->vbt.edp.low_vswing"
> comment in the drm-intel-fixes tree patch, but clearly could not be
> done there).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 28 Apr 2016 11:53:36 +1000
> Subject: [PATCH] drm/i915: fix up for edp_low_vswing change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
FWIW,
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index 6080b5481984..e304857ba405 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -444,7 +444,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
> ddi_translations_fdi = bdw_ddi_translations_fdi;
> ddi_translations_dp = bdw_ddi_translations_dp;
>
> - if (dev_priv->edp_low_vswing) {
> + if (dev_priv->vbt.edp.low_vswing) {
> ddi_translations_edp = bdw_ddi_translations_edp;
> n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
> } else {
> --
> 2.7.0
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* linux-next: Tree for Apr 28
From: Stephen Rothwell @ 2016-04-28 6:11 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160427:
The drm tree gained a build failure for which I applied a merge fix patch.
The tpmdd tree gained a build failure for which I added a fix patch.
Non-merge commits (relative to Linus' tree): 6405
5791 files changed, 243537 insertions(+), 120066 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 234 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (b75a2bf899b6 Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (1b10cb21d888 ARC: add support for reserved memory defined by device tree)
Merging arm-current/fixes (ac36a881b72a ARM: 8564/1: fix cpu feature extracting helper)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (d701cca6744f powerpc: wire up preadv2 and pwritev2 syscalls)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (49fa5230462f sparc64: Fix bootup regressions on some Kconfig combinations.)
Merging net/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (bcf493428840 netfilter: ebtables: Fix extension lookup with identical name)
Merging wireless-drivers/master (e2841ea91611 Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (af9cc93c0dee Merge tag 'asoc-fix-v4.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (67e658794ca1 cxgb4: Set VPD size so we can read both VPD structures)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (02da2d72174c Linux 4.6-rc5)
Merging usb.current/usb-linus (97b9b7dc7722 usb: musb: jz4740: fix error check of usb_get_phy())
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (613ac23a46e1 USB: serial: cp210x: add Straizona Focusers device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (431adc0aeca6 Merge tag 'iio-fixes-for-4.6c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (82dc4afd7e65 misc: mic: Fix for double fetch security bug in VOP driver)
Merging input-current/for-linus (eb43335c4095 Input: atmel_mxt_ts - use mxt_acquire_irq in mxt_soft_reset)
Merging crypto-current/master (340ff60ae93a crypto: talitos - fix AEAD tcrypt tests)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (4ea3959018d0 drm/i915: Make RPS EI/thresholds multiple of 25 on SNB-BDW)
Merging asm-generic/master (987aedb5d6f6 generic syscalls: wire up preadv2 and pwritev2 syscalls)
Merging arc/for-next (767cb9d8abfa ARC: Add eznps platform to Kconfig and Makefile)
Merging arm/for-next (c6433ebdc184 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (22a83f438e53 Merge branch 'fixes' into for-next)
Merging at91/at91-next (b9950ea9d7c6 Merge branch 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (ca2c44b4980c Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (21263e08826d Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (626106980be8 Merge branch 'omap-for-v4.7/auxdata' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (a0525b518883 Merge branch 'v4.7-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (be28390fe8f5 Merge branch 'fixes' into for-next)
Merging sunxi/sunxi/for-next (f1e9b6675c26 Merge branches 'sunxi/clocks-for-4.7', 'sunxi/dt-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (5e6bd2d42ed2 Merge branch for-4.7/gm20b into for-next)
Merging arm64/for-next/core (6a1f54711447 arm64: acpi: add acpi=on cmdline option to prefer ACPI boot over DT)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (02da2d72174c Linux 4.6-rc5)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (7620fecf8342 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (a8950e49bd24 nios2: memset: use the right constraint modifier for the %4 output operand)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (4aec6ec0da9c cxl: Increase timeout for detection of AFU mmio hang)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (7072276e6c0e s390/Kconfig: make z196 the default processor type)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (cbf85ea803db Merge branch 'for-next-4.6-20160427' into for-next-20160427)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (bdb7c4952bf3 rbd: report unsupported features to syslog)
Merging cifs/for-next (2b6c3239da3f cifs: remove any preceding delimiter from prefix_path)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (a47241cdeee2 udf: Prevent stack overflow on corrupted filesystem mount)
Merging ext4/dev (8f4c50d70cc1 ext4: remove trailing \n from ext4_warning/ext4_error calls)
Merging f2fs/dev (aca9958e97b7 ext4 crypto: migrate into vfs's crypto engine)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (2c932d4c9165 fuse: Fix return value from fuse_get_user_pages())
Merging gfs2/for-next (9c7fe83530a3 GFS2: Add calls to gfs2_holder_uninit in two error handlers)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (02da2d72174c Linux 4.6-rc5)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (a8dd1a5cd502 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-mvebu' and 'pci/host-vmd' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (a299086f23d1 Merge branch 'for-4.7/upstream' into for-next)
Merging i2c/i2c/for-next (b3b859225348 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (71a9c23246fe hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (dcb7c0b9e2ad Merge branch 'patchwork' into to_next)
Merging libata/for-next (c5cf484d03f1 Merge branch 'for-4.6-fixes' into for-next)
Merging pm/linux-next (0e013a4cd34d Merge branches 'powercap' and 'acpi-misc' into linux-next)
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (6ebe83cb5b65 Merge branch 'topic/pxa' into next)
Merging net-next/master (c0cc53162a06 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (8fb04d9fc70a ipvs: don't alter conntrack in OPS mode)
Merging wireless-drivers-next/master (9d3f65b0c2dd mwifiex: increase dwell time for active scan)
Merging bluetooth/master (50d5d2bd1d42 Merge branch 'sh_eth-next')
Merging mac80211-next/master (d686b920abb7 nl80211: use nla_put_u64_64bit() for the remaining u64 attributes)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging rdma-leon/rdma-next (c3b46c73264b Linux 4.6-rc4)
Merging rdma-leon-test/testing/rdma-next (c3b46c73264b Linux 4.6-rc4)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (abbbc60a0c69 mtd: pmc551: add __init attribute)
Merging nand/nand/next (4ab41e74ae5d mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (d1497977fecb crypto: s5p-sss - fix incorrect usage of scatterlists api)
Merging drm/drm-next (152ef5fa9e14 drm: Switch blobs to the new generic modeset obj refcounting)
Applying: drm/i915: fix up for edp_low_vswing change
Merging drm-panel/drm/panel/for-next (1ac3bac7c733 drm/panel: simple: Add support for Innolux AT070TN92)
Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (1d2ac403ae3b drm: Protect dev->filelist with its own mutex)
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 (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (5883980313af drm/vc4: Fix NULL deref in HDMI init error path)
Merging kbuild/for-next (7eb09bb55394 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (a33d59599653 Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (976410eb9b80 Merge remote-tracking branches 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (9e4cc255e6e1 Input: twl6040-vibra - remove mutex)
Merging block/for-next (783f8d0af678 Merge branch 'for-4.7/drivers' into for-next)
Merging device-mapper/for-next (3ff6a535b994 dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (3b1abe2f84e2 mmc: omap_hsmmc: Check if MMC slot name is passed in pdata)
Merging md/for-next (9c573de3283a MD: make bio mergeable)
Merging mfd/for-mfd-next (ba5776ab6f09 mfd: cros_ec: Allow building for ARM64)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (aec879a0b98b Merge remote-tracking branches 'regulator/topic/tps6524x' and 'regulator/topic/twl' into regulator-next)
Merging security/next (da20dfe6b50e fs: fix over-zealous use of "const")
Merging integrity/next (f5f8f020b2da ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging selinux/next (c2316dbf1242 selinux: apply execstack check on thread stacks)
Merging tpmdd/next (eb6a682f3d6d tpm: Add documentation for the tpm_vtpm_proxy device driver)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (1229bc9a9973 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (78f3873decad Documentation: HOWTO: update git home URL in translations)
Merging trivial/for-next (dc5a533f9130 serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (1c986e3643d2 of: document refcount incrementation of of_get_cpu_node())
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Merging mailbox/mailbox-for-next (dd28216528cf mailbox/omap: kill omap_mbox_{save/restore}_ctx() functions)
Merging spi/for-next (7136be37c1e4 Merge remote-tracking branches 'spi/topic/pic32-qspi', 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (388797294512 Merge branch 'WIP.futex')
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (c5fb04cc96c1 ARM: socfpga: Initialize Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (4afe6495e5cb tracing: Don't use the address of the buffer array name in copy_from_user)
Merging rcu/rcu/next (ebcd2861ae27 arm: Whack an expected event-trace-from-idle mole)
Merging kvm/linux-next (05b1159e641f Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next)
Merging kvm-arm/next (02e0b7600f83 arm64: kvm: Add support for 16K pages)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (3a61cfdd47c4 xen/x86: don't lose event interrupts)
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (e55c35cf41c9 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (19d46ee1aec0 asus-laptop: correct error handling in sysfs_acpi_set)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (f15c65afddbe leds: ss4200: add DMI data for FSC SCALEO Home Server)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (5614e7725856 Merge 4.6-rc4 into driver-core-next)
Merging tty/tty-next (02da2d72174c Linux 4.6-rc5)
Merging usb/usb-next (328fafb94fa1 usb: hcd: do not call whc_clean_up on wch_init call failure)
Merging usb-gadget/next (a2eb431fbd5c usb: dwc3: ep0: sanity check test mode selector)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/debugfs.c
Merging usb-serial/usb-next (8c34d82e9dc6 USB: serial: use IS_ENABLED() instead of checking for FOO || FOO_MODULE)
Merging usb-chipidea-next/ci-for-usb-next (4e332df63487 usb: otg-fsm: support multiple instances)
Merging staging/staging-next (610cc3a49fdc Staging: lustre: Make lustre_profile_list static)
CONFLICT (content): Merge conflict in drivers/iio/magnetometer/ak8975.c
Merging char-misc/char-misc-next (9bf292bfca94 misc: mic: Fix for double fetch security bug in VOP driver)
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (e0f00aff2dcc Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (0237d1ea51f0 pm80xx: Remove bogus address masking in pm8001_ioremap())
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (1f5d93d96b06 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (fd4faea75ac3 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (58657d189a2f Merge branch 'clk-hw-register' (early part) into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (157fe3c875a3 Merge branch 'for-4.7/livepatching-doc' into for-next)
Merging coresight/next (7691d3378eef coresight: configuring ETF in FIFO mode when acting as link)
Merging rtc/rtc-next (820c5327d631 rtc: ds3232: fix call trace when rtc->ops_lock is used as NULL)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Applying: tpm: fix for typo in tpm/tpm_ibmvtpm.c
Merging akpm-current/current (b45202ce7633 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/cris/Kconfig
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: mm: make mmap_sem for write waits killable for mm syscalls
Applying: mm: make vm_mmap killable
Applying: mm: make vm_munmap killable
Applying: mm, aout: handle vm_brk failures
Applying: mm, elf: handle vm_brk error
Applying: mm: make vm_brk killable
Applying: mm, proc: make clear_refs killable
Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable
Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable
Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
Applying: coredump: make coredump_wait wait for mmap_sem for write killable
Applying: aio: make aio_setup_ring killable
Applying: exec: make exec path waiting for mmap_sem killable
Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
Applying: uprobes: wait for mmap_sem for write killable
Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
Merging akpm/master (ad35eee9fb17 drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable)
^ permalink raw reply
* linux-next: build failure after merge of the tpmdd tree
From: Stephen Rothwell @ 2016-04-28 5:32 UTC (permalink / raw)
To: Jarkko Sakkinen; +Cc: linux-next, linux-kernel, Christophe Ricard
Hi Jarkko,
After merging the tpmdd tree, today's linux-next build (powerpc
allyesconfig) failed like this:
In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
from /home/sfr/next/next/include/linux/idr.h:18,
from /home/sfr/next/next/include/linux/kernfs.h:14,
from /home/sfr/next/next/include/linux/sysfs.h:15,
from /home/sfr/next/next/include/linux/kobject.h:21,
from /home/sfr/next/next/include/linux/device.h:17,
from /home/sfr/next/next/include/linux/dma-mapping.h:6,
from /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
/home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
/home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
do { \
^
/home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro 'spin_lock_init'
spin_lock_init(&ibmvtpm->rtce_lock);
^
Caused by commit
28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
A ';' was missed.
I added the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Apr 2016 15:27:17 +1000
Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c
Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/char/tpm/tpm_ibmvtpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 6b22826f0e11..946025a7413b 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
crq_q->index = 0;
- dev_set_drvdata(&chip->dev, ibmvtpm)
+ dev_set_drvdata(&chip->dev, ibmvtpm);
spin_lock_init(&ibmvtpm->rtce_lock);
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2016-04-28 1:57 UTC (permalink / raw)
To: Dave Airlie, Daniel Vetter, intel-gfx, dri-devel
Cc: linux-next, linux-kernel, Mika Kahola, Jani Nikula
Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/i915/intel_ddi.c: In function 'intel_prepare_ddi_buffer':
drivers/gpu/drm/i915/intel_ddi.c:447:15: error: 'struct drm_i915_private' has no member named 'edp_low_vswing'
if (dev_priv->edp_low_vswing) {
^
Caused by commit
06411f08b3f3 ("drm/i915: move edp low vswing config to vbt data")
interacting with commit
992e7a41f9fc ("drm/i915: Fix eDP low vswing for Broadwell")
from the drm-intel-fixes tree.
I applied the following merge fixup patch (which is suggested by the "v3:
Change dev_priv->edp_low_vswing to use dev_priv->vbt.edp.low_vswing"
comment in the drm-intel-fixes tree patch, but clearly could not be
done there).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 28 Apr 2016 11:53:36 +1000
Subject: [PATCH] drm/i915: fix up for edp_low_vswing change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/i915/intel_ddi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 6080b5481984..e304857ba405 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -444,7 +444,7 @@ void intel_prepare_ddi_buffer(struct intel_encoder *encoder)
ddi_translations_fdi = bdw_ddi_translations_fdi;
ddi_translations_dp = bdw_ddi_translations_dp;
- if (dev_priv->edp_low_vswing) {
+ if (dev_priv->vbt.edp.low_vswing) {
ddi_translations_edp = bdw_ddi_translations_edp;
n_edp_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
} else {
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* mmotm 2016-04-27-15-21 uploaded
From: akpm @ 2016-04-27 22:21 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-04-27-15-21 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.6-rc5:
(patches marked "*" will be included in linux-next)
origin.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* kexec-update-vmcoreinfo-for-compound_order-dtor.patch
* kexec-export-offsetpagecompound_head-to-find-out-compound-tail-page.patch
* mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch
* thp-keep-huge-zero-page-pinned-until-tlb-flush.patch
* mailmap-fix-krzysztof-kozlowskis-misspelled-name.patch
* mm-huge_memory-replace-vm_no_thp-vm_bug_on-with-actual-vma-check.patch
* numa-fix-proc-pid-numa_maps-for-thp.patch
* mm-vmscan-reclaim-highmem-zone-if-buffer_heads-is-over-limit.patch
* mm-call-swap_slot_free_notify-with-holding-page-lock.patch
* mm-hwpoison-fix-wrong-num_poisoned_pages-account.patch
* mailmap-add-frank-rowand.patch
* mm-wake-kcompactd-before-kswapds-short-sleep.patch
* kcov-dont-trace-the-code-coverage-code.patch
* kcov-dont-profile-branches-in-kcov.patch
* update-email-address.patch
* ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.patch
* mm-memory-failure-fix-race-with-compound-page-split-merge.patch
* rapidio-fix-potential-null-pointer-dereference.patch
* lib-stackdepotc-allow-the-stack-trace-hash-to-be-zero.patch
* mm-update-the-document-of-numa_zonelist_order.patch
* kprobes-add-the-tls-argument-for-j_do_fork.patch
* mm-thp-correct-split_huge_pages-file-permission.patch
* mm-memcontrol-let-v2-cgroups-follow-changes-in-system-swappiness.patch
* rapidio-mport_cdev-fix-uapi-type-definitions.patch
* huge-pagecache-mmap_sem-is-unlocked-when-truncation-splits-pmd.patch
* mm-update-min_free_kbytes-from-khugepaged-after-core-initialization.patch
* mm-cma-prevent-nr_isolated_-counters-from-going-negative.patch
* maintainers-fix-rajendra-nayaks-address.patch
* mm-thp-kvm-fix-memory-corruption-in-kvm-with-thp-enabled.patch
* dax-add-dax_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-blk-call-dax_get_unmapped_area-for-dax-pmd-mappings.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fsnotify-avoid-spurious-emfile-errors-from-inotify_init.patch
* fsnotify-avoid-spurious-emfile-errors-from-inotify_init-checkpatch-fixes.patch
* scripts-decode_stacktracesh-handle-symbols-in-modules.patch
* scripts-spellingtxt-add-fimware-misspelling.patch
* debugobjects-make-fixup-functions-return-bool-instead-of-int.patch
* debugobjects-correct-the-usage-of-fixup-call-results.patch
* workqueue-update-debugobjects-fixup-callbacks-return-type.patch
* timer-update-debugobjects-fixup-callbacks-return-type.patch
* rcu-update-debugobjects-fixup-callbacks-return-type.patch
* percpu_counter-update-debugobjects-fixup-callbacks-return-type.patch
* documentation-update-debugobjects-doc.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-error-code-comments-and-amendments-the-comment-of-ocfs2_extended_slot-should-be-0x08.patch
* ocfs2-clean-up-an-unused-variable-wants_rotate-in-ocfs2_truncate_rec.patch
* ocfs2-clean-up-unused-parameter-count-in-o2hb_read_block_input.patch
* ocfs2-clean-up-an-unuseful-goto-in-ocfs2_put_slot-function.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-negotiate-timer-v2.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-nego_timeout-message-v2.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-negotiate_approve-message-v2.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-add-some-user-debug-log-v2.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* padata-removed-unused-code.patch
* kernel-padata-hide-unused-functions.patch
* kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
* mm-slab-fix-the-theoretical-race-by-holding-proper-lock.patch
* mm-slab-remove-bad_alien_magic-again.patch
* mm-slab-drain-the-free-slab-as-much-as-possible.patch
* mm-slab-factor-out-kmem_cache_node-initialization-code.patch
* mm-slab-factor-out-kmem_cache_node-initialization-code-fix.patch
* mm-slab-clean-up-kmem_cache_node-setup.patch
* mm-slab-dont-keep-free-slabs-if-free_objects-exceeds-free_limit.patch
* mm-slab-racy-access-modify-the-slab-color.patch
* mm-slab-make-cache_grow-handle-the-page-allocated-on-arbitrary-node.patch
* mm-slab-separate-cache_grow-to-two-parts.patch
* mm-slab-refill-cpu-cache-through-a-new-slab-without-holding-a-node-lock.patch
* mm-slab-lockless-decision-to-grow-cache.patch
* mm-slub-replace-kick_all_cpus_sync-with-synchronize_sched-in-kmem_cache_shrink.patch
* mm-slab-freelist-randomization-v4.patch
* mm-slab-freelist-randomization-v5.patch
* mm-slab-freelist-randomization-v5-fix.patch
* mm-page_ref-use-page_ref-helper-instead-of-direct-modification-of-_count.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix-fix.patch
* compilerh-add-support-for-malloc-attribute.patch
* include-linux-apply-__malloc-attribute.patch
* include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
* include-linux-nodemaskh-create-next_node_in-helper.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
* mm-hugetlb-optimize-minimum-size-min_size-accounting.patch
* mm-hugetlb-introduce-hugetlb_bad_size.patch
* arm64-mm-use-hugetlb_bad_size.patch
* metag-mm-use-hugetlb_bad_size.patch
* powerpc-mm-use-hugetlb_bad_size.patch
* tile-mm-use-hugetlb_bad_size.patch
* x86-mm-use-hugetlb_bad_size.patch
* mm-hugetlb-is_vm_hugetlb_page-can-be-boolean.patch
* mm-memory_hotplug-is_mem_section_removable-can-be-boolean.patch
* mm-vmalloc-is_vmalloc_addr-can-be-boolean.patch
* mm-mempolicy-vma_migratable-can-be-boolean.patch
* mm-memcontrolc-mem_cgroup_select_victim_node-clarify-comment.patch
* mm-page_alloc-remove-useless-parameter-of-__free_pages_boot_core.patch
* zsmalloc-use-first_page-rather-than-page.patch
* zsmalloc-clean-up-many-bug_on.patch
* zsmalloc-reordering-function-parameter.patch
* zsmalloc-remove-unused-pool-param-in-obj_free.patch
* mm-hugetlbc-use-first_memory_node.patch
* mm-mempolicyc-offset_il_node-document-and-clarify.patch
* mm-rmap-replace-bug_onanon_vma-degree-with-vm_warn_on.patch
* mm-compaction-wrap-calculating-first-and-last-pfn-of-pageblock.patch
* compaction-wrap-calculating-first-and-last-pfn-of-pageblock-fix.patch
* mm-compaction-reduce-spurious-pcplist-drains.patch
* mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction.patch
* mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction-fix.patch
* mm-highmem-simplify-is_highmem.patch
* mm-uninline-page_mapped.patch
* mm-uninline-page_mapped-checkpatch-fixes.patch
* mm-hugetlb-add-same-zone-check-in-pfn_range_valid_gigantic.patch
* mm-memory_hotplug-add-comment-to-some-functions-related-to-memory-hotplug.patch
* mm-vmstat-add-zone-range-overlapping-check.patch
* mm-page_owner-add-zone-range-overlapping-check.patch
* power-add-zone-range-overlapping-check.patch
* mm-workingset-only-do-workingset-activations-on-reads.patch
* mm-filemap-only-do-access-activations-on-reads.patch
* mm-vmscan-reduce-size-of-inactive-file-list.patch
* mm-writeback-correct-dirty-page-calculation-for-highmem.patch
* mm-page_alloc-correct-highmem-memory-statistics.patch
* mm-highmem-make-nr_free_highpages-handles-all-highmem-zones-by-itself.patch
* mm-vmstat-make-node_page_state-handles-all-zones-by-itself.patch
* mm-mmap-kill-hook-arch_rebalance_pgtables.patch
* mm-update_lru_size-warn-and-reset-bad-lru_size.patch
* mm-update_lru_size-do-the-__mod_zone_page_state.patch
* mm-use-__setpageswapbacked-and-dont-clearpageswapbacked.patch
* tmpfs-preliminary-minor-tidyups.patch
* tmpfs-mem_cgroup-charge-fault-to-vm_mm-not-current-mm.patch
* mm-proc-sys-vm-stat_refresh-to-force-vmstat-update.patch
* huge-mm-move_huge_pmd-does-not-need-new_vma.patch
* huge-pagecache-extend-mremap-pmd-rmap-lockout-to-files.patch
* arch-fix-has_transparent_hugepage.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
* memory_hotplug-introduce-memhp_default_state=-command-line-parameter.patch
* mm-oom-move-gfp_nofs-check-to-out_of_memory.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper-clear-oom_reaper_list-before-clearing-tif_memdie.patch
* mm-page_alloc-only-check-pagecompound-for-high-order-pages.patch
* mm-page_alloc-only-check-pagecompound-for-high-order-pages-fix.patch
* mm-page_alloc-use-new-pageanonhead-helper-in-the-free-page-fast-path.patch
* mm-page_alloc-reduce-branches-in-zone_statistics.patch
* mm-page_alloc-inline-zone_statistics.patch
* mm-page_alloc-inline-the-fast-path-of-the-zonelist-iterator.patch
* mm-page_alloc-use-__dec_zone_state-for-order-0-page-allocation.patch
* mm-page_alloc-avoid-unnecessary-zone-lookups-during-pageblock-operations.patch
* mm-page_alloc-convert-alloc_flags-to-unsigned.patch
* mm-page_alloc-convert-nr_fair_skipped-to-bool.patch
* mm-page_alloc-remove-unnecessary-local-variable-in-get_page_from_freelist.patch
* mm-page_alloc-remove-unnecessary-initialisation-in-get_page_from_freelist.patch
* mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask.patch
* mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask-fix.patch
* mm-page_alloc-simplify-last-cpupid-reset.patch
* mm-page_alloc-move-__gfp_hardwall-modifications-out-of-the-fastpath.patch
* mm-page_alloc-check-once-if-a-zone-has-isolated-pageblocks.patch
* mm-page_alloc-check-once-if-a-zone-has-isolated-pageblocks-fix.patch
* mm-page_alloc-shorten-the-page-allocator-fast-path.patch
* mm-page_alloc-shorten-the-page-allocator-fast-path-fix.patch
* mm-page_alloc-reduce-cost-of-fair-zone-allocation-policy-retry.patch
* mm-page_alloc-shortcut-watermark-checks-for-order-0-pages.patch
* mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice.patch
* mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice-fix.patch
* mm-page_alloc-remove-field-from-alloc_context.patch
* mm-page_alloc-check-multiple-page-fields-with-a-single-branch.patch
* mm-page_alloc-un-inline-the-bad-part-of-free_pages_check.patch
* mm-page_alloc-un-inline-the-bad-part-of-free_pages_check-fix.patch
* mm-page_alloc-pull-out-side-effects-from-free_pages_check.patch
* mm-page_alloc-remove-unnecessary-variable-from-free_pcppages_bulk.patch
* mm-page_alloc-inline-pageblock-lookup-in-page-free-fast-paths.patch
* cpuset-use-static-key-better-and-convert-to-new-api.patch
* mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain.patch
* mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain-fix.patch
* mm-page_alloc-defer-debugging-checks-of-pages-allocated-from-the-pcp.patch
* mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare.patch
* mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare-fix.patch
* mm-page_alloc-uninline-the-bad-page-part-of-check_new_page.patch
* vmscan-consider-classzone_idx-in-compaction_ready.patch
* mm-compaction-change-compact_-constants-into-enum.patch
* mm-compaction-cover-all-compaction-mode-in-compact_zone.patch
* mm-compaction-distinguish-compact_deferred-from-compact_skipped.patch
* mm-compaction-distinguish-between-full-and-partial-compact_complete.patch
* mm-compaction-update-compaction_result-ordering.patch
* mm-compaction-simplify-__alloc_pages_direct_compact-feedback-interface.patch
* mm-compaction-abstract-compaction-feedback-to-helpers.patch
* mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
* mm-use-compaction-feedback-for-thp-backoff-conditions.patch
* mm-oom-rework-oom-detection.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-oom-protect-costly-allocations-some-more.patch
* mm-consider-compaction-feedback-also-for-costly-allocation.patch
* mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders.patch
* mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
* mm-oom_reaper-hide-oom-reaped-tasks-from-oom-killer-more-carefully.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context.patch
* mm-oom_reaper-do-not-mmput-synchronously-from-the-oom-reaper-context-fix.patch
* z3fold-the-3-fold-allocator-for-compressed-pages.patch
* z3fold-the-3-fold-allocator-for-compressed-pages-v3.patch
* mm-thp-simplify-the-implementation-of-mk_huge_pmd.patch
* memory-failure-replace-mce-with-memory-failure.patch
* memory-failure-replace-mce-with-memory-failure-fix.patch
* mm-memblock-move-memblock_addreserve_region-into-memblock_addreserve.patch
* mm-vmalloc-keep-a-separate-lazy-free-list.patch
* mm-fix-incorrect-pfn-passed-to-untrack_pfn-in-remap_pfn_range-v2.patch
* mm-enable-rlimit_data-by-default-with-workaround-for-valgrind.patch
* tmpfs-fix-vm_mayshare-mappings-for-nommu.patch
* mm-hugetlb_cgroup-round-limit_in_bytes-down-to-hugepage-size.patch
* mm-tighten-fault_in_pages_writeable.patch
* mm-put-activate_page_pvecs-and-others-pagevec-together.patch
* include-linux-hugetlb-clean-up-code.patch
* include-linux-hugetlbh-use-bool-instead-of-int-for-hugepage_migration_supported.patch
* mm-fix-commmets-if-sparsemem-pgdata-doesnt-have-page_ext.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* mm-vmstat-calculate-particular-vm-event.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged.patch
* mm-thp-avoid-unnecessary-swapin-in-khugepaged-fix.patch
* mm-kasan-initial-memory-quarantine-implementation.patch
* mm-kasan-initial-memory-quarantine-implementation-v8.patch
* mm-kasan-dont-call-kasan_krealloc-from-ksize.patch
* mm-kasan-add-a-ksize-test.patch
* mm-zswap-use-workqueue-to-destroy-pool.patch
* procfs-expose-umask-in-proc-pid-status.patch
* procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable.patch
* procfs-fixes-pthread-cross-thread-naming-if-pr_dumpable-fix.patch
* mn10300-let-exit_fpu-accept-a-task.patch
* exit_thread-remove-empty-bodies.patch
* exit_thread-remove-empty-bodies-fix.patch
* exit_thread-accept-a-task-parameter-to-be-exited.patch
* exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
* fork-free-thread-in-copy_process-on-failure.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* printk-nmi-flush-nmi-messages-on-the-system-panic.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* maintainers-remove-linux-listsopenriscnet.patch
* maintainers-remove-defunct-spear-mailing-list.patch
* lib-vsprintf-simplify-uuid-printing.patch
* ima-use-%pu-to-output-uuid-in-printable-format.patch
* lib-uuid-move-generate_random_uuid-to-uuidc.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid-fix.patch
* lib-uuid-remove-fsf-address.patch
* sysctl-use-generic-uuid-library.patch
* efi-redefine-type-constant-macro-from-generic-code.patch
* efivars-use-generic-uuid-library.patch
* genhd-move-to-use-generic-uuid-library.patch
* ldm-use-generic-uuid-library.patch
* wmi-use-generic-uuid-library.patch
* radix-tree-introduce-radix_tree_empty.patch
* radix-tree-test-suite-fix-build.patch
* radix-tree-test-suite-add-tests-for-radix_tree_locate_item.patch
* radix-tree-test-suite-allow-testing-other-fan-out-values.patch
* radix-tree-test-suite-keep-regression-test-runs-short.patch
* radix-tree-test-suite-rebuild-when-headers-change.patch
* radix-tree-remove-unused-looping-macros.patch
* introduce-config_radix_tree_multiorder.patch
* radix-tree-add-missing-sibling-entry-functionality.patch
* radix-tree-fix-sibling-entry-insertion.patch
* radix-tree-fix-deleting-a-multi-order-entry-through-an-alias.patch
* radix-tree-remove-restriction-on-multi-order-entries.patch
* radix-tree-introduce-radix_tree_load_root.patch
* radix-tree-fix-extending-the-tree-for-multi-order-entries-at-offset-0.patch
* radix-tree-test-suite-start-adding-multiorder-tests.patch
* radix-tree-fix-several-shrinking-bugs-with-multiorder-entries.patch
* radix-tree-rewrite-__radix_tree_lookup.patch
* radix-tree-fix-multiorder-bug_on-in-radix_tree_insert.patch
* radix-tree-add-support-for-multi-order-iterating.patch
* radix-tree-test-suite-multi-order-iteration-test.patch
* radix-tree-rewrite-radix_tree_tag_set.patch
* radix-tree-rewrite-radix_tree_tag_clear.patch
* radix-tree-rewrite-radix_tree_tag_get.patch
* radix-tree-test-suite-add-multi-order-tag-test.patch
* radix-tree-fix-radix_tree_create-for-sibling-entries.patch
* radix-tree-rewrite-radix_tree_locate_item.patch
* radix-tree-fix-radix_tree_range_tag_if_tagged-for-multiorder-entries.patch
* radix-tree-fix-radix_tree_dump-for-multi-order-entries.patch
* radix-tree-add-copyright-statements.patch
* drivers-hwspinlock-use-correct-radix-tree-api.patch
* radix-tree-miscellaneous-fixes.patch
* radix-tree-split-node-path-into-offset-and-height.patch
* radix-tree-replace-node-height-with-node-shift.patch
* radix-tree-remove-a-use-of-root-height-from-delete_node.patch
* radix-tree-test-suite-remove-dependencies-on-height.patch
* radix-tree-remove-root-height.patch
* radix-tree-rename-indirect_ptr-to-internal_node.patch
* radix-tree-rename-ptr_to_indirect-to-node_to_entry.patch
* radix-tree-rename-indirect_to_ptr-to-entry_to_node.patch
* radix-tree-rename-radix_tree_is_indirect_ptr.patch
* radix-tree-change-naming-conventions-in-radix_tree_shrink.patch
* radix-tree-tidy-up-next_chunk.patch
* radix-tree-tidy-up-range_tag_if_tagged.patch
* radix-tree-tidy-up-__radix_tree_create.patch
* radix-tree-introduce-radix_tree_replace_clear_tags.patch
* radix-tree-make-radix_tree_descend-more-useful.patch
* dax-move-radix_dax_-definitions-to-daxc.patch
* radix-tree-free-up-the-bottom-bit-of-exceptional-entries-for-reuse.patch
* lib-add-crc64-ecma-module.patch
* checkpatch-add-prefer_is_enabled-test.patch
* checkpatch-improve-constant_comparison-test-for-structure-members.patch
* checkpatch-add-test-for-keywords-not-starting-on-tabstops.patch
* checkpatch-whine-about-access_once.patch
* checkpatch-advertise-the-fix-and-fix-inplace-options-more.patch
* checkpatch-add-list-types-to-show-message-types-to-show-or-ignore.patch
* checkpatch-add-support-to-check-already-applied-git-commits.patch
* init-mainc-simplify-initcall_blacklisted.patch
* nilfs2-constify-nilfs_sc_operations-structures.patch
* wait-ptrace-assume-__wall-if-the-child-is-traced.patch
* wait-allow-sys_waitid-to-accept-__wnothread-__wclone-__wall.patch
* signal-make-oom_flags-a-bool.patch
* kernel-signalc-convert-printkkern_level-to-pr_level.patch
* fs-execc-fix-minor-memory-leak.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-make-a-pair-of-map-unmap-reserved-pages-in-error-path.patch
* kexec-do-a-cleanup-for-function-kexec_load.patch
* s390-kexec-consolidate-crash_map-unmap_reserved_pages-and-arch_kexec_protectunprotect_crashkres.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* futex-fix-shared-futex-operations-on-nommu.patch
* arch-defconfig-remove-config_resource_counters.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* mm-make-mmap_sem-for-write-waits-killable-for-mm-syscalls.patch
* mm-make-vm_mmap-killable.patch
* mm-make-vm_munmap-killable.patch
* mm-aout-handle-vm_brk-failures.patch
* mm-elf-handle-vm_brk-error.patch
* mm-make-vm_brk-killable.patch
* mm-proc-make-clear_refs-killable.patch
* mm-fork-make-dup_mmap-wait-for-mmap_sem-for-write-killable.patch
* ipc-shm-make-shmem-attach-detach-wait-for-mmap_sem-killable.patch
* vdso-make-arch_setup_additional_pages-wait-for-mmap_sem-for-write-killable.patch
* coredump-make-coredump_wait-wait-for-mmap_sem-for-write-killable.patch
* aio-make-aio_setup_ring-killable.patch
* exec-make-exec-path-waiting-for-mmap_sem-killable.patch
* prctl-make-pr_set_thp_disable-wait-for-mmap_sem-killable.patch
* uprobes-wait-for-mmap_sem-for-write-killable.patch
* drm-i915-make-i915_gem_mmap_ioctl-wait-for-mmap_sem-killable.patch
* drm-radeon-make-radeon_mn_get-wait-for-mmap_sem-killable.patch
* drm-amdgpu-make-amdgpu_mn_get-wait-for-mmap_sem-killable.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: next-20160427 build: 1 failures 15 warnings (next-20160427)
From: Thierry Reding @ 2016-04-27 14:48 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Warren, Kishon Vijay Abraham I, Alexandre Courbot,
kernel-build-reports-cunTk1MwBs8s++Sfvej+rw,
linaro-kernel-cunTk1MwBs8s++Sfvej+rw,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20160427122438.GK3217-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
On Wed, Apr 27, 2016 at 01:24:38PM +0100, Mark Brown wrote:
> * PGP Signed by an unknown key
>
> On Wed, Apr 27, 2016 at 10:50:51AM +0100, Build bot for Mark Brown wrote:
>
> Today's next fails to build an arm64 allmodconfig due to:
>
> > arm64-allmodconfig
> > ../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
>
> caused by 44f5d38eaa21d (phy: tegra: Add Tegra210 support).
Yes, I just realized this now as well. I pushed a fix to Tegra's
for-next, so this should be fixed in tomorrow's linux-next.
Sorry for this.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Nicolas Pitre @ 2016-04-27 13:46 UTC (permalink / raw)
To: Michal Marek
Cc: Stephen Rothwell, linux-next, linux-kernel, Jens Axboe,
Randy Dunlap
In-Reply-To: <57208010.7030505@suse.cz>
On Wed, 27 Apr 2016, Michal Marek wrote:
> On 2016-04-26 22:48, Nicolas Pitre wrote:
> > On Wed, 27 Apr 2016, Stephen Rothwell wrote:
> >
> >> Hi Nicolas,
> >>
> >> On Tue, 26 Apr 2016 10:40:57 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
> >>>
> >>> If you can reproduce this build failure, could you try a make mrproper
> >>> and attempt it again? I, too, would like to find an explanation and a
> >>> way to reproduce.
> >>
> >> I reset my build tree to commit 9d67df654092 ("Merge remote-tracking
> >> branch 'block/for-next'") and the build failed with:
> >>
> >> ERROR: ".local_clock" [drivers/vhost/vhost_net.ko] undefined!
> >> ERROR: ".local_clock" [drivers/misc/cxl/cxl.ko] undefined!
> >>
> >> :-(
> >>
> >> So I did a "make mrproper" and did the build again.
> >>
> >> That built correctly.
> >>
> > [...]
> >
> > OK! After digging and diffing through 750 megabytes of make debug logs
> > I finally found the explanation. The if_changed directive is useless
> > against phony targets.
> >
> > @Stephen: could you replace the revert with the patch below in your tree?
> >
> > @Michal: could you fold the patch below into commit 2441e78b19 in your tree?
>
> I prefer not to overwrite the topic branches unless necessary and I
> wanted to credit Stephen, so I committed your patch with a fabricated
> commit message and your signoff (since you wanted to fold it into a
> patch that you had already signed off).
Fine with me.
Nicolas
^ permalink raw reply
* master build: 1 failures 15 warnings (v4.6-rc5-7104-g29fab3a)
From: Build bot for Mark Brown @ 2016-04-27 13:21 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: master
Git describe: v4.6-rc5-7104-g29fab3a
Commit: 29fab3a5a2 Add linux-next specific files for 20160427
Build Time: 78 min 40 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 15
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
Errors:
arm64-allmodconfig
../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
9 warnings 0 mismatches : arm64-allmodconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
11 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
3 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
Warnings Summary: 15
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/phy/tegra/xusb-tegra210.c:1741:1: warning: label 'free' defined but not used [-Wunused-label]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1304:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 9 warnings, 0 section mismatches
Errors:
../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/phy/tegra/xusb-tegra210.c:1741:1: warning: label 'free' defined but not used [-Wunused-label]
../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1304:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
x86_64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Saeed Mahameed @ 2016-04-27 13:13 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Linux Netdev List, linux-next, linux-kernel,
Saeed Mahameed, Gal Pressman
In-Reply-To: <20160427120109.37449920@canb.auug.org.au>
On Wed, Apr 27, 2016 at 5:01 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>
> between commit:
>
> d8edd2469ace ("et/mlx5e: Fix minimum MTU")
>
> from the net tree and commit:
>
> 0e405443e803 ("net/mlx5e: Improve set features ndo resiliency")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> index 67d548b70e14,5bad17d37d7b..000000000000
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
> @@@ -2025,9 -2214,49 +2240,52 @@@ static int set_feature_rx_vlan(struct n
> return err;
> }
>
> + static int mlx5e_handle_feature(struct net_device *netdev,
> + netdev_features_t wanted_features,
> + netdev_features_t feature,
> + mlx5e_feature_handler feature_handler)
> + {
> + netdev_features_t changes = wanted_features ^ netdev->features;
> + bool enable = !!(wanted_features & feature);
> + int err;
> +
> + if (!(changes & feature))
> + return 0;
> +
> + err = feature_handler(netdev, enable);
> + if (err) {
> + netdev_err(netdev, "%s feature 0x%llx failed err %d\n",
> + enable ? "Enable" : "Disable", feature, err);
> + return err;
> + }
> +
> + MLX5E_SET_FEATURE(netdev, feature, enable);
> + return 0;
> + }
> +
> + static int mlx5e_set_features(struct net_device *netdev,
> + netdev_features_t features)
> + {
> + int err;
> +
> + err = mlx5e_handle_feature(netdev, features, NETIF_F_LRO,
> + set_feature_lro);
> + err |= mlx5e_handle_feature(netdev, features,
> + NETIF_F_HW_VLAN_CTAG_FILTER,
> + set_feature_vlan_filter);
> + err |= mlx5e_handle_feature(netdev, features, NETIF_F_HW_TC,
> + set_feature_tc_num_filters);
> + err |= mlx5e_handle_feature(netdev, features, NETIF_F_RXALL,
> + set_feature_rx_all);
> + err |= mlx5e_handle_feature(netdev, features, NETIF_F_HW_VLAN_CTAG_RX,
> + set_feature_rx_vlan);
> +
> + return err ? -EINVAL : 0;
> + }
> +
> +#define MXL5_HW_MIN_MTU 64
> +#define MXL5E_MIN_MTU (MXL5_HW_MIN_MTU + ETH_FCS_LEN)
> +
> static int mlx5e_change_mtu(struct net_device *netdev, int new_mtu)
> {
> struct mlx5e_priv *priv = netdev_priv(netdev);
> @@@ -2633,18 -2966,10 +2997,19 @@@ static void mlx5e_destroy_netdev(struc
> schedule_work(&priv->set_rx_mode_work);
> mlx5e_disable_async_events(priv);
> flush_scheduled_work();
> - unregister_netdev(netdev);
> + if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) {
> + netif_device_detach(netdev);
> + mutex_lock(&priv->state_lock);
> + if (test_bit(MLX5E_STATE_OPENED, &priv->state))
> + mlx5e_close_locked(netdev);
> + mutex_unlock(&priv->state_lock);
> + } else {
> + unregister_netdev(netdev);
> + }
> +
> mlx5e_tc_cleanup(priv);
> mlx5e_vxlan_cleanup(priv);
> + mlx5e_destroy_q_counter(priv);
> mlx5e_destroy_flow_tables(priv);
> mlx5e_destroy_tirs(priv);
> mlx5e_destroy_rqt(priv, MLX5E_SINGLE_RQ_RQT);
Looks good, and it is pretty straightforward.
Dave will have to take all hunks from both patches, same as you did.
Thank you Stephen.
Saeed.
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the staging.current tree
From: Jonathan Cameron @ 2016-04-27 12:37 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH
Cc: linux-next, linux-kernel, Gregor Boirie, Jonathan Cameron,
Richard Leitner
In-Reply-To: <20160427145400.7bf1e6bb@canb.auug.org.au>
On 27 April 2016 05:54:00 BST, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>Hi Greg,
>
>Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/magnetometer/ak8975.c
>
>between commit:
>
> 05be8d4101d9 ("iio: ak8975: fix maybe-uninitialized warning")
>
>from the staging.current tree and commit:
>
> 97eacb9166f4 ("iio:ak8975: add mounting matrix support")
>
>from the staging tree.
>
>I fixed it up (see below) and can carry the fix as necessary. This
>is now fixed as far as linux-next is concerned, but any non trivial
>conflicts should be mentioned to your upstream maintainer when your
>tree
>is submitted for merging. You may also want to consider cooperating
>with the maintainer of the conflicting tree to minimise any
>particularly
>complex conflicts.
Hi Stephen,
Sorry, I clearly failed to check my own trees didn't clash before sending the pull to Greg.
Fix looks good, thanks
Jonathan
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
^ permalink raw reply
* Re: next-20160427 build: 1 failures 15 warnings (next-20160427)
From: Mark Brown @ 2016-04-27 12:24 UTC (permalink / raw)
To: Thierry Reding, Stephen Warren, Kishon Vijay Abraham I,
Alexandre Courbot
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-tegra
In-Reply-To: <E1avM7P-0002LM-3R@optimist>
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
On Wed, Apr 27, 2016 at 10:50:51AM +0100, Build bot for Mark Brown wrote:
Today's next fails to build an arm64 allmodconfig due to:
> arm64-allmodconfig
> ../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
caused by 44f5d38eaa21d (phy: tegra: Add Tegra210 support).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* next-20160427 build: 1 failures 15 warnings (next-20160427)
From: Build bot for Mark Brown @ 2016-04-27 9:50 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160427
Git describe: next-20160427
Commit: a9f10f32e9 Add linux-next specific files for 20160427
Build Time: 78 min 31 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 15
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
Errors:
arm64-allmodconfig
../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
9 warnings 0 mismatches : arm64-allmodconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
11 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
3 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
Warnings Summary: 15
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/phy/tegra/xusb-tegra210.c:1741:1: warning: label 'free' defined but not used [-Wunused-label]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1304:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 9 warnings, 0 section mismatches
Errors:
../drivers/phy/tegra/xusb-tegra210.c:1721:3: error: label 'out' used but not defined
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/phy/tegra/xusb-tegra210.c:1741:1: warning: label 'free' defined but not used [-Wunused-label]
../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1304:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/pinctrl/sh-pfc/core.c:603:17: warning: unused variable 'pfc' [-Wunused-variable]
../drivers/regulator/core.c:2536:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
x86_64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the block tree
From: Michal Marek @ 2016-04-27 9:02 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Stephen Rothwell, linux-next, linux-kernel, Jens Axboe,
Randy Dunlap
In-Reply-To: <alpine.LFD.2.20.1604261603310.5091@knanqh.ubzr>
On 2016-04-26 22:48, Nicolas Pitre wrote:
> On Wed, 27 Apr 2016, Stephen Rothwell wrote:
>
>> Hi Nicolas,
>>
>> On Tue, 26 Apr 2016 10:40:57 -0400 (EDT) Nicolas Pitre <nicolas.pitre@linaro.org> wrote:
>>>
>>> If you can reproduce this build failure, could you try a make mrproper
>>> and attempt it again? I, too, would like to find an explanation and a
>>> way to reproduce.
>>
>> I reset my build tree to commit 9d67df654092 ("Merge remote-tracking
>> branch 'block/for-next'") and the build failed with:
>>
>> ERROR: ".local_clock" [drivers/vhost/vhost_net.ko] undefined!
>> ERROR: ".local_clock" [drivers/misc/cxl/cxl.ko] undefined!
>>
>> :-(
>>
>> So I did a "make mrproper" and did the build again.
>>
>> That built correctly.
>>
> [...]
>
> OK! After digging and diffing through 750 megabytes of make debug logs
> I finally found the explanation. The if_changed directive is useless
> against phony targets.
>
> @Stephen: could you replace the revert with the patch below in your tree?
>
> @Michal: could you fold the patch below into commit 2441e78b19 in your tree?
I prefer not to overwrite the topic branches unless necessary and I
wanted to credit Stephen, so I committed your patch with a fabricated
commit message and your signoff (since you wanted to fold it into a
patch that you had already signed off).
Michal
^ 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