* Re: linux-next: manual merge of the net-next tree with the net tree
From: Saeed Mahameed @ 2018-12-17 21:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux Next Mailing List,
Linux Kernel Mailing List, Or Gerlitz, Saeed Mahameed,
Eli Britstein
In-Reply-To: <20181217112546.4e400eb3@canb.auug.org.au>
On Sun, Dec 16, 2018 at 4:25 PM 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_tc.c
>
> between commit:
>
> 154e62abe9cd ("net/mlx5e: Properly initialize flow attributes for slow path eswitch rule deletion")
>
> from the net tree and commit:
>
> e88afe759a49 ("net/mlx5e: Err if asked to mirror a goto chain tc eswitch rule")
> e85e02bad29e ("net/mlx5: E-Switch, Rename esw attr mirror count field")
>
> 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_tc.c
> index 9dabe9d4b279,53ebb5a48018..000000000000
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
> @@@ -870,9 -903,9 +903,9 @@@ mlx5e_tc_offload_to_slow_path(struct ml
> struct mlx5_flow_handle *rule;
>
> memcpy(slow_attr, flow->esw_attr, sizeof(*slow_attr));
> - slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,
> - slow_attr->split_count = 0,
> - slow_attr->dest_chain = FDB_SLOW_PATH_CHAIN,
> + slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
> - slow_attr->mirror_count = 0;
> ++ slow_attr->split_count = 0;
> + slow_attr->dest_chain = FDB_SLOW_PATH_CHAIN;
>
> rule = mlx5e_tc_offload_fdb_rules(esw, flow, spec, slow_attr);
> if (!IS_ERR(rule))
> @@@ -887,9 -920,6 +920,9 @@@ mlx5e_tc_unoffload_from_slow_path(struc
> struct mlx5_esw_flow_attr *slow_attr)
> {
> memcpy(slow_attr, flow->esw_attr, sizeof(*slow_attr));
> + slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
> - slow_attr->mirror_count = 0;
> ++ slow_attr->split_count = 0;
> + slow_attr->dest_chain = FDB_SLOW_PATH_CHAIN;
> mlx5e_tc_unoffload_fdb_rules(esw, flow, slow_attr);
> flow->flags &= ~MLX5E_TC_FLOW_SLOW;
> }
> @@@ -909,11 -939,13 +942,12 @@@ mlx5e_tc_add_fdb_flow(struct mlx5e_pri
> struct mlx5e_rep_priv *rpriv;
> struct mlx5e_priv *out_priv;
> int err = 0, encap_err = 0;
> + int out_index;
>
> - /* if prios are not supported, keep the old behaviour of using same prio
> - * for all offloaded rules.
> - */
> - if (!mlx5_eswitch_prios_supported(esw))
> - attr->prio = 1;
> + if (!mlx5_eswitch_prios_supported(esw) && attr->prio != 1) {
> + NL_SET_ERR_MSG(extack, "E-switch priorities unsupported, upgrade FW");
> + return -EOPNOTSUPP;
> + }
>
> if (attr->chain > max_chain) {
> NL_SET_ERR_MSG(extack, "Requested chain is out of supported range");
> @@@ -2980,15 -2667,7 +2667,15 @@@ static int parse_tc_fdb_actions(struct
> if (!actions_match_supported(priv, exts, parse_attr, flow, extack))
> return -EOPNOTSUPP;
>
> + if (attr->dest_chain) {
> + if (attr->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
> + NL_SET_ERR_MSG(extack, "Mirroring goto chain rules isn't supported");
> + return -EOPNOTSUPP;
> + }
> + attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
> + }
> +
> - if (attr->mirror_count > 0 && !mlx5_esw_has_fwd_fdb(priv->mdev)) {
> + if (attr->split_count > 0 && !mlx5_esw_has_fwd_fdb(priv->mdev)) {
> NL_SET_ERR_MSG_MOD(extack,
> "current firmware doesn't support split rule for port mirroring");
> netdev_warn_once(priv->netdev, "current firmware doesn't support split rule for port mirroring\n");
Looks good to me.
^ permalink raw reply
* Re: linux-next: Signed-off-by missing for commit in the v4l-dvb-next tree
From: Mauro Carvalho Chehab @ 2018-12-17 20:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Tian Shu Qiu,
Yong Zhi, Sakari Ailus, Cao,Bing Bu
In-Reply-To: <20181216172339.486781e5@canb.auug.org.au>
Em Sun, 16 Dec 2018 17:23:39 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> Commit
>
> 7ab9b77a9410 ("media: staging/intel-ipu3: Add dual pipe support")
>
> is missing a Signed-off-by from its author.
The original author sent his SOB. I rebased the topic branch in order
to contain it.
Thanks for the warning!
Thanks,
Mauro
^ permalink raw reply
* linux-next: Signed-off-by missing for commit in the printk tree
From: Stephen Rothwell @ 2018-12-17 20:08 UTC (permalink / raw)
To: Petr Mladek; +Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
Hi Petr,
Commit
503283fa006d ("printk: Add caller information to printk() output.")
is missing a Signed-off-by from its committer.
Moreover, that patch appears twice in the tree (the other time properly
signed-off),
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the gpio tree with the arm-soc tree
From: Tony Lindgren @ 2018-12-17 19:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, Olof Johansson, Arnd Bergmann, ARM,
Linux Next Mailing List, Linux Kernel Mailing List,
Janusz Krzysztofik
In-Reply-To: <20181217191753.172ca200@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [181217 00:18]:
> Hi all,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> arch/arm/mach-omap1/board-ams-delta.c
>
> between commit:
>
> 19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")
>
> from the arm-soc tree and commit:
>
> 21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
>
> from the gpio tree.
>
> I fixed it up (the former removed the code updated by the latter, so
> I used that) 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.
OK thank you.
Regards,
Tony
^ permalink raw reply
* Re: [PATCH] seccomp, s390: fix build for syscall type change
From: Kees Cook @ 2018-12-17 17:54 UTC (permalink / raw)
To: Heiko Carstens, James Morris
Cc: Tycho Andersen, Martin Schwidefsky, prudo, linux-s390, LKML,
Linux-Next
In-Reply-To: <20181217124154.GA3560@osiris>
On Mon, Dec 17, 2018 at 4:42 AM Heiko Carstens
<heiko.carstens@de.ibm.com> wrote:
>
> On Thu, Dec 13, 2018 at 04:50:06PM -0800, Kees Cook wrote:
> > On Thu, Dec 13, 2018 at 12:10 PM Tycho Andersen <tycho@tycho.ws> wrote:
> > >
> > > A recent patch landed in the security tree [1] that changed the type of the
> > > seccomp syscall. Unfortunately, I didn't quite get every instance of the
> > > forward declarations, and thus there is a build failure. Here's the last
> > > one that I could find, for s390. It should go through the security tree,
> > > although hopefully some s390 people can check and make sure it looks
> > > reasonable?
> > >
> > > The only oddity is the trailing semicolon; some lines around this patch
> > > have it, and some lines don't. I've left this one as-is.
> > >
> > > [1]: https://lore.kernel.org/lkml/20181212231630.GA31584@beast/T/#u
> > >
> > > Signed-off-by: Tycho Andersen <tycho@tycho.ws>
> >
> > Thanks! Added to my -next tree.
> >
> > -Kees
>
> Hi Kees,
>
> did you forget to push your tree? At least today's linux-next kernel
> fails to compile on s390 because of this missing patch.
I sent a pull request to James for this. James, can you pick this up please?
-Kees
>
> > > arch/s390/kernel/compat_wrapper.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/arch/s390/kernel/compat_wrapper.c b/arch/s390/kernel/compat_wrapper.c
> > > index 2ce28bf0c5ec..48c4ce668244 100644
> > > --- a/arch/s390/kernel/compat_wrapper.c
> > > +++ b/arch/s390/kernel/compat_wrapper.c
> > > @@ -164,7 +164,7 @@ COMPAT_SYSCALL_WRAP3(finit_module, int, fd, const char __user *, uargs, int, fla
> > > COMPAT_SYSCALL_WRAP3(sched_setattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, flags);
> > > COMPAT_SYSCALL_WRAP4(sched_getattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, size, unsigned int, flags);
> > > COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, newdfd, const char __user *, newname, unsigned int, flags);
> > > -COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, const char __user *, uargs)
> > > +COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, void __user *, uargs)
> > > COMPAT_SYSCALL_WRAP3(getrandom, char __user *, buf, size_t, count, unsigned int, flags)
> > > COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, flags)
> > > COMPAT_SYSCALL_WRAP3(bpf, int, cmd, union bpf_attr *, attr, unsigned int, size);
>
--
Kees Cook
^ permalink raw reply
* linux-next: Add secondary kgdb tree
From: Daniel Thompson @ 2018-12-17 16:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jason Wessel,
kgdb-bugreport
Hi Stephen
Is there any change you could add my kgdb tree to the roster for
linux-next :
https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/for-next
I'm currently collecting kgdb patches for v4.21 together and at the
moment it looks like the PR for kgdb will come from my tree this dev
cycle.
This will leave you with two kgdb trees in this list which I assume
isn't great for you (although Jason's tree isn't really changing much
at the moment so I guess merging it is a nop). Anyhow I've made a diary
note to follow this up in two kernel cycles time and decide which one
we want to keep on the roster. Is that OK for you?
Daniel.
^ permalink raw reply
* Re: [-next] lots of messages due to "mm, memory_hotplug: be more verbose for memory offline failures"
From: Michal Hocko @ 2018-12-17 16:39 UTC (permalink / raw)
To: Heiko Carstens
Cc: Andrew Morton, Oscar Salvador, Anshuman Khandual,
Stephen Rothwell, linux-mm, linux-kernel, linux-next, linux-s390
In-Reply-To: <20181217160350.GV30879@dhcp22.suse.cz>
On Mon 17-12-18 17:03:50, Michal Hocko wrote:
> On Mon 17-12-18 16:59:22, Heiko Carstens wrote:
> > Hi Michal,
> >
> > with linux-next as of today on s390 I see tons of messages like
> >
> > [ 20.536664] page dumped because: has_unmovable_pages
> > [ 20.536792] page:000003d081ff4080 count:1 mapcount:0 mapping:000000008ff88600 index:0x0 compound_mapcount: 0
> > [ 20.536794] flags: 0x3fffe0000010200(slab|head)
> > [ 20.536795] raw: 03fffe0000010200 0000000000000100 0000000000000200 000000008ff88600
> > [ 20.536796] raw: 0000000000000000 0020004100000000 ffffffff00000001 0000000000000000
> > [ 20.536797] page dumped because: has_unmovable_pages
> > [ 20.536814] page:000003d0823b0000 count:1 mapcount:0 mapping:0000000000000000 index:0x0
> > [ 20.536815] flags: 0x7fffe0000000000()
> > [ 20.536817] raw: 07fffe0000000000 0000000000000100 0000000000000200 0000000000000000
> > [ 20.536818] raw: 0000000000000000 0000000000000000 ffffffff00000001 0000000000000000
> >
> > bisect points to b323c049a999 ("mm, memory_hotplug: be more verbose for memory offline failures")
> > which is the first commit with which the messages appear.
>
> I would bet this is CMA allocator. How much is tons? Maybe we want a
> rate limit or the other user is not really interested in them at all?
In other words, this should silence those messages.
diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h
index 4ae347cbc36d..4eb26d278046 100644
--- a/include/linux/page-isolation.h
+++ b/include/linux/page-isolation.h
@@ -30,8 +30,11 @@ static inline bool is_migrate_isolate(int migratetype)
}
#endif
+#define SKIP_HWPOISON 0x1
+#define REPORT_FAILURE 0x2
+
bool has_unmovable_pages(struct zone *zone, struct page *page, int count,
- int migratetype, bool skip_hwpoisoned_pages);
+ int migratetype, int flags);
void set_pageblock_migratetype(struct page *page, int migratetype);
int move_freepages_block(struct zone *zone, struct page *page,
int migratetype, int *num_movable);
@@ -44,10 +47,14 @@ int move_freepages_block(struct zone *zone, struct page *page,
* For isolating all pages in the range finally, the caller have to
* free all pages in the range. test_page_isolated() can be used for
* test it.
+ *
+ * The following flags are allowed (they can be combined in a bit mask)
+ * SKIP_HWPOISON - ignore hwpoison pages
+ * REPORT_FAILURE - report details about the failure to isolate the range
*/
int
start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
- unsigned migratetype, bool skip_hwpoisoned_pages);
+ unsigned migratetype, int flags);
/*
* Changes MIGRATE_ISOLATE to MIGRATE_MOVABLE.
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index c82193db4be6..8537429d33a6 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1226,7 +1226,7 @@ static bool is_pageblock_removable_nolock(struct page *page)
if (!zone_spans_pfn(zone, pfn))
return false;
- return !has_unmovable_pages(zone, page, 0, MIGRATE_MOVABLE, true);
+ return !has_unmovable_pages(zone, page, 0, MIGRATE_MOVABLE, SKIP_HWPOISON);
}
/* Checks if this range of memory is likely to be hot-removable. */
@@ -1577,7 +1577,8 @@ static int __ref __offline_pages(unsigned long start_pfn,
/* set above range as isolated */
ret = start_isolate_page_range(start_pfn, end_pfn,
- MIGRATE_MOVABLE, true);
+ MIGRATE_MOVABLE,
+ SKIP_HWPOISON | REPORT_FAILURE);
if (ret) {
mem_hotplug_done();
reason = "failure to isolate range";
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ec2c7916dc2d..ee4043419791 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7754,8 +7754,7 @@ void *__init alloc_large_system_hash(const char *tablename,
* race condition. So you can't expect this function should be exact.
*/
bool has_unmovable_pages(struct zone *zone, struct page *page, int count,
- int migratetype,
- bool skip_hwpoisoned_pages)
+ int migratetype, int flags)
{
unsigned long pfn, iter, found;
@@ -7818,7 +7817,7 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count,
* The HWPoisoned page may be not in buddy system, and
* page_count() is not 0.
*/
- if (skip_hwpoisoned_pages && PageHWPoison(page))
+ if ((flags & SKIP_HWPOISON) && PageHWPoison(page))
continue;
if (__PageMovable(page))
@@ -7845,7 +7844,8 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count,
return false;
unmovable:
WARN_ON_ONCE(zone_idx(zone) == ZONE_MOVABLE);
- dump_page(pfn_to_page(pfn+iter), "unmovable page");
+ if (flags & REPORT_FAILURE)
+ dump_page(pfn_to_page(pfn+iter), "unmovable page");
return true;
}
@@ -7972,8 +7972,7 @@ int alloc_contig_range(unsigned long start, unsigned long end,
*/
ret = start_isolate_page_range(pfn_max_align_down(start),
- pfn_max_align_up(end), migratetype,
- false);
+ pfn_max_align_up(end), migratetype, 0);
if (ret)
return ret;
diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 43e085608846..ce323e56b34d 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -15,8 +15,7 @@
#define CREATE_TRACE_POINTS
#include <trace/events/page_isolation.h>
-static int set_migratetype_isolate(struct page *page, int migratetype,
- bool skip_hwpoisoned_pages)
+static int set_migratetype_isolate(struct page *page, int migratetype, int isol_flags)
{
struct zone *zone;
unsigned long flags, pfn;
@@ -60,8 +59,7 @@ static int set_migratetype_isolate(struct page *page, int migratetype,
* FIXME: Now, memory hotplug doesn't call shrink_slab() by itself.
* We just check MOVABLE pages.
*/
- if (!has_unmovable_pages(zone, page, arg.pages_found, migratetype,
- skip_hwpoisoned_pages))
+ if (!has_unmovable_pages(zone, page, arg.pages_found, migratetype, flags))
ret = 0;
/*
@@ -185,7 +183,7 @@ __first_valid_page(unsigned long pfn, unsigned long nr_pages)
* prevents two threads from simultaneously working on overlapping ranges.
*/
int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
- unsigned migratetype, bool skip_hwpoisoned_pages)
+ unsigned migratetype, int flags)
{
unsigned long pfn;
unsigned long undo_pfn;
@@ -199,7 +197,7 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn,
pfn += pageblock_nr_pages) {
page = __first_valid_page(pfn, pageblock_nr_pages);
if (page &&
- set_migratetype_isolate(page, migratetype, skip_hwpoisoned_pages)) {
+ set_migratetype_isolate(page, migratetype, flags)) {
undo_pfn = pfn;
goto undo;
}
--
Michal Hocko
SUSE Labs
^ permalink raw reply related
* Re: linux-next: Tree for Dec 17 (regulator/mcp16502.c)
From: Randy Dunlap @ 2018-12-17 16:03 UTC (permalink / raw)
To: Stephen Rothwell, Linux Next Mailing List
Cc: Linux Kernel Mailing List, Andrei Stefanescu
In-Reply-To: <20181217220914.29144a09@canb.auug.org.au>
On 12/17/18 3:09 AM, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20181214:
>
on i386:
# CONFIG_SUSPEND is not set
CONFIG_PM=y
CC drivers/regulator/mcp16502.o
In file included from ../include/linux/device.h:23:0,
from ../include/linux/gpio/driver.h:5,
from ../include/asm-generic/gpio.h:13,
from ../include/linux/gpio.h:62,
from ../drivers/regulator/mcp16502.c:11:
../drivers/regulator/mcp16502.c:527:32: error: 'mcp16502_suspend_noirq' undeclared here (not in a function)
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mcp16502_suspend_noirq,
^
../include/linux/pm.h:342:19: note: in definition of macro 'SET_NOIRQ_SYSTEM_SLEEP_PM_OPS'
.suspend_noirq = suspend_fn, \
^
../drivers/regulator/mcp16502.c:528:10: error: 'mcp16502_resume_noirq' undeclared here (not in a function)
mcp16502_resume_noirq)
^
../include/linux/pm.h:343:18: note: in definition of macro 'SET_NOIRQ_SYSTEM_SLEEP_PM_OPS'
.resume_noirq = resume_fn, \
^
--
~Randy
^ permalink raw reply
* Re: [-next] lots of messages due to "mm, memory_hotplug: be more verbose for memory offline failures"
From: Michal Hocko @ 2018-12-17 16:03 UTC (permalink / raw)
To: Heiko Carstens
Cc: Andrew Morton, Oscar Salvador, Anshuman Khandual,
Stephen Rothwell, linux-mm, linux-kernel, linux-next, linux-s390
In-Reply-To: <20181217155922.GC3560@osiris>
On Mon 17-12-18 16:59:22, Heiko Carstens wrote:
> Hi Michal,
>
> with linux-next as of today on s390 I see tons of messages like
>
> [ 20.536664] page dumped because: has_unmovable_pages
> [ 20.536792] page:000003d081ff4080 count:1 mapcount:0 mapping:000000008ff88600 index:0x0 compound_mapcount: 0
> [ 20.536794] flags: 0x3fffe0000010200(slab|head)
> [ 20.536795] raw: 03fffe0000010200 0000000000000100 0000000000000200 000000008ff88600
> [ 20.536796] raw: 0000000000000000 0020004100000000 ffffffff00000001 0000000000000000
> [ 20.536797] page dumped because: has_unmovable_pages
> [ 20.536814] page:000003d0823b0000 count:1 mapcount:0 mapping:0000000000000000 index:0x0
> [ 20.536815] flags: 0x7fffe0000000000()
> [ 20.536817] raw: 07fffe0000000000 0000000000000100 0000000000000200 0000000000000000
> [ 20.536818] raw: 0000000000000000 0000000000000000 ffffffff00000001 0000000000000000
>
> bisect points to b323c049a999 ("mm, memory_hotplug: be more verbose for memory offline failures")
> which is the first commit with which the messages appear.
I would bet this is CMA allocator. How much is tons? Maybe we want a
rate limit or the other user is not really interested in them at all?
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* [-next] lots of messages due to "mm, memory_hotplug: be more verbose for memory offline failures"
From: Heiko Carstens @ 2018-12-17 15:59 UTC (permalink / raw)
To: Michal Hocko
Cc: Andrew Morton, Oscar Salvador, Anshuman Khandual,
Stephen Rothwell, linux-mm, linux-kernel, linux-next, linux-s390
Hi Michal,
with linux-next as of today on s390 I see tons of messages like
[ 20.536664] page dumped because: has_unmovable_pages
[ 20.536792] page:000003d081ff4080 count:1 mapcount:0 mapping:000000008ff88600 index:0x0 compound_mapcount: 0
[ 20.536794] flags: 0x3fffe0000010200(slab|head)
[ 20.536795] raw: 03fffe0000010200 0000000000000100 0000000000000200 000000008ff88600
[ 20.536796] raw: 0000000000000000 0020004100000000 ffffffff00000001 0000000000000000
[ 20.536797] page dumped because: has_unmovable_pages
[ 20.536814] page:000003d0823b0000 count:1 mapcount:0 mapping:0000000000000000 index:0x0
[ 20.536815] flags: 0x7fffe0000000000()
[ 20.536817] raw: 07fffe0000000000 0000000000000100 0000000000000200 0000000000000000
[ 20.536818] raw: 0000000000000000 0000000000000000 ffffffff00000001 0000000000000000
bisect points to b323c049a999 ("mm, memory_hotplug: be more verbose for memory offline failures")
which is the first commit with which the messages appear.
Note: there is _no_ memory hotplug involved when these messages appear.
I don't know if it helps, but this is the contents of /proc/zoneinfo:
Node 0, zone DMA
per-node stats
nr_inactive_anon 8
nr_active_anon 8389
nr_inactive_file 43418
nr_active_file 22655
nr_unevictable 0
nr_slab_reclaimable 8192
nr_slab_unreclaimable 11368
nr_isolated_anon 0
nr_isolated_file 0
workingset_nodes 0
workingset_refault 0
workingset_activate 0
workingset_restore 0
workingset_nodereclaim 0
nr_anon_pages 7088
nr_mapped 16328
nr_file_pages 66132
nr_dirty 0
nr_writeback 0
nr_writeback_temp 0
nr_shmem 55
nr_shmem_hugepages 0
nr_shmem_pmdmapped 0
nr_anon_transparent_hugepages 4
nr_unstable 0
nr_vmscan_write 0
nr_vmscan_immediate_reclaim 0
nr_dirtied 20723
nr_written 18227
nr_kernel_misc_reclaimable 0
pages free 519834
min 1899
low 2419
high 2939
spanned 524288
present 524288
managed 520562
protection: (0, 3988, 3988)
nr_free_pages 519834
nr_zone_inactive_anon 0
nr_zone_active_anon 0
nr_zone_inactive_file 0
nr_zone_active_file 0
nr_zone_unevictable 0
nr_zone_write_pending 0
nr_mlock 0
nr_page_table_pages 0
nr_kernel_stack 0
nr_bounce 0
nr_zspages 0
nr_free_cma 0
numa_hit 40
numa_miss 0
numa_foreign 0
numa_interleave 12
numa_local 40
numa_other 0
pagesets
cpu: 0
count: 336
high: 378
batch: 63
vm stats threshold: 40
cpu: 1
count: 60
high: 378
batch: 63
vm stats threshold: 40
cpu: 2
count: 60
high: 378
batch: 63
vm stats threshold: 40
cpu: 3
count: 0
high: 378
batch: 63
vm stats threshold: 40
cpu: 4
count: 62
high: 378
batch: 63
vm stats threshold: 40
cpu: 5
count: 0
high: 378
batch: 63
vm stats threshold: 40
cpu: 6
count: 59
high: 378
batch: 63
vm stats threshold: 40
cpu: 7
count: 0
high: 378
batch: 63
vm stats threshold: 40
node_unreclaimable: 0
start_pfn: 0
Node 0, zone Normal
pages free 912587
min 3732
low 4754
high 5776
spanned 1048576
present 1048576
managed 1022150
protection: (0, 0, 0)
nr_free_pages 912587
nr_zone_inactive_anon 8
nr_zone_active_anon 8389
nr_zone_inactive_file 43418
nr_zone_active_file 22655
nr_zone_unevictable 0
nr_zone_write_pending 0
nr_mlock 0
nr_page_table_pages 548
nr_kernel_stack 3072
nr_bounce 0
nr_zspages 0
nr_free_cma 1024
numa_hit 3115288
numa_miss 0
numa_foreign 0
numa_interleave 6865
numa_local 3115288
numa_other 0
pagesets
cpu: 0
count: 86
high: 90
batch: 15
vm stats threshold: 48
cpu: 1
count: 80
high: 90
batch: 15
vm stats threshold: 48
cpu: 2
count: 76
high: 90
batch: 15
vm stats threshold: 48
cpu: 3
count: 53
high: 90
batch: 15
vm stats threshold: 48
cpu: 4
count: 81
high: 90
batch: 15
vm stats threshold: 48
cpu: 5
count: 18
high: 90
batch: 15
vm stats threshold: 48
cpu: 6
count: 73
high: 90
batch: 15
vm stats threshold: 48
cpu: 7
count: 63
high: 90
batch: 15
vm stats threshold: 48
node_unreclaimable: 0
start_pfn: 524288
Node 0, zone Movable
pages free 0
min 0
low 0
high 0
spanned 0
present 0
managed 0
protection: (0, 0, 0)
^ permalink raw reply
* Re: linux-next: build failure after merge of the net-next tree
From: Paolo Abeni @ 2018-12-17 15:54 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking
Cc: Linux Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <20181217123645.42a20fe5@canb.auug.org.au>
Hi,
On Mon, 2018-12-17 at 12:36 +1100, Stephen Rothwell wrote:
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from net/core/dev.c:148:
> net/core/dev.c: In function 'napi_gro_complete':
> net/core/dev.c:5364:26: error: 'inet_gro_complete' undeclared (first use in this function); did you mean 'eth_gro_complete'?
> ipv6_gro_complete, inet_gro_complete,
> ^~~~~~~~~~~~~~~~~
> include/linux/indirect_call_wrapper.h:32:41: note: in definition of macro 'INDIRECT_CALL_2'
> #define INDIRECT_CALL_2(f, name, ...) f(__VA_ARGS__)
> ^~~~~~~~~~~
>
> and on ....
>
> Caused by commit
>
> aaa5d90b395a ("net: use indirect call wrappers at GRO network layer")
>
> inet_gro_complete() is declared in include/net/inet_comon.h which is
> not directly included in net/core/dev.c.
>
> I have used the net-next tree from next-20181214 for today.
My fault, I should have tested more kernel configs. This fails with
CONFIG_RETPOLINE=n
A fix has been posted here:
https://marc.info/?l=linux-netdev&m=154504685327698&w=2
Thanks,
Paolo
^ permalink raw reply
* Re: linux-next: build failure after merge of the nfs-anna tree
From: Anna Schumaker @ 2018-12-17 15:34 UTC (permalink / raw)
To: Rasmus Villemoes, Stephen Rothwell, Trond Myklebust,
NFS Mailing List
Cc: Linux Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <809c5ec8-0763-6855-bbbc-3cb95e168278@rasmusvillemoes.dk>
On Mon, 2018-12-17 at 12:18 +0100, Rasmus Villemoes wrote:
> On 17/12/2018 00.16, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the nfs-anna tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > /home/sfr/next/next/fs/nfs/nfsroot.c: In function 'root_nfs_data':
> > /home/sfr/next/next/fs/nfs/nfsroot.c:264:5: error: implicit declaration of
> > function 'fmtcheck'; did you mean 'dst_check'? [-Werror=implicit-function-
> > declaration]
> > fmtcheck(tmp, "%s", 0), utsname()->nodename);
> > ^~~~~~~~
> > dst_check
> >
> > Caused by commit
> >
> > 66ab6f062d96 ("nfs: use fmtcheck() in root_nfs_data")
>
> I didn't know anybody had picked that one up. It's completely safe to
> just ignore that commit until the fmtcheck() utility is actually in.
>
> Anna, can I take the fact that this was picked up as a sort-of implicit
> ack, that I can use if and when I ever get around to resending the
> fmtcheck() series? And for simplicitly, would you mind if the nfs patch
> would just be routed along with the patches introducing fmtcheck()?
Sure that sounds good. I'll remove it from my tree for now.
>
> Rasmus
>
>
^ permalink raw reply
* Re: [PATCH v3 7/9] arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO
From: Horia Geanta @ 2018-12-17 15:33 UTC (permalink / raw)
To: Stefan Wahren, Olof Johansson
Cc: arm-soc, LKML, Linux ARM, Marc Gonzalez,
linux-next@vger.kernel.org, Stephen Rothwell
In-Reply-To: <1541367377.58314.1544910265605@email.ionos.de>
On 12/15/2018 11:44 PM, Stefan Wahren wrote:
> Hi,
>
>> Olof Johansson <olof@lixom.net> hat am 13. Dezember 2018 um 07:48 geschrieben:
>>
>>
>> On Fri, Nov 09, 2018 at 06:05:24AM +0000, Horia Geanta wrote:
>>> On 11/9/2018 3:11 AM, Marc Gonzalez wrote:
>>>> Commit e8342cc7954e ("enable CAAM crypto engine on QorIQ DPAA2 SoCs")
>>>> enabled CRYPTO_DEV_FSL_DPAA2_CAAM, which depends on FSL_MC_DPIO,
>>>> which is not set. Enable FSL_MC_BUS, and build FSL_MC_DPIO and
>>>> CRYPTO_DEV_FSL_DPAA2_CAAM as modules.
>>>>
>>>> Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr>
>>> Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
>>
>> I had to redo this one, and when I did I noticed that there's also an ethernet
>> driver. Should that be enabled as well?
>>
>
> this patch in next-20181214 breaks "make modules_install" for arm64/defconfig on my Ubuntu machine:
>
> DEPMOD 4.20.0-rc6-next-20181214
> depmod: ERROR: Found 6 modules in dependency cycles!
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> authenc
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> fsl_mc_dpio
> depmod: ERROR: Cycle detected: dpaa2_caam -> caamhash_desc -> dpaa2_caam
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> error
> depmod: ERROR: Cycle detected: caamalg_desc -> dpaa2_caam -> caamhash_desc -> caamalg_desc
>
> After reverting of this patch the issue disappeared.
>
Seems there's a dependency cycle b/w dpaa2_caam and caam{alg,hash}_desc, as follows:
A->B
---
dpaa2_caam needs cnstr_* exported by caam{alg,hash}_desc
B->A
---
caam{alg,hash}_desc need caam_imx, caam_little_end:
caam{hash,alg}_desc.c
--> desc_constr.h (included for descriptors generation functions)
--> regs.h (included for endianness helpers)
--> extern bool caam_imx, caam_little_end
caam_imx, caam_little_end are exported by dpaa2_caam - caamalg_qi2.c (when
CONFIG_CRYPTO_DEV_FSL_CAAM=n)
Could we drop this patch, until CAAM driver gets a proper fix (which is not
straightforward)?
Thanks,
Horia
^ permalink raw reply
* Re: linux-next: Signed-off-by missing for commit in the nfs-anna tree
From: Chris Perl @ 2018-12-17 13:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Anna Schumaker, Trond Myklebust, NFS Mailing List,
Linux Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <20181216171933.2e4f5be6@canb.auug.org.au>
On Sun, Dec 16, 2018 at 1:19 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> Commit
>
> 748d6fd8d297 ("NFS: nfs_compare_mount_options always compare auth flavors.")
>
> is missing a Signed-off-by from its author.
Whoops. Sorry about that (I forgot to run it through checkpatch.pl).
Should I resend a fresh patch with the Signed-off-by included or is it
enough to just assert in this email that I wrote it and have the right
to pass it on? If the latter is sufficient, then I do assert those
things. If not, I'm happy to resend.
^ permalink raw reply
* [-next] strace tests fail because of "y2038: socket: Add compat_sys_recvmmsg_time64"
From: Heiko Carstens @ 2018-12-17 13:06 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel, linux-s390, Martin Schwidefsky
Hi Arnd,
in linux-next as of today 16 strace self tests fail on s390. I could
bisect this to b136972b063b ("y2038: socket: Add compat_sys_recvmmsg_time64").
The following tests fail:
mmsg.gen.test
clock.gen.test
regex.gen.test
sched.gen.test
trace_fstatfs.gen.test
trace_personality_regex_64.gen.test
trace_fstat.gen.test
trace_personality_32.gen.test
trace_question.gen.test
trace_personality_regex_32.gen.test
trace_personality_64.gen.test
trace_stat.gen.test
trace_statfs.gen.test
trace_lstat.gen.test
trace_stat_like.gen.test
trace_statfs_like.gen.test
If needed the s390 kernel config can be re-created with
make ARCH=s390 performance_defconfig
strace self tests can be reproduced with
> git clone https://gitlab.com/strace/strace.git
> cd strace
> ./bootstrap
> ./configure
> make
> cd tests
> make check
^ permalink raw reply
* Re: linux-next: build failure after merge of the y2038 tree
From: Arnd Bergmann @ 2018-12-17 12:49 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Steve French, linux-cifs, Linux-Next Mailing List,
Linux Kernel Mailing List, palcantara, Aurelien Aptel, stfrench
In-Reply-To: <20181217201146.170ca9b4@canb.auug.org.au>
On Mon, Dec 17, 2018 at 10:11 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> I have applied the following merge fix patch (better versions welcome):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 17 Dec 2018 20:03:28 +1100
> Subject: [PATCH] cifs: update for current_kernel_time64() removal
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
Your patch looks correct, and the conflict should be easy to
resolve by Steve merging this into his tree, as
ktime_get_coarse_real_ts64() is readily available in mainline
kernels.
Acked-by: Arnd Bergmann <arnd@arndb.de>
> fs/cifs/dfs_cache.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c
> index 70f9c9e2175c..d20cc94d7abd 100644
> --- a/fs/cifs/dfs_cache.c
> +++ b/fs/cifs/dfs_cache.c
> @@ -103,7 +103,7 @@ static inline bool cache_entry_expired(const struct dfs_cache_entry *ce)
> {
> struct timespec64 ts;
>
> - ts = current_kernel_time64();
> + ktime_get_coarse_real_ts64(&ts);
> return timespec64_compare(&ts, &ce->ce_etime) >= 0;
> }
>
> @@ -338,8 +338,10 @@ static inline struct timespec64 get_expire_time(int ttl)
> .tv_sec = ttl,
> .tv_nsec = 0,
> };
> + struct timespec64 now;
>
> - return timespec64_add(current_kernel_time64(), ts);
> + ktime_get_coarse_real_ts64(&now);
> + return timespec64_add(now, ts);
> }
In case efficiency is a concern: using ktime_t with
ktime_get_coarse_real() may be much faster if we decide to
abandon the coarse-grained timespec64 accessors in the future.
Also, I wonder if the expiration here has to use CLOCK_REALTIME,
since that is affected by leap second adjustment and
clock_settime().
In other modules, we usually concluded that it should be either
CLOCK_MONOTONIC or CLOCK_BOOTTIME, depending on whether
you want the expiration timer to keep ticking during suspend.
Arnd
^ permalink raw reply
* Re: [PATCH] seccomp, s390: fix build for syscall type change
From: Heiko Carstens @ 2018-12-17 12:41 UTC (permalink / raw)
To: Kees Cook
Cc: Tycho Andersen, Martin Schwidefsky, prudo, linux-s390, LKML,
linux-next
In-Reply-To: <CAGXu5jLY16CjNZZ0QvkyaKep-qD8kEVZEnTQ7JqfozqAm=so_Q@mail.gmail.com>
On Thu, Dec 13, 2018 at 04:50:06PM -0800, Kees Cook wrote:
> On Thu, Dec 13, 2018 at 12:10 PM Tycho Andersen <tycho@tycho.ws> wrote:
> >
> > A recent patch landed in the security tree [1] that changed the type of the
> > seccomp syscall. Unfortunately, I didn't quite get every instance of the
> > forward declarations, and thus there is a build failure. Here's the last
> > one that I could find, for s390. It should go through the security tree,
> > although hopefully some s390 people can check and make sure it looks
> > reasonable?
> >
> > The only oddity is the trailing semicolon; some lines around this patch
> > have it, and some lines don't. I've left this one as-is.
> >
> > [1]: https://lore.kernel.org/lkml/20181212231630.GA31584@beast/T/#u
> >
> > Signed-off-by: Tycho Andersen <tycho@tycho.ws>
>
> Thanks! Added to my -next tree.
>
> -Kees
Hi Kees,
did you forget to push your tree? At least today's linux-next kernel
fails to compile on s390 because of this missing patch.
> > arch/s390/kernel/compat_wrapper.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/s390/kernel/compat_wrapper.c b/arch/s390/kernel/compat_wrapper.c
> > index 2ce28bf0c5ec..48c4ce668244 100644
> > --- a/arch/s390/kernel/compat_wrapper.c
> > +++ b/arch/s390/kernel/compat_wrapper.c
> > @@ -164,7 +164,7 @@ COMPAT_SYSCALL_WRAP3(finit_module, int, fd, const char __user *, uargs, int, fla
> > COMPAT_SYSCALL_WRAP3(sched_setattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, flags);
> > COMPAT_SYSCALL_WRAP4(sched_getattr, pid_t, pid, struct sched_attr __user *, attr, unsigned int, size, unsigned int, flags);
> > COMPAT_SYSCALL_WRAP5(renameat2, int, olddfd, const char __user *, oldname, int, newdfd, const char __user *, newname, unsigned int, flags);
> > -COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, const char __user *, uargs)
> > +COMPAT_SYSCALL_WRAP3(seccomp, unsigned int, op, unsigned int, flags, void __user *, uargs)
> > COMPAT_SYSCALL_WRAP3(getrandom, char __user *, buf, size_t, count, unsigned int, flags)
> > COMPAT_SYSCALL_WRAP2(memfd_create, const char __user *, uname, unsigned int, flags)
> > COMPAT_SYSCALL_WRAP3(bpf, int, cmd, union bpf_attr *, attr, unsigned int, size);
^ permalink raw reply
* Re: linux-next: build failure after merge of the nfs-anna tree
From: Rasmus Villemoes @ 2018-12-17 11:18 UTC (permalink / raw)
To: Stephen Rothwell, Anna Schumaker, Trond Myklebust,
NFS Mailing List
Cc: Linux Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <20181217101630.292dd55e@canb.auug.org.au>
On 17/12/2018 00.16, Stephen Rothwell wrote:
> Hi all,
>
> After merging the nfs-anna tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> /home/sfr/next/next/fs/nfs/nfsroot.c: In function 'root_nfs_data':
> /home/sfr/next/next/fs/nfs/nfsroot.c:264:5: error: implicit declaration of function 'fmtcheck'; did you mean 'dst_check'? [-Werror=implicit-function-declaration]
> fmtcheck(tmp, "%s", 0), utsname()->nodename);
> ^~~~~~~~
> dst_check
>
> Caused by commit
>
> 66ab6f062d96 ("nfs: use fmtcheck() in root_nfs_data")
I didn't know anybody had picked that one up. It's completely safe to
just ignore that commit until the fmtcheck() utility is actually in.
Anna, can I take the fact that this was picked up as a sort-of implicit
ack, that I can use if and when I ever get around to resending the
fmtcheck() series? And for simplicitly, would you mind if the nfs patch
would just be routed along with the patches introducing fmtcheck()?
Rasmus
^ permalink raw reply
* linux-next: Tree for Dec 17
From: Stephen Rothwell @ 2018-12-17 11:09 UTC (permalink / raw)
To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 37983 bytes --]
Hi all,
Changes since 20181214:
New trees: hyperv-fixes, hyperv, auxdisplay
The nfs-anna tree gained a build failure for which I reverted a commit.
The hwmon-staging tree gained a build failure for which I applied a
merge fix patch.
The thermal tree gained a conflict against the kbuild tree.
The rdma tree still had its build failure so I used a supplied patch.
It also gained a conflict against the net tree.
The net-next tree gained conflicts against the net tree and a build
failure, so I used the version from next-20181214.
The mfd tree gained a build failure so I used the version from
next-20181214.
The kvm tree gained a conflict against the tip tree.
The gpio tree gained a conflict against the arm-soc tree and a build
failure so I used the version from next-20181214.
The y2038 tree gained a build failure for which I applied a merge fix.
Non-merge commits (relative to Linus' tree): 9215
9687 files changed, 458827 insertions(+), 248116 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, an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), I do an x86_64 modules_install followed by
builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit),
ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc
and sparc64 defconfig. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).
Below is a summary of the state of the merge.
I am currently merging 291 trees (counting Linus' and 69 trees of bug
fix patches pending for the current merge release).
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 (6531e115b7ab Merge branch 'akpm' (patches from Andrew))
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
Merging arc-current/for-curr (4c567a448b30 ARC: perf: remove useless ifdefs)
Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return)
Merging arm64-fixes/for-next/fixes (3238c359acee arm64: dma-mapping: Fix FORCE_CONTIGUOUS buffer clearing)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (a225f1567405 powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call)
Merging sparc/master (cf76c364a1e1 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (8203e2d844d3 net: clear skb->tstamp in forwarding paths)
Merging bpf/master (8203e2d844d3 net: clear skb->tstamp in forwarding paths)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on acquire)
Merging netfilter/master (9e69efd45321 Merge branch 'vhost-fixes')
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
Merging wireless-drivers/master (cddfb283af7e mt76: add entry in MAINTAINERS file)
Merging mac80211/master (312ca38ddda6 cfg80211: Fix busy loop regression in ieee80211_ie_split_ric())
Merging rdma-fixes/for-rc (37fbd834b4e4 IB/core: Fix oops in netdev_next_upper_dev_rcu())
Merging sound-current/for-linus (0bea4cc83835 ALSA: hda/realtek: Enable audio jacks of ASUS UX433FN/UX333FA with ALC294)
Merging sound-asoc-fixes/for-linus (9683863aecfe Merge branch 'asoc-4.20' into asoc-linus)
Merging regmap-fixes/for-linus (40e020c129cf Linux 4.20-rc6)
Merging regulator-fixes/for-linus (a64f26313b02 Merge branch 'regulator-4.20' into regulator-linus)
Merging spi-fixes/for-linus (6594150c7db6 Merge branch 'spi-4.20' into spi-linus)
Merging pci-current/for-linus (1063a5148ac9 PCI/AER: Queue one GHES event, not several uninitialized ones)
Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5)
Merging tty.current/tty-linus (40e020c129cf Linux 4.20-rc6)
Merging usb.current/usb-linus (45f750c16cae xhci: Don't prevent USB2 bus suspend in state check intended for USB3 only)
Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used)
Merging usb-serial-fixes/usb-linus (28a86092b175 USB: serial: option: add Telit LN940 series)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845)
Merging staging.current/staging-linus (40e020c129cf Linux 4.20-rc6)
Merging char-misc.current/char-misc-linus (55449af1a17a Merge tag 'hyperv-fixes-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux into char-misc-linus)
Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging thunderbolt-fixes/fixes (40e020c129cf Linux 4.20-rc6)
Merging input-current/for-linus (ca5047286c9c Input: synaptics - enable RMI on ThinkPad T560)
Merging crypto-current/master (e61efff4ae94 crypto: user - Disable statistics interface)
Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons)
Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1)
Merging kselftest-fixes/fixes (2bd61abead58 selftests/seccomp: Remove SIGSTOP si_pid check)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (ffe843b18211 dmaengine: dw: Fix FIFO size for Intel Merrifield)
Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
Merging mtd-fixes/master (40b412897ccb mtd: nand: Fix memory allocation in nanddev_bbt_init())
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data")
Merging v4l-dvb-fixes/fixes (078ab3ea2c3b media: Add a Kconfig option for the Request API)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (e8e8d449b9e6 MIPS: BCM63XX: fix switch core reset on BCM6368)
Merging at91-fixes/at91-fixes (4ab7ca092c3c ARM: dts: at91: sama5d2: use the divided clock for SMC)
Merging omap-fixes/fixes (84fb6c7feb14 ARM: dts: Fix OMAP4430 SDP Ethernet startup)
Merging kvm-fixes/master (fd65d3142f73 kvm: svm: Ensure an IBPB on all affected CPUs when freeing a vmcb)
Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
Merging hwmon-fixes/hwmon (2595646791c3 Linux 4.20-rc5)
Merging nvdimm-fixes/libnvdimm-fixes (2c5357c6a2f2 Merge branch 'for-4.20/dax-fixes' into libnvdimm-pending)
Merging btrfs-fixes/next-fixes (72549bc085d6 Merge branch 'misc-4.20' into next-fixes)
Merging vfs-fixes/fixes (ea5751ccd665 proc/sysctl: don't return ENOMEM on lookup when a table is unregistering)
Merging dma-mapping-fixes/for-linus (cb216b84d6ea swiotlb: Skip cache maintenance on map error)
Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1)
Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging samsung-krzk-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1)
Merging devicetree-fixes/dt/linus (89c38422e072 of, numa: Validate some distance map rules)
Merging scsi-fixes/fixes (61cce6f6eece scsi: sd: use mempool for discard special page)
Merging drm-fixes/drm-fixes (1df07a7f2244 Merge branch 'vmwgfx-fixes-4.20' of git://people.freedesktop.org/~thomash/linux into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (5b2e31201c26 drm/i915: Flush GPU relocs harder for gen3)
Merging mmc-fixes/fixes (b704441e38f6 mmc: sdhci: fix the timeout check window for clock and reset)
Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write)
Merging gnss-fixes/gnss-linus (40e020c129cf Linux 4.20-rc6)
Merging hyperv-fixes/hyperv-fixes (fc96df16a1ce Drivers: hv: vmbus: Return -EINVAL for the sys files for unopened channels)
Merging drm-misc-fixes/for-linux-next-fixes (63238173b2fa Revert "drm/rockchip: Allow driver to be shutdown on reboot/kexec")
Merging kbuild/for-next (d411ff4a93d5 Merge branches 'kbuild', 'kbuild2', 'kconfig' and 'kconfig2' into for-next)
Merging compiler-attributes/compiler-attributes (71391bdd2e9a include/linux/compiler_types.h: don't pollute userspace with macro definitions)
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging dma-mapping/for-next (664204410afb PCI: Remove unused attr variable in pci_dma_configure)
CONFLICT (content): Merge conflict in arch/alpha/Kconfig
Merging asm-generic/master (b7d624ab4312 asm-generic: unistd.h: fixup broken macro include.)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (eb1644e1ec8a Merge branches 'fixes', 'misc', 'sa1100-for-next' and 'spectre' into for-next)
Merging arm64/for-next/core (12f799c8c739 arm64: kaslr: print PHYS_OFFSET in dump_kernel_offset())
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpu_errata.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
CONFLICT (content): Merge conflict in Documentation/arm64/silicon-errata.txt
Merging arm-perf/for-next/perf (69c32972d593 drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver)
Merging arm-soc/for-next (de7cfed01ee4 ARM: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/Kconfig
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (00a067cad396 Merge branch 'v4.21/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (f59cffb441bc Merge branch 'dt-for-v4.21' into for-next)
Merging at91/at91-next (d3d7c4c30eb2 Merge branches 'at91-soc' and 'at91-dt' into at91-next)
Merging bcm2835/for-next (3c9d403d2fe1 Merge branch 'bcm2835-drivers-next' into for-next)
Merging imx-mxs/for-next (467e1ec42943 Merge branch 'imx8mq/dt' into for-next)
Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next)
Merging mediatek/for-next (c2f7a6c7e1e5 Merge branch 'v4.20-next/soc' into for-next)
Merging mvebu/for-next (50eba438c55e Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (ace233293086 Merge branch 'omap-for-v4.21/dt' into for-next)
Merging reset/reset/next (8a1b9fd55f25 reset: uniphier-glue: Add AHCI reset control support in glue layer)
CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/socfpga.c
Merging qcom/for-next (9bf0624f555d Merge tag 'qcom-drivers-for-4.21-2' into foobar-for-4.21-2)
Merging renesas/next (7d60a8a48880 Merge branches 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'drivers-for-v4.21', 'soc-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21', 'arm64-dt-for-v4.21' and 'arm64-defconfig-for-v4.21' into next)
Merging rockchip/for-next (70e6e2983473 dt-bindings: arm: Convert Rockchip board/soc bindings to json-schema)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (2b911667eeaa Merge branch 'next/dt64' into for-next)
Merging sunxi/sunxi/for-next (ef9c186f08d7 Merge branch 'sunxi/dt-for-4.21' into sunxi/for-next)
Merging tegra/for-next (2731820ce27b Merge branch for-4.21/clk into for-next)
Merging clk/clk-next (b677574bdf29 Merge branch 'clk-imx7ulp' into clk-next)
Merging clk-samsung/for-next (651022382c7f Linux 4.20-rc1)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (252050365823 dt-bindings: timer: gx6605s SOC timer)
Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no)
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
Merging m68k/for-next (005e13a96c0e m68k: Generate uapi header and syscall table header files)
Merging m68knommu/for-next (40e020c129cf Linux 4.20-rc6)
Merging microblaze/next (19d111ccce9f microblaze: remove the explicit removal of system.dtb)
Merging mips/mips-next (ff4dd232ec45 MIPS: Expand MIPS32 ASIDs to 64 bits)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging nds32/next (e2f3f8b4a497 nds32: support hardware prefetcher)
Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE)
Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops)
Merging parisc-hd/for-next (930e12992ed3 parisc: syscalls: ignore nfsservctl for other architectures)
Merging powerpc/next (7c91efce1608 powerpc/mm: dump block address translation on book3s/32)
Merging fsl/next (b6ae3550c8e2 powerpc/8xx: add missing header in 8xx_mmu.c)
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging risc-v/for-next (7ac3574ad42f automerging branch "kernel.org-palmer-linux/next-tracepoints" into "for-next")
CONFLICT (modify/delete): Documentation/features/io/sg-chain/arch-support.txt deleted in HEAD and modified in risc-v/for-next. Version risc-v/for-next of Documentation/features/io/sg-chain/arch-support.txt left in tree.
$ git rm -f Documentation/features/io/sg-chain/arch-support.txt
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (ec10574d00da Merge tag 'vfio-ccw-20181213' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features)
Merging sparc-next/master (c23b8e7acea3 ALSA: sparc: Use of_node_name_eq for node name comparisons)
CONFLICT (content): Merge conflict in arch/sparc/kernel/ioport.c
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (917e2fd2c53e um: Make line/tty semantics use true write IRQ)
Merging xtensa/xtensa-for-next (cf991521b736 Merge branch 'xtensa-cleanups' into xtensa-for-next)
Merging fscrypt/master (cc0146d0bce0 fscrypt: remove CRYPTO_CTR dependency)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (36d8cb6a9999 Merge branch 'for-next-next-v4.20-20181213' into for-next-20181213)
Merging ceph/master (6f9718fe41c3 ceph: make 'nocopyfrom' a default mount option)
Merging cifs/for-next (f6fe32b5127c cifs: Only free DFS target list if we actually got one)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
Merging ext3/for_next (8bda6f7815a9 Pull fix for UDF BUG due to corrupted inode.)
Merging ext4/dev (7d3485c5e875 ext4: avoid declaring fs inconsistent due to invalid file handles)
Merging f2fs/dev (ac3c962cc168 f2fs: clear PG_writeback if IPU failed)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging fuse/for-next (2e64ff154ce6 fuse: continue to send FUSE_RELEASEDIR when FUSE_OPEN returns ENOSYS)
Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES)
Merging nfs/linux-next (8795358eb42d sunrpc: Be sure to clear XPRT_WRITE_SPACE when resetting the transport)
Merging nfs-anna/linux-next (dd6114493d8d SUNRPC discard cr_uid from struct rpc_cred.)
Merging nfsd/nfsd-next (19f25957be17 nfsd: keep a tally of RECLAIM_COMPLETE operations when using nfsdcld)
Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0)
Merging overlayfs/overlayfs-next (ec7ba118b940 Revert "ovl: relax permission checking on underlying layers")
Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes correctly while recovery)
CONFLICT (content): Merge conflict in fs/ubifs/Kconfig
Merging v9fs/9p-next (7373bc7654c1 9p/net: put a lower bound on msize)
Merging xfs/for-next (8f67b5adc030 iomap: partially revert 4721a601099 (simulated directio short read on EFAULT))
Merging file-locks/locks-next (7bbd1fc0e9f1 fs/locks: remove unnecessary white space.)
Merging vfs/for-next (d708e87ca399 Merge branch 'work.mount' into for-next)
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in fs/proc/inode.c
CONFLICT (content): Merge conflict in fs/f2fs/super.c
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
CONFLICT (content): Merge conflict in fs/Makefile
CONFLICT (content): Merge conflict in drivers/vfio/Kconfig
CONFLICT (content): Merge conflict in drivers/infiniband/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/kernel/setup_64.c
Merging printk/for-next (9adcfaffc34d printk: Make printk_emit() local function.)
Merging pci/next (7053eeb009e0 Merge branch 'remotes/lorenzo/pci/mediatek')
Merging pstore/for-next/pstore (8665569e97dd pstore/ram: Avoid NULL deref in ftrace merging failure path)
Merging hid/for-next (11478e44de6f Merge branch 'for-4.21/highres-wheel' into for-next)
Merging i2c/i2c/for-next (f30d04f33cc7 Merge branch 'i2c/for-current' into i2c/for-next)
Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in Cadence I3C master driver)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (4f96b0b37e0c hwmon: (ftsteutates) Use permission specific SENSOR[_DEVICE]_ATTR variants)
Applying: hwmon: quote the path in Kconfig source statements
Applying: Revert "nfs: use fmtcheck() in root_nfs_data"
Merging jc_docs/docs-next (f77af637f29d doc:process: add links where missing)
CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst
Merging v4l-dvb/master (d2b4387f3bdf media: platform: Add Aspeed Video Engine driver)
Applying: media: ddbridge: Move asm includes after linux ones
Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry)
Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s)
Merging pm/linux-next (22683a4c1a6e Merge branches 'pm-cpufreq' and 'pm-opp' into linux-next)
Merging cpupower/cpupower (901d32bc69f3 cpupower : Auto-completion for cpupower tool)
Merging opp/opp/linux-next (ade0c9493e97 Merge branch 'opp/genpd/propagation' into opp/linux-next)
Merging thermal/next (eaaa598c0a28 Merge branches 'for-rc' and 'thermal-core' into next)
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
Applying: drivers: thermal: fixup for Kconfig string parsing tightening up
Merging thermal-soc/next (760eea43f8c6 thermal: da9062/61: Prevent hardware access during system suspend)
Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency)
Merging dlm/next (3595c559326d dlm: fix invalid cluster name warning)
Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal)
Merging rdma/for-next (9af3f5cf9d64 RDMA/core: Validate port number in query_pkey verb)
CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h
Applying: RDMA/mlx5: Delete unreachable handle_atomic code by simplifying SW completion
Merging net-next/master (ae6750e0a5ef Merge branch 'mlxsw-spectrum_acl-Add-Bloom-filter-support')
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c
CONFLICT (content): Merge conflict in net/ipv6/ip6_output.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
CONFLICT (content): Merge conflict in drivers/crypto/chelsio/chtls/chtls_cm.c
CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/inst.h
CONFLICT (content): Merge conflict in MAINTAINERS
$ git reset --hard HEAD^
Merging next-20181214 version of net-next
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c
CONFLICT (content): Merge conflict in net/ipv6/ip6_output.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
CONFLICT (content): Merge conflict in drivers/crypto/chelsio/chtls/chtls_cm.c
CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/inst.h
CONFLICT (content): Merge conflict in MAINTAINERS
[master c306d86c71c5] next-20181214/net-next
Merging bpf-next/master (034565da0fe6 Merge branch 'bpf-bpftool-cleanups')
Merging ipsec-next/master (77990464bb39 xfrm: clean an indentation issue, remove a space)
Merging mlx5-next/mlx5-next (4c283e615598 net/mlx5: Fold the modify lag code into function)
Merging netfilter-next/master (00ec3ab06012 netfilter: ipset: replace a strncpy() with strscpy())
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
Merging wireless-drivers-next/master (30ed3c6c0922 Merge tag 'iwlwifi-next-for-kalle-2018-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (addb0679839a Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next)
Merging mac80211-next/master (f6c7f03f69f7 mac80211: fix deauth TX when we disconnect)
Merging gfs2/for-next (27a2660f1ef9 gfs2: Dump nrpages for inodes and their glocks)
Merging mtd/mtd/next (7677ea0e8843 MAINTAINERS: Update my email address)
Merging nand/nand/next (cafb56dd741e mtd: rawnand: marvell: prevent timeouts on a loaded machine)
Merging spi-nor/spi-nor/next (b422847877e3 mtd: spi-nor: Add support for is25lp016d)
Merging crypto/master (00c9fe37a7f2 crypto: adiantum - fix leaking reference to hash algorithm)
Merging drm/drm-next (272c1a9b4939 Merge tag 'exynos-drm-next-for-v4.21-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/meson/meson_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merging drm-intel/for-linux-next (cb6f4c2c3478 Merge tag 'gvt-next-2018-12-07' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
Merging drm-tegra/drm/tegra/for-next (180b46ecdc9f drm/tegra: sor: Reset the SOR if possible)
Merging drm-misc/for-linux-next (0b258ed1a219 drm: revert "expand replace_fence to support timeline point v2")
Merging drm-msm/msm-next (ba0ede185ef4 drm/msm/dpu: Fix clock issue after bind failure)
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers)
Merging imx-drm/imx-drm/next (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status)
Merging etnaviv/etnaviv/next (dea492e0cfcb drm/etnaviv: remove lastctx member from gpu struct)
CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_drv.c
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (51a29ded00da Merge remote-tracking branch 'regmap/topic/irq' into regmap-next)
Merging sound/for-next (40906ebe3af6 ALSA: hda: add mute LED support for HP EliteBook 840 G4)
Merging sound-asoc/for-next (ba26f635bf72 Merge branch 'asoc-4.21' into asoc-next)
Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2)
Merging input/next (0832e93632c6 Input: rotary-encoder - don't log EPROBE_DEFER to kernel log)
Merging block/for-next (757bd94dad07 Merge branch 'for-4.21/block' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
Merging device-mapper/for-next (7bdbba78481e Merge branch 'dm-4.20' into dm-next)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (de149e85e2ac mmc: sdhci-omap: Workaround errata regarding SDR104/HS200 tuning failures (i929))
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
Merging md/for-next (cac09f066f0f md: remvoe redundant condition check)
Merging mfd/for-mfd-next (05ba643fa2ce mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe())
$ git reset --hard HEAD^
Merging next-20181214 version of mfd
Merging backlight/for-backlight-next (3cee7a7d05b1 backlight: 88pm860x_bl: Use of_node_name_eq for node name comparisons)
Merging battery/for-next (fb4d49448026 power: supply: gpio-charger: Do not use deprecated POWER_SUPPLY_TYPE_USB_*)
Merging regulator/for-next (f55ce893b979 Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next)
Merging security/next-testing (088f908006c5 Merge branch 'next-smack' into next-testing)
Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute)
Merging integrity/next-integrity (eed9de3b4f47 ima: Use inode_is_open_for_write)
Merging selinux/next (ee1a84fdfeed selinux: overhaul sidtab to fix bug and improve performance)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging tpmdd/next (8f82ffbc5b0b tpm: add support for partial reads)
Merging watchdog/master (31eb42bd9353 watchdog: w83627hf_wdt: Add quirk for Inves system)
Merging iommu/next (30045592fe54 Merge branches 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (9422f5871d5d vfio/mdev: add static modifier to add_mdev_supported_type)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (d406db524c32 audit: remove duplicated include from audit.c)
Merging devicetree/for-next (acc2038738bd Merge branch 'yaml-bindings-for-v4.21' into dt/next)
Merging mailbox/mailbox-for-next (e2affdbef2ac mailbox: bcm2835: Switch to SPDX identifier)
Merging spi/for-next (b72514463f44 Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next)
Merging tip/auto-latest (f56a4affd145 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in net/bridge/br_multicast.c
CONFLICT (content): Merge conflict in net/bridge/br_mdb.c
CONFLICT (content): Merge conflict in drivers/hwmon/k10temp.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging clockevents/clockevents/next (ded414ebcd58 clocksource/drivers/fttmr010: Fix invalid interrupt register access)
Merging edac-amd/for-next (bd4473541822 EDAC, i5000: Remove set but not used local variables)
Merging irqchip/irq/irqchip-next (893b0aff9a7a irqchip/irq-imx-gpcv2: Silence "fall through" warning)
Merging ftrace/for-next (dbc3f042fbc8 selftests/ftrace: Add testcases for dynamic event)
Merging rcu/rcu/next (06aa5694f870 Merge LKMM and RCU commits)
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/runlitmushist.sh
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/parseargs.sh
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/newlitmushist.sh
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/judgelitmus.sh
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/initlitmushist.sh
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/checklitmushist.sh
CONFLICT (add/add): Merge conflict in tools/memory-model/scripts/checkghlitmus.sh
Merging kvm/linux-next (5132411985e1 kvm: selftests: ucall: improve ucall placement in memory, fix unsigned comparison)
CONFLICT (modify/delete): arch/x86/kvm/vmx.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of arch/x86/kvm/vmx.c left in tree.
$ git rm -f arch/x86/kvm/vmx.c
Applying: update to "x86: Fix various typos in comments"
Merging kvm-arm/next (e4e11cc0f81e KVM: arm64: Safety check PSTATE when entering guest and handle IL)
Merging kvm-ppc/kvm-ppc-next (651022382c7f Linux 4.20-rc1)
Merging kvms390/next (ed3054a30258 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext)
Merging xen-tip/linux-next (716ff017a39e KVM: x86: Allow Qemu/KVM to use PVH entry point)
Merging percpu/for-next (ad19ef010db1 Merge branch 'for-4.19-fixes' into for-next)
Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing)
Merging drivers-x86/for-next (fb7255a92311 platform/x86: mlx-platform: Convert to use SPDX identifier)
Merging chrome-platform/for-next (2a70a4cda0da MAINTAINERS: platform/chrome: Add Enric as a maintainer)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro)
Merging leds/for-next (8146aace60c7 led: triggers: Initialize LED_INIT_DEFAULT_TRIGGER if trigger is brought after class)
Merging ipmi/for-next (5e6ddecfc90b ipmi:ssif: Change some pr_xxx to dev_xxx calls)
Merging driver-core/driver-core-next (df44b479654f kobject: return error code if writing /sys/.../uevent fails)
CONFLICT (content): Merge conflict in drivers/base/platform.c
Merging usb/usb-next (eaf3074e0a8c usb: renesas_usbhs: mark PM functions as __maybe_unused)
Merging usb-gadget/next (4fe4f9fecc36 usb: dwc2: Fix disable all EP's on disconnect)
Merging usb-serial/usb-next (01688a6d66b5 USB: serial: mos7840: remove set but not used variables 'number, serial')
Merging usb-chipidea-next/ci-for-usb-next (59739131e0ca usb: chipidea: Fix otg event handler)
Merging phy-next/next (2e38c2e7026a phy: qcom-qmp: Expose provided clocks to DT)
Merging tty/tty-next (9c96f401e91a Merge 4.20-rc6 into tty-next)
Merging char-misc/char-misc-next (2701e804f00f Merge tag 'extcon-next-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging extcon/extcon-next (a2dc50914744 extcon: max8997: Fix lack of path setting in USB device mode)
Merging soundwire/next (b1635596860d soundwire: intel: constify snd_soc_dai_ops structures)
Merging thunderbolt/next (dcc3c9e37fbd thunderbolt: Export IOMMU based DMA protection support to userspace)
Merging staging/staging-next (c6cbcdea7ab9 Merge tag 'iio-for-4.21b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/vboxvideo/vbox_ttm.c
CONFLICT (content): Merge conflict in drivers/staging/media/tegra-vde/tegra-vde.c
Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (f8325633fbae MAINTAINERS: add a maintainer for the interconnect API)
Merging slave-dma/next (8fc4a3d104a3 Merge branch 'topic/fsl' into next)
Merging cgroup/for-next (87f902fab430 Merge branch 'for-4.21' into for-next)
Merging scsi/for-next (dd94e7f59f63 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (6c8d5f051251 scsi: ufs: Fix platform_no_drv_owner.cocci warnings)
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging vhost/linux-next (37d1246af2d5 virtio_net: bulk free tx skbs)
Merging rpmsg/for-next (9099a252d44c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (589b5bd78cdc Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/board-ams-delta.c
$ git reset --hard HEAD^
Merging next-20181214 version of gpio
Merging pinctrl/for-next (a0d2f28f58d3 Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1)
Merging pwm/for-next (46275577b86a pwm: bcm2835: Switch to SPDX identifier)
Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static)
Merging kselftest/next (6edf2e3710f4 fix dma-buf/udmabuf selftest)
Merging y2038/y2038 (ccea641b6742 timekeeping: remove obsolete time accessors)
Applying: cifs: update for current_kernel_time64() removal
Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (7ff8957175d6 coresight: Use of_node_name_eq for node name comparisons)
Merging rtc/rtc-next (fc979933bcf1 rtc: pcf85363: Add support for NXP pcf85263 rtc)
Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests)
Merging at24/at24/for-next (37cf28d3b5bc eeprom: at24: add support for 24c2048)
Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=4G memory windows)
Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/arm-stackprotector' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging gnss/gnss-next (2595646791c3 Linux 4.20-rc5)
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (39a577fe6163 slimbus: ngd: fix spelling mistake "exeeds" -> "exceeds")
Merging nvmem/for-next (5035d66cc629 nvmem: meson-efuse: add peripheral clock)
CONFLICT (content): Merge conflict in include/linux/nvmem-provider.h
Merging xarray/xarray (48483614de97 XArray: Fix xa_alloc when id exceeds max)
Merging hyperv/hyperv-next (651022382c7f Linux 4.20-rc1)
Merging auxdisplay/auxdisplay (40e020c129cf Linux 4.20-rc6)
Merging akpm-current/current (78d626e0374e ipc: conserve sequence numbers in extended IPCMNI mode)
CONFLICT (content): Merge conflict in mm/page_io.c
CONFLICT (content): Merge conflict in arch/arm64/mm/proc.S
CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/memory.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable
Applying: mm: treewide: remove unused address argument from pte_alloc functions
Applying: mm: speed up mremap by 20x on large regions
Applying: mm/mremap: fix 'move_normal_pmd' unused function warning
Applying: mm: select HAVE_MOVE_PMD on x86 for faster mremap
Applying: kernel/async.c: remove some duplicated includes
Applying: kernel/signal.c: remove some duplicated includes
Applying: locking/atomics: build atomic headers as required
Applying: mm: balloon: update comment about isolation/migration/compaction
Applying: mm: convert PG_balloon to PG_offline
Applying: mm-convert-pg_balloon-to-pg_offline-fix
Applying: kexec: export PG_offline to VMCOREINFO
Applying: xen/balloon: mark inflated pages PG_offline
Applying: hv_balloon: mark inflated pages PG_offline
Applying: vmw_balloon: mark inflated pages PG_offline
Applying: vmw_balloon-mark-inflated-pages-pg_offline-v2
Applying: PM/Hibernate: use pfn_to_online_page()
Applying: PM/Hibernate: exclude all PageOffline() pages
Applying: pm-hibernate-exclude-all-pageoffline-pages-v2
Applying: kernel/locking/mutex.c: remove caller signal_pending branch predictions
Applying: kernel/sched/: remove caller signal_pending branch predictions
Applying: arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
Applying: mm/: remove caller signal_pending branch predictions
Applying: fs/: remove caller signal_pending branch predictions
Applying: fs-remove-caller-signal_pending-branch-predictions-fix
Applying: include/linux/sched/signal.h: replace `tsk' with `task'
Applying: fs: don't open code lru_to_page()
Applying: drivers/base/platform.c: kmemleak ignore a known leak
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (53cb0e56f828 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Eric Dumazet @ 2018-12-17 10:12 UTC (permalink / raw)
To: Ido Schimmel; +Cc: Stephen Rothwell, David Miller, netdev, linux-next, LKML
In-Reply-To: <20181217100314.GA12765@splinter>
On Mon, Dec 17, 2018 at 2:03 AM Ido Schimmel <idosch@mellanox.com> wrote:
>
> On Mon, Dec 17, 2018 at 11:31:06AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > net/ipv6/ip6_output.c
> >
> > between commit:
> >
> > 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
> >
> > from the net tree and commit:
> >
> > f839a6c92504 ("net: Do not route unicast IP packets twice")
> >
> > from the net-next tree.
> >
> > I fixed it up (I was not quite sure of the correct ordering - 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.
>
> Looks good to me. Eric?
>
> Thank you!
Yes, SGTM, thanks.
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Ido Schimmel @ 2018-12-17 10:03 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux Next Mailing List,
Linux Kernel Mailing List, Eric Dumazet
In-Reply-To: <20181217113106.32d98f30@canb.auug.org.au>
On Mon, Dec 17, 2018 at 11:31:06AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv6/ip6_output.c
>
> between commit:
>
> 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths")
>
> from the net tree and commit:
>
> f839a6c92504 ("net: Do not route unicast IP packets twice")
>
> from the net-next tree.
>
> I fixed it up (I was not quite sure of the correct ordering - 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.
Looks good to me. Eric?
Thank you!
^ permalink raw reply
* linux-next: build failure after merge of the y2038 tree
From: Stephen Rothwell @ 2018-12-17 9:11 UTC (permalink / raw)
To: Arnd Bergmann, Steve French, CIFS
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Paulo Alcantara, Aurelien Aptel, Steve French
[-- Attachment #1: Type: text/plain, Size: 2820 bytes --]
Hi Arnd,
After merging the y2038 tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/cifs/dfs_cache.c: In function 'cache_entry_expired':
fs/cifs/dfs_cache.c:106:7: error: implicit declaration of function 'current_kernel_time64'; did you mean 'core_kernel_text'? [-Werror=implicit-function-declaration]
ts = current_kernel_time64();
^~~~~~~~~~~~~~~~~~~~~
core_kernel_text
fs/cifs/dfs_cache.c:106:5: error: incompatible types when assigning to type 'struct timespec64' from type 'int'
ts = current_kernel_time64();
^
fs/cifs/dfs_cache.c: In function 'get_expire_time':
fs/cifs/dfs_cache.c:342:24: error: incompatible type for argument 1 of 'timespec64_add'
return timespec64_add(current_kernel_time64(), ts);
^~~~~~~~~~~~~~~~~~~~~~~
In file included from include/linux/restart_block.h:10,
from include/linux/thread_info.h:13,
from arch/x86/include/asm/preempt.h:7,
from include/linux/preempt.h:78,
from include/linux/rcupdate.h:40,
from fs/cifs/dfs_cache.c:8:
include/linux/time64.h:66:66: note: expected 'struct timespec64' but argument is of type 'int'
static inline struct timespec64 timespec64_add(struct timespec64 lhs,
~~~~~~~~~~~~~~~~~~^~~
fs/cifs/dfs_cache.c:343:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
Caused by commit
ccea641b6742 ("timekeeping: remove obsolete time accessors")
interacting with commit
34a44fb160f9 ("cifs: Add DFS cache routines")
from the cifs tree.
I have applied the following merge fix patch (better versions welcome):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Dec 2018 20:03:28 +1100
Subject: [PATCH] cifs: update for current_kernel_time64() removal
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/cifs/dfs_cache.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/cifs/dfs_cache.c b/fs/cifs/dfs_cache.c
index 70f9c9e2175c..d20cc94d7abd 100644
--- a/fs/cifs/dfs_cache.c
+++ b/fs/cifs/dfs_cache.c
@@ -103,7 +103,7 @@ static inline bool cache_entry_expired(const struct dfs_cache_entry *ce)
{
struct timespec64 ts;
- ts = current_kernel_time64();
+ ktime_get_coarse_real_ts64(&ts);
return timespec64_compare(&ts, &ce->ce_etime) >= 0;
}
@@ -338,8 +338,10 @@ static inline struct timespec64 get_expire_time(int ttl)
.tv_sec = ttl,
.tv_nsec = 0,
};
+ struct timespec64 now;
- return timespec64_add(current_kernel_time64(), ts);
+ ktime_get_coarse_real_ts64(&now);
+ return timespec64_add(now, ts);
}
/* Allocate a new DFS target */
--
2.19.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related
* linux-next: build failure after merge of the gpio tree
From: Stephen Rothwell @ 2018-12-17 8:24 UTC (permalink / raw)
To: Linus Walleij; +Cc: Linux Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 475 bytes --]
Hi all,
After merging the gpio tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/memory/omap-gpmc.c: In function 'gpmc_probe_generic_child':
drivers/memory/omap-gpmc.c:2174:9: error: type of formal parameter 4 is incomplete
0);
^
Caused by commit
21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
I have used the gpio tree from next-20181214 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* linux-next: manual merge of the gpio tree with the arm-soc tree
From: Stephen Rothwell @ 2018-12-17 8:17 UTC (permalink / raw)
To: Linus Walleij, Olof Johansson, Arnd Bergmann, ARM
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Janusz Krzysztofik, Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
Hi all,
Today's linux-next merge of the gpio tree got a conflict in:
arch/arm/mach-omap1/board-ams-delta.c
between commit:
19a2668a8ae3 ("ARM: OMAP1: ams-delta: Provide GPIO lookup table for LED device")
from the arm-soc tree and commit:
21abf103818a ("gpio: Pass a flag to gpiochip_request_own_desc()")
from the gpio tree.
I fixed it up (the former removed the code updated by the latter, so
I used that) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the mfd tree
From: Stephen Rothwell @ 2018-12-17 5:38 UTC (permalink / raw)
To: Lee Jones
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Keerthy,
Sebastian Reichel
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
Hi all,
After merging the mfd tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/mfd/tps65218.c: In function 'tps65218_probe':
drivers/mfd/tps65218.c:247:3: error: label 'err_irq' used but not defined
goto err_irq;
^~~~
Caused by commit
05ba643fa2ce ("mfd: tps65218: Use devm_regmap_add_irq_chip and clean up error path in probe()")
I have used the mfd tree from next-20181214 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ 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