* Re: linux-next: Tree for Mar 14 (mips qemu failure bisected)
From: Qais Yousef @ 2016-03-16 22:17 UTC (permalink / raw)
To: Guenter Roeck
Cc: Stephen Rothwell, linux-next, linux-kernel, Ralf Baechle,
linux-mips
In-Reply-To: <56E9C1CA.7050208@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2134 bytes --]
On 16/03/2016 20:27, Qais Yousef wrote:
>
>
> On 16/03/2016 13:22, Guenter Roeck wrote:
>> On Tue, Mar 15, 2016 at 05:17:13PM -0700, Guenter Roeck wrote:
>>> On Tue, Mar 15, 2016 at 09:55:06PM +0000, Qais Yousef wrote:
>>>> Hi Guenter,
>>>>
>> [ ... ]
>>>>>> Qemu test results:
>>>>>> total: 96 pass: 69 fail: 27
>>>>>> Failed tests:
>>>>> [ ... ]
>>>>>> mips:mips_malta_smp_defconfig
>>>>> I bisected this failure to commit bb11cff327e54 ("MIPS: Make smp
>>>>> CMP, CPS and MT
>>>>> use the new generic IPI functions". Bisect log is attached.
>>>> Thanks for bisecting this. I tested this on a real Malta system but
>>>> not
>>>> qemu. I'll try to reproduce.
>>>>
>>> I run the tests with only a single CPU core enabled. Maybe that causes
>>> problems with your code ?
>>>
>> I ran another qemu test (this time on mainline) with "-smp 2", but
>> the only
>> difference is that the image now gets stuck even earlier.
>>
>> Also, I ran another set of bisects, this time with both mips and mips64
>> on mainline (after your patch landed), with the same results.
>>
>> Guenter
>>
>
> OK thanks for the info. The offending commit just enables using quite
> a few of the newly added code before that. So the problem could be in
> any of the newly added code.
>
> Unfortunately I can only look at this during my limited time in the
> evening and I have to setup my system to compile and run this, so I
> won't be able to get to the bottom of this as fast as I'd like to.
>
> Qais
OK I was up and running faster than I thought I would be. Can you
confirm that you're hitting a BUG_ON() in mips_smp_ipi_init()?
What I see is that BUG_ON() is hit because we couldn't find an ipidomain
to allocate the ipis from. The reason of whih is that the qemu malta
machine doesn't have a GIC though the config is compiled with GIC on.
Also if I remember correctly qemu malta doesn't really support SMP. I
think that was the reason I never ran this on qemu.
I'm not sure what's the best way forward here. I can add a check to
verify gic_present inside this function and return early. Patch attached.
Ralf, thoughts?
Thanks,
Qais
[-- Attachment #2: 0001-MIPS-Fix-broken-malta-qemu.patch --]
[-- Type: text/plain, Size: 1409 bytes --]
>From fca2323ade4dd67e5fed6933a32e6739d3707ff7 Mon Sep 17 00:00:00 2001
From: Qais Yousef <qsyousef@gmail.com>
Date: Wed, 16 Mar 2016 21:55:04 +0000
Subject: [PATCH] MIPS: Fix broken malta qemu
Malta defconfig compile with GIC on. Hence when compiling for SMP it causes the
new IPI code to be activated. But on qemu malta there's no GIC causing a
BUG_ON(!ipidomain) to be hit in mips_smp_ipi_init().
Introduce an extra check that gic_preset is true and skip initialising IPIs if
it's not.
Signed-off-by: Qais Yousef <qsyousef@gmail.com>
---
arch/mips/kernel/smp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 37708d9..972f64d 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -33,6 +33,7 @@
#include <linux/cpu.h>
#include <linux/err.h>
#include <linux/ftrace.h>
+#include <linux/irqchip/mips-gic.h>
#include <linux/irqdomain.h>
#include <linux/of.h>
#include <linux/of_irq.h>
@@ -243,6 +244,13 @@ static int __init mips_smp_ipi_init(void)
struct irq_domain *ipidomain;
struct device_node *node;
+ /*
+ * If the config says GIC is present, but the harware doesn't actually
+ * have it we could get stuffed, so double check that GIC is present
+ */
+ if (WARN_ON(!gic_present))
+ return 0;
+
node = of_irq_find_parent(of_root);
ipidomain = irq_find_matching_host(node, DOMAIN_BUS_IPI);
--
1.9.1
^ permalink raw reply related
* RE: linux-next: build failure after merge of the rdma tree
From: Ismail, Mustafa @ 2016-03-16 22:14 UTC (permalink / raw)
To: Doug Ledford, Herbert Xu, Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Latif, Faisal
In-Reply-To: <56E9ADD2.2050500@redhat.com>
Faisal is out until 3/18. We will make the changes and send a patch shortly.
Thanks Herbert for the pointers. Regards.
-----Original Message-----
From: linux-next-owner@vger.kernel.org [mailto:linux-next-owner@vger.kernel.org] On Behalf Of Doug Ledford
Sent: Wednesday, March 16, 2016 2:03 PM
To: Herbert Xu <herbert@gondor.apana.org.au>; Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Latif, Faisal <faisal.latif@intel.com>
Subject: Re: linux-next: build failure after merge of the rdma tree
On 3/16/2016 2:49 AM, Herbert Xu wrote:
> On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote:
>> Hi Doug,
>>
>> After merging the rdma tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
>> from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
>> drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
>> u32 length, u32 value);
>> ^
>>
>> And it went downhill badly after that.
>>
>> Caused by commit
>>
>> 896545098777 ("crypto: hash - Remove crypto_hash interface")
>>
>> from the crypto tree interacting with commits
>>
>> 786c6adb3a94 ("i40iw: add puda code")
>> 4e9042e647ff ("i40iw: add hw and utils files")
>>
>> (at least) from the rdma tree.
>>
>> Its a bit of a pain finding these conflicts now - it would have been
>> better a few weeks ago.
>>
>> For now, all I can do is to use the rdma tree from next-20160315 for
>> today.
>>
>> Herbert, any hints for Doug, Faisal?
>
> crypto_hash is obsolete. You should be using shash if your input is
> completely linear or ahash if you need SG lists. For an example of
> how you can do the conversion, have a look at
>
> commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6
> Author: Herbert Xu <herbert@gondor.apana.org.au>
> Date: Sun Jan 24 21:19:52 2016 +0800
>
> iscsi-target: Use shash and ahash
>
> Cheers,
>
Pending an update from Intel on the i40iw driver, I have pulled it from my for-next area. This should not be a problem with tonight's merge.
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Andrew Lunn @ 2016-03-16 21:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Torvalds, Doug Ledford, David Miller, Network Development,
linux-next, Linux Kernel Mailing List, Amir Vadai, Maor Gottlieb
In-Reply-To: <20160317075246.39a08e61@canb.auug.org.au>
Hi Stephen
> How about "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 want also want to
Only the second want is required.
> consider cooperate with the maintainer of the conflicting tree to
cooperating
Andrew
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Linus Torvalds @ 2016-03-16 21:01 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Doug Ledford, David Miller, Network Development, linux-next,
Linux Kernel Mailing List, Amir Vadai, Maor Gottlieb
In-Reply-To: <20160317075246.39a08e61@canb.auug.org.au>
On Wed, Mar 16, 2016 at 1:52 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> How about "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 want also want to
> consider cooperate with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts."
Yup, sounds fine.
Maybe you could even say "don't merge this to hide the problem",
because that has been another reaction in the past, but the above
already sounds pretty good.
Linus
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Stephen Rothwell @ 2016-03-16 20:52 UTC (permalink / raw)
To: Linus Torvalds
Cc: Doug Ledford, David Miller, Network Development, linux-next,
Linux Kernel Mailing List, Amir Vadai, Maor Gottlieb
In-Reply-To: <CA+55aFzhYJxCOXER-mhOfJ6=V13Rb5F0LB_3A9n7S_dLkb8f0g@mail.gmail.com>
Hi Linus,
On Wed, 16 Mar 2016 10:18:33 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> On Tue, Mar 15, 2016 at 5:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Side note: can you change this wording for your manual merge script?
> Last merge window (or was it the one before it?) we had confusion with
> people who thought that "no action is required" means "you can just
> ignore this entirely".
>
> I want people who have known merge issues to at the very least
> *mention* them to me when they send the pull request, and I also think
> that trees that have merge conflicts that aren't just totally trivial
> should also make sure that they have communicated with each other
> about why the problem happened.
>
> This is *particularly* true for the complete effing disaster that is
> mellanox and rdma-vs-networking.
>
> So please don't say "no action is required". Please make it clear that
> there may not be any further action needed for linux-next itself, but
> that other action may certainly be required.
Yeah, I can see your point. The "no action required" was a reaction to
people going off and rebasing their tree or dropping patches at any
sign of a conflict at all.
How about "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 want also want to
consider cooperate with the maintainer of the conflicting tree to
minimise any particularly complex conflicts."
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2016-03-16 20:41 UTC (permalink / raw)
To: Doug Ledford; +Cc: Herbert Xu, linux-next, linux-kernel, Faisal Latif
In-Reply-To: <56E9ADD2.2050500@redhat.com>
Hi Doug,
On Wed, 16 Mar 2016 15:02:42 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> Pending an update from Intel on the i40iw driver, I have pulled it from
> my for-next area. This should not be a problem with tonight's merge.
Thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for Mar 14 (mips qemu failure bisected)
From: Qais Yousef @ 2016-03-16 20:27 UTC (permalink / raw)
To: Guenter Roeck
Cc: Stephen Rothwell, linux-next, linux-kernel, Ralf Baechle,
linux-mips
In-Reply-To: <20160316132210.GA21918@roeck-us.net>
On 16/03/2016 13:22, Guenter Roeck wrote:
> On Tue, Mar 15, 2016 at 05:17:13PM -0700, Guenter Roeck wrote:
>> On Tue, Mar 15, 2016 at 09:55:06PM +0000, Qais Yousef wrote:
>>> Hi Guenter,
>>>
> [ ... ]
>>>>> Qemu test results:
>>>>> total: 96 pass: 69 fail: 27
>>>>> Failed tests:
>>>> [ ... ]
>>>>> mips:mips_malta_smp_defconfig
>>>> I bisected this failure to commit bb11cff327e54 ("MIPS: Make smp CMP, CPS and MT
>>>> use the new generic IPI functions". Bisect log is attached.
>>> Thanks for bisecting this. I tested this on a real Malta system but not
>>> qemu. I'll try to reproduce.
>>>
>> I run the tests with only a single CPU core enabled. Maybe that causes
>> problems with your code ?
>>
> I ran another qemu test (this time on mainline) with "-smp 2", but the only
> difference is that the image now gets stuck even earlier.
>
> Also, I ran another set of bisects, this time with both mips and mips64
> on mainline (after your patch landed), with the same results.
>
> Guenter
>
OK thanks for the info. The offending commit just enables using quite a
few of the newly added code before that. So the problem could be in any
of the newly added code.
Unfortunately I can only look at this during my limited time in the
evening and I have to setup my system to compile and run this, so I
won't be able to get to the bottom of this as fast as I'd like to.
Qais
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Doug Ledford @ 2016-03-16 19:02 UTC (permalink / raw)
To: Herbert Xu, Stephen Rothwell; +Cc: linux-next, linux-kernel, Faisal Latif
In-Reply-To: <20160316064953.GA28157@gondor.apana.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 1675 bytes --]
On 3/16/2016 2:49 AM, Herbert Xu wrote:
> On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote:
>> Hi Doug,
>>
>> After merging the rdma tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
>> from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
>> drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
>> u32 length, u32 value);
>> ^
>>
>> And it went downhill badly after that.
>>
>> Caused by commit
>>
>> 896545098777 ("crypto: hash - Remove crypto_hash interface")
>>
>> from the crypto tree interacting with commits
>>
>> 786c6adb3a94 ("i40iw: add puda code")
>> 4e9042e647ff ("i40iw: add hw and utils files")
>>
>> (at least) from the rdma tree.
>>
>> Its a bit of a pain finding these conflicts now - it would have been
>> better a few weeks ago.
>>
>> For now, all I can do is to use the rdma tree from next-20160315 for
>> today.
>>
>> Herbert, any hints for Doug, Faisal?
>
> crypto_hash is obsolete. You should be using shash if your input
> is completely linear or ahash if you need SG lists. For an example
> of how you can do the conversion, have a look at
>
> commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6
> Author: Herbert Xu <herbert@gondor.apana.org.au>
> Date: Sun Jan 24 21:19:52 2016 +0800
>
> iscsi-target: Use shash and ahash
>
> Cheers,
>
Pending an update from Intel on the i40iw driver, I have pulled it from
my for-next area. This should not be a problem with tonight's merge.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Linus Torvalds @ 2016-03-16 17:44 UTC (permalink / raw)
To: Doug Ledford
Cc: Stephen Rothwell, David Miller, Network Development, linux-next,
Linux Kernel Mailing List, Amir Vadai, Maor Gottlieb
In-Reply-To: <56E99960.5000604@redhat.com>
On Wed, Mar 16, 2016 at 10:35 AM, Doug Ledford <dledford@redhat.com> wrote:
> On 3/16/2016 1:18 PM, Linus Torvalds wrote:
>> On Tue, Mar 15, 2016 at 5:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> I fixed it up (see below) and can carry the fix as necessary (no action
>>> is required).
>>
>> Side note: can you change this wording for your manual merge script?
>> Last merge window (or was it the one before it?) we had confusion with
>> people who thought that "no action is required" means "you can just
>> ignore this entirely".
>
> I certainly didn't take it that way regardless of the wording.
It was Or Gerlitz. You were cc'd, since it was the whole rdma Mellanox
mess. I quote from that thread:
"> However, the fact that it got resolved in linux-next is purely
> informational. It doesn't "fix" the conflict - it just means that both
> sides should have gotten informed about it. That doesn't mean that the
> conflict goes away or becomes better.
That's news to me. When such things happen and caught by Stephen, we
are getting an email saying something like
"Today's linux-next merge of the infiniband tree got a conflict
between commit X from net-next tree and commit Y from the infiniband
tree. I fixed it up (see below) and can carry the fix as necessary (no
action is required)."
Also asked around a bit and got to learn on Stephen using git rerere,
so all (no action needed note + seeing git rerere in action...) that
leaded me to think that indeed no action is required from our side,
but after reading your email (twice, so far), I realized that this was
wrong conclusion."
So that whole "no action is required" wording very much has caused
confusion before in the rdma camp.
Let's fix the wording. I'm indeed hopeful that the rdma camp is now
keenly aware of the issues, but that doesn't change the fact that the
wording has been problematic.
Linus
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Doug Ledford @ 2016-03-16 17:35 UTC (permalink / raw)
To: Linus Torvalds, Stephen Rothwell
Cc: David Miller, Network Development, linux-next,
Linux Kernel Mailing List, Amir Vadai, Maor Gottlieb
In-Reply-To: <CA+55aFzhYJxCOXER-mhOfJ6=V13Rb5F0LB_3A9n7S_dLkb8f0g@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 953 bytes --]
On 3/16/2016 1:18 PM, Linus Torvalds wrote:
> On Tue, Mar 15, 2016 at 5:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Side note: can you change this wording for your manual merge script?
> Last merge window (or was it the one before it?) we had confusion with
> people who thought that "no action is required" means "you can just
> ignore this entirely".
I certainly didn't take it that way regardless of the wording. I'm
keenly aware of the short leash you have Mellanox (and by extension
myself) on. I reviewed the merge in detail, enough to satisfy myself
that it was easy, correct, and that the code itself made the merge
obvious (such as the comment that flow table entries need to be last in
the lists in order to support priority transitions, which fairly handily
explained what needed to happen in the merge).
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Linus Torvalds @ 2016-03-16 17:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Doug Ledford, David Miller, Network Development, linux-next,
Linux Kernel Mailing List, Amir Vadai, Maor Gottlieb
In-Reply-To: <20160316115809.61b4478e@canb.auug.org.au>
On Tue, Mar 15, 2016 at 5:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Side note: can you change this wording for your manual merge script?
Last merge window (or was it the one before it?) we had confusion with
people who thought that "no action is required" means "you can just
ignore this entirely".
I want people who have known merge issues to at the very least
*mention* them to me when they send the pull request, and I also think
that trees that have merge conflicts that aren't just totally trivial
should also make sure that they have communicated with each other
about why the problem happened.
This is *particularly* true for the complete effing disaster that is
mellanox and rdma-vs-networking.
So please don't say "no action is required". Please make it clear that
there may not be any further action needed for linux-next itself, but
that other action may certainly be required.
Because I'm very close to not taking any rdma changes that touch
networking any more. Ever.
The Mellanox people are on my shit-list until they show that they can
actually act like responsible people and not just monkeys throwing
shit at the walls.
"No action required" is simply not true for Mellanox.
Linus
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the net-next tree
From: Maor Gottlieb @ 2016-03-16 14:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Doug Ledford, David Miller, netdev, linux-next, linux-kernel,
Amir Vadai, Maor Gottlieb
In-Reply-To: <20160316115809.61b4478e@canb.auug.org.au>
2016-03-16 2:58 GMT+02:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
>
> between commit:
>
> 60ab4584f5bf ("net/mlx5_core: Set flow steering dest only for forward rules")
>
> from the net-next tree and commit:
>
> b3638e1a7664 ("net/mlx5_core: Introduce forward to next priority action")
>
> from the rdma tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
> index e848d708d2b7,bf3446794bd5..000000000000
> --- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
> @@@ -73,10 -73,13 +73,13 @@@
> #define BY_PASS_MIN_LEVEL (KENREL_MIN_LEVEL + MLX5_BY_PASS_NUM_PRIOS +\
> LEFTOVERS_MAX_FT)
>
> -#define KERNEL_MAX_FT 2
> -#define KERNEL_NUM_PRIOS 1
> +#define KERNEL_MAX_FT 3
> +#define KERNEL_NUM_PRIOS 2
> #define KENREL_MIN_LEVEL 2
>
> + #define ANCHOR_MAX_FT 1
> + #define ANCHOR_NUM_PRIOS 1
> + #define ANCHOR_MIN_LEVEL (BY_PASS_MIN_LEVEL + 1)
> struct node_caps {
> size_t arr_sz;
> long *caps;
> @@@ -360,8 -367,13 +367,13 @@@ static void del_rule(struct fs_node *no
> memcpy(match_value, fte->val, sizeof(fte->val));
> fs_get_obj(ft, fg->node.parent);
> list_del(&rule->node.list);
> + if (rule->sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {
> + mutex_lock(&rule->dest_attr.ft->lock);
> + list_del(&rule->next_ft);
> + mutex_unlock(&rule->dest_attr.ft->lock);
> + }
> - fte->dests_size--;
> - if (fte->dests_size) {
> + if ((fte->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
> + --fte->dests_size) {
> err = mlx5_cmd_update_fte(dev, ft,
> fg->id, fte);
> if (err)
> @@@ -762,9 -835,9 +835,10 @@@ static struct mlx5_flow_rule *alloc_rul
> if (!rule)
> return NULL;
>
> + INIT_LIST_HEAD(&rule->next_ft);
> rule->node.type = FS_TYPE_FLOW_DEST;
> - memcpy(&rule->dest_attr, dest, sizeof(*dest));
> + if (dest)
> + memcpy(&rule->dest_attr, dest, sizeof(*dest));
>
> return rule;
> }
> @@@ -783,12 -856,16 +857,17 @@@ static struct mlx5_flow_rule *add_rule_
> return ERR_PTR(-ENOMEM);
>
> fs_get_obj(ft, fg->node.parent);
> - /* Add dest to dests list- added as first element after the head */
> + /* Add dest to dests list- we need flow tables to be in the
> + * end of the list for forward to next prio rules.
> + */
> tree_init_node(&rule->node, 1, del_rule);
> - list_add_tail(&rule->node.list, &fte->node.children);
> + if (dest && dest->type != MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE)
> + list_add(&rule->node.list, &fte->node.children);
> + else
> + list_add_tail(&rule->node.list, &fte->node.children);
> - fte->dests_size++;
> - if (fte->dests_size == 1)
> + if (dest)
> + fte->dests_size++;
> + if (fte->dests_size == 1 || !dest)
> err = mlx5_cmd_create_fte(get_dev(&ft->node),
> ft, fg->id, fte);
> else
Hi Stephen,
I reveiwed your merge and it's fine.
Thanks,
Maor
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Benjamin LaHaise @ 2016-03-16 14:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linuxppc-dev, Andy Shevchenko, Stephen Rothwell,
linux-kernel@vger.kernel.org, linux-next, Christoph Hellwig,
Al Viro, Sudip Mukherjee
In-Reply-To: <4892345.flKnDo9XDS@wuerfel>
On Wed, Mar 16, 2016 at 02:59:38PM +0100, Arnd Bergmann wrote:
> On Wednesday 16 March 2016 13:12:36 Andy Shevchenko wrote:
> >
> > > I've also sent a patch that fixes the link error on ARM and that should
> > > work on all other architectures too.
> >
> > In case of avr32 signalfd_read() fails. Does your patch help with it as well?
> >
> > P.S. Bisecting shows same culprit: 150a0b4905f1 ("aio: add support for
> > async openat()")
>
> I don't know. What is the symptom on avr32? My patch only removes the
> get_user() instances on 64-bit values and replaces them with a
> single copy_from_user() call.
Which is the wrong fix. Arch code should be able to handle 64 bit values
in all the get/put_user() variants. We use 64 bit variables all over the
place in interfaces to userspace.
-ben
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Arnd Bergmann @ 2016-03-16 13:59 UTC (permalink / raw)
To: linuxppc-dev
Cc: Andy Shevchenko, Stephen Rothwell, linux-kernel@vger.kernel.org,
Benjamin LaHaise, linux-next, Christoph Hellwig, Al Viro,
Sudip Mukherjee
In-Reply-To: <CAHp75VcxkBTSKY_bVg3jaUPUtcyxKZ14sbu=uJK403xRmTYbbQ@mail.gmail.com>
On Wednesday 16 March 2016 13:12:36 Andy Shevchenko wrote:
>
> > I've also sent a patch that fixes the link error on ARM and that should
> > work on all other architectures too.
>
> In case of avr32 signalfd_read() fails. Does your patch help with it as well?
>
> P.S. Bisecting shows same culprit: 150a0b4905f1 ("aio: add support for
> async openat()")
I don't know. What is the symptom on avr32? My patch only removes the
get_user() instances on 64-bit values and replaces them with a
single copy_from_user() call.
Arnd
^ permalink raw reply
* Re: linux-next: Tree for Mar 14 (mips qemu failure bisected)
From: Guenter Roeck @ 2016-03-16 13:22 UTC (permalink / raw)
To: Qais Yousef
Cc: Stephen Rothwell, linux-next, linux-kernel, Ralf Baechle,
linux-mips
In-Reply-To: <20160316001713.GA4412@roeck-us.net>
On Tue, Mar 15, 2016 at 05:17:13PM -0700, Guenter Roeck wrote:
> On Tue, Mar 15, 2016 at 09:55:06PM +0000, Qais Yousef wrote:
> > Hi Guenter,
> >
[ ... ]
> > >
> > >>Qemu test results:
> > >> total: 96 pass: 69 fail: 27
> > >>Failed tests:
> > >[ ... ]
> > >> mips:mips_malta_smp_defconfig
> > >I bisected this failure to commit bb11cff327e54 ("MIPS: Make smp CMP, CPS and MT
> > >use the new generic IPI functions". Bisect log is attached.
> >
> > Thanks for bisecting this. I tested this on a real Malta system but not
> > qemu. I'll try to reproduce.
> >
> I run the tests with only a single CPU core enabled. Maybe that causes
> problems with your code ?
>
I ran another qemu test (this time on mainline) with "-smp 2", but the only
difference is that the image now gets stuck even earlier.
Also, I ran another set of bisects, this time with both mips and mips64
on mainline (after your patch landed), with the same results.
Guenter
> > Can I get qemu run script and the instructions to use it from somewhere?
> >
> Clone https://github.com/groeck/linux-build-test.git.
> Look in rootfs/*mips* for qemu scripts and root file systems.
> The SMP tests all fail, so it should not matter which one you pick.
> I use my own version of qemu, but for mips standard qemu 2.5.0 should
> work fine (I don't have any mips specific changes in my version).
>
> Hope this helps,
> Guenter
>
> > Thanks,
> > Qais
> >
> > >
> > >> mips64:smp:mips_malta64_defconfig
> > >> mips:mipsel_malta_smp_defconfig
> > >> mips:mipsel_malta64_smp_defconfig
> > >If necessary I can repeat the bisect for those. Please let me know.
> > >
> > >Thanks,
> > >Guenter
> > >
> > >---
> > >Bisect log:
> > >
> > ># bad: [4342eec3c5a2402ca5de3d6e56f541fe1c5171e2] Add linux-next specific files for 20160314
> > ># good: [f6cede5b49e822ebc41a099fe41ab4989f64e2cb] Linux 4.5-rc7
> > >git bisect start 'HEAD' 'v4.5-rc7'
> > ># good: [0525c3e26ec2c43cd509433be3be25210a0154ef] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
> > >git bisect good 0525c3e26ec2c43cd509433be3be25210a0154ef
> > ># bad: [385128a1b49762c1b9515c9f6294aeebbc55b956] Merge remote-tracking branch 'usb-chipidea-next/ci-for-usb-next'
> > >git bisect bad 385128a1b49762c1b9515c9f6294aeebbc55b956
> > ># good: [dfdb27baab4fc45c9399a991270413d0fb1c694a] Merge remote-tracking branch 'spi/for-next'
> > >git bisect good dfdb27baab4fc45c9399a991270413d0fb1c694a
> > ># bad: [e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565] Merge branch 'timers/nohz'
> > >git bisect bad e368d7d2a0dce6d6795ead1fc8a09bcca8a4a565
> > ># good: [ced30bc9129777d715057d06fc8dbdfd3b81e94d] Merge tag 'perf-core-for-mingo-20160310' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
> > >git bisect good ced30bc9129777d715057d06fc8dbdfd3b81e94d
> > ># bad: [656a61d4d9cbb8dfc2d007281190b2eccebad522] manual merge of mm/pkeys
> > >git bisect bad 656a61d4d9cbb8dfc2d007281190b2eccebad522
> > ># good: [16f7379f2da43f29d9faa2f474745e2705a3f510] Merge branch 'efi/core'
> > >git bisect good 16f7379f2da43f29d9faa2f474745e2705a3f510
> > ># bad: [a7fb9a8169be9a55e0cfb98346aece1b51c016fa] Merge branch 'locking/core'
> > >git bisect bad a7fb9a8169be9a55e0cfb98346aece1b51c016fa
> > ># good: [2a07870511829977d02609dac6450017b0419ea9] irqchip/mips-gic: Use gic_vpes instead of NR_CPUS
> > >git bisect good 2a07870511829977d02609dac6450017b0419ea9
> > ># good: [eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7] locking/pvqspinlock: Move lock stealing count tracking code into pv_queued_spin_steal_lock()
> > >git bisect good eaff0e7003cca6c2748b67ead2d4b1a8ad858fc7
> > ># good: [013e379a3094ff2898f8d33cfbff1573d471ee14] tools/lib/lockdep: Fix link creation warning
> > >git bisect good 013e379a3094ff2898f8d33cfbff1573d471ee14
> > ># bad: [7eb8c99db26cc6499bfb1eba72dffc4730570752] MIPS: Delete smp-gic.c
> > >git bisect bad 7eb8c99db26cc6499bfb1eba72dffc4730570752
> > ># good: [fbde2d7d8290d8c642d591a471356abda2446874] MIPS: Add generic SMP IPI support
> > >git bisect good fbde2d7d8290d8c642d591a471356abda2446874
> > ># bad: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
> > >git bisect bad bb11cff327e54179c13446c4022ed4ed7d4871c7
> > ># first bad commit: [bb11cff327e54179c13446c4022ed4ed7d4871c7] MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
> >
^ permalink raw reply
* Re: linux-next: build failure after merge of the kbuild tree
From: Michal Marek @ 2016-03-16 11:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Wagner, linux-next, linux-kernel, Peter Zijlstra (Intel),
Thomas Gleixner, Ingo Molnar, Daniel Vetter
In-Reply-To: <20160316222941.4be25283@canb.auug.org.au>
On 2016-03-16 12:29, Stephen Rothwell wrote:
> Hi Michal,
>
> On Wed, 16 Mar 2016 08:56:50 +0100 Michal Marek <mmarek@suse.cz> wrote:
>>
>> Right. Stephen, could you perhaps move the kbuild tree down in your list
>> a bit, so that the fixes are present?
>
> Done.
>
> Now you just need to make sure Linus gets them in the right order :-)
That's the plan :).
Michal
^ permalink raw reply
* Re: linux-next: build failure after merge of the kbuild tree
From: Stephen Rothwell @ 2016-03-16 11:29 UTC (permalink / raw)
To: Michal Marek
Cc: Daniel Wagner, linux-next, linux-kernel, Peter Zijlstra (Intel),
Thomas Gleixner, Ingo Molnar, Daniel Vetter
In-Reply-To: <56E911C2.3060802@suse.cz>
Hi Michal,
On Wed, 16 Mar 2016 08:56:50 +0100 Michal Marek <mmarek@suse.cz> wrote:
>
> Right. Stephen, could you perhaps move the kbuild tree down in your list
> a bit, so that the fixes are present?
Done.
Now you just need to make sure Linus gets them in the right order :-)
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* next-20160316 build: 0 failures 11 warnings (next-20160316)
From: Build bot for Mark Brown @ 2016-03-16 11:20 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160316
Git describe: next-20160316
Commit: 8559bac87d Add linux-next specific files for 20160316
Build Time: 87 min 26 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 11
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
7 warnings 0 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
12 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm-allnoconfig
5 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 11
12 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
12 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
3 ../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 arch/arm64/configs/defconfig:218:warning: override: reassigning to symbol MMC_BLOCK_MINORS
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
1 ../drivers/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
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/char/tpm/tpm-chip.c:287:38: warning: passing argument 1 of 'tpm_bios_log_setup' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/char/tpm/tpm-chip.c:287:38: warning: passing argument 1 of 'tpm_bios_log_setup' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/media/v4l2-core/v4l2-mc.c:37:55: warning: unused variable 'dtv_demod' [-Wunused-variable]
../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/ntb/test/ntb_perf.c:213:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/ntb/test/ntb_perf.c:214:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
arch/arm64/configs/defconfig:218:warning: override: reassigning to symbol MMC_BLOCK_MINORS
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: build failure after merge of the aio tree
From: Andy Shevchenko @ 2016-03-16 11:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linuxppc-dev, Benjamin LaHaise, Sudip Mukherjee, Stephen Rothwell,
linux-kernel@vger.kernel.org, linux-next, Al Viro,
Christoph Hellwig
In-Reply-To: <15874870.hBfxUomX5V@wuerfel>
On Wed, Mar 16, 2016 at 12:02 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Tuesday 15 March 2016 12:22:28 Benjamin LaHaise wrote:
>> On Tue, Mar 15, 2016 at 04:19:02PM +0000, Sudip Mukherjee wrote:
>> > On Tue, Mar 15, 2016 at 05:46:34PM +1100, Stephen Rothwell wrote:
>> > > Hi Benjamin,
>> > >
>> > > After merging the aio tree, today's linux-next build (powerpc
>> > > ppc44x_defconfig) failed like this:
>> > >
>> > > fs/built-in.o: In function `aio_thread_op_foo_at':
>> > > aio.c:(.text+0x4dab4): undefined reference to `__get_user_bad'
>> > > aio.c:(.text+0x4daec): undefined reference to `__get_user_bad'
>> > >
>> > > Caused by commit
>> > >
>> > > 150a0b4905f1 ("aio: add support for async openat()")
>> > >
>> > > despite commit
>> > >
>> > > d2f7a973e11e ("aio: don't use __get_user() for 64 bit values")
>> > >
>> I've removed everything from the aio-next.git tree for now. Will revisit
>> after the merge window.
I think it is the best solution right now.
> I've also sent a patch that fixes the link error on ARM and that should
> work on all other architectures too.
In case of avr32 signalfd_read() fails. Does your patch help with it as well?
P.S. Bisecting shows same culprit: 150a0b4905f1 ("aio: add support for
async openat()")
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply
* Re: linux-next: build failure after merge of the kbuild tree
From: Michal Marek @ 2016-03-16 7:56 UTC (permalink / raw)
To: Daniel Wagner, Stephen Rothwell
Cc: linux-next, linux-kernel, Peter Zijlstra (Intel), Thomas Gleixner,
Ingo Molnar, Daniel Vetter
In-Reply-To: <56E91108.5050105@bmw-carit.de>
On 2016-03-16 08:53, Daniel Wagner wrote:
> Hi,
>
> On 03/16/2016 12:58 AM, Stephen Rothwell wrote:
>> After merging the kbuild tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/gma500/mdfld_dsi_output.c:407:39: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>> .dpms = /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms,
>> ^
>>
>> Caused by commit
>>
>> ea8daa7b9784 ("kbuild: Add option to turn incompatible pointer check into error")
>
>
> A fix should be on the way via drm-misc:
Right. Stephen, could you perhaps move the kbuild tree down in your list
a bit, so that the fixes are present?
Thanks,
Michal
^ permalink raw reply
* Re: linux-next: build failure after merge of the kbuild tree
From: Daniel Wagner @ 2016-03-16 7:53 UTC (permalink / raw)
To: Stephen Rothwell, Michal Marek
Cc: linux-next, linux-kernel, Peter Zijlstra (Intel), Thomas Gleixner,
Ingo Molnar, Daniel Vetter
In-Reply-To: <20160316105851.015ff688@canb.auug.org.au>
Hi,
On 03/16/2016 12:58 AM, Stephen Rothwell wrote:
> After merging the kbuild tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/gma500/mdfld_dsi_output.c:407:39: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .dpms = /*drm_helper_connector_dpms*/mdfld_dsi_connector_dpms,
> ^
>
> Caused by commit
>
> ea8daa7b9784 ("kbuild: Add option to turn incompatible pointer check into error")
A fix should be on the way via drm-misc:
https://lkml.org/lkml/2016/2/25/397
Though I don't know what the exact status is (and I haven't really
understood the flow of the patches as far)
cheers,
daniel
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Herbert Xu @ 2016-03-16 6:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Doug Ledford, linux-next, linux-kernel, Faisal Latif
In-Reply-To: <20160316121538.6d5a773b@canb.auug.org.au>
On Wed, Mar 16, 2016 at 12:15:38PM +1100, Stephen Rothwell wrote:
> Hi Doug,
>
> After merging the rdma tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
> from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
> drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
> u32 length, u32 value);
> ^
>
> And it went downhill badly after that.
>
> Caused by commit
>
> 896545098777 ("crypto: hash - Remove crypto_hash interface")
>
> from the crypto tree interacting with commits
>
> 786c6adb3a94 ("i40iw: add puda code")
> 4e9042e647ff ("i40iw: add hw and utils files")
>
> (at least) from the rdma tree.
>
> Its a bit of a pain finding these conflicts now - it would have been
> better a few weeks ago.
>
> For now, all I can do is to use the rdma tree from next-20160315 for
> today.
>
> Herbert, any hints for Doug, Faisal?
crypto_hash is obsolete. You should be using shash if your input
is completely linear or ahash if you need SG lists. For an example
of how you can do the conversion, have a look at
commit 69110e3cedbb8aad1c70d91ed58a9f4f0ed9eec6
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun Jan 24 21:19:52 2016 +0800
iscsi-target: Use shash and ahash
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* linux-next: Tree for Mar 16
From: Stephen Rothwell @ 2016-03-16 6:25 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.7 related material to your linux-next included
trees until after v4.6-rc1 is released.
Changes since 20160315:
The kbuild tree gained a build failure for which I reverted a commit.
The rdma tree gained conflicts against the net-next tree and also build
failures due to conflicts against the crypto tree, so I used the version
from next-20160315.
The aio tree lost its build failure.
Non-merge commits (relative to Linus' tree): 10993
8644 files changed, 427276 insertions(+), 216203 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 231 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 (e23604edac2a Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (df420fd68811 arc: [plat-nsimosci*] use ezchip network driver)
Merging arm-current/fixes (f474c8c857d9 ARM: 8544/1: set_memory_xx fixes)
Merging m68k-current/for-linus (efbec135f11d m68k: Fix misspellings in comments.)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b562e44f507e Linux 4.5)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (f983cd32cd5d Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging net/master (133800d1f028 sctp: fix copying more bytes than expected in sctp_add_bind_addr)
Merging ipsec/master (52717aa43094 vti: Fix recource leeks on pmtu discovery)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (10da848f67a7 ssb: host_soc depends on sprom)
Merging mac80211/master (2af8c4dc2e9c mac80211_hwsim: treat as part of mac80211 for MAINTAINERS)
Merging sound-current/for-linus (b62232d429fa ALSA: hda - Limit i915 HDMI binding only for HSW and later)
Merging pci-current/for-linus (54c6e2dd00c3 PCI: Allow a NULL "parent" pointer in pci_bus_assign_domain_nr())
Merging driver-core.current/driver-core-linus (18558cae0272 Linux 4.5-rc4)
Merging tty.current/tty-linus (18558cae0272 Linux 4.5-rc4)
Merging usb.current/usb-linus (861c3849222b Merge tag 'usb-serial-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (3b2435192fe9 MAINTAINERS: drop OMAP USB and MUSB maintainership)
Merging usb-serial-fixes/usb-linus (f6cede5b49e8 Linux 4.5-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (fc77dbd34c5c Linux 4.5-rc6)
Merging char-misc.current/char-misc-linus (fc77dbd34c5c Linux 4.5-rc6)
Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
Merging crypto-current/master (34074205bb9f crypto: qat - remove redundant arbiter configuration)
CONFLICT (content): Merge conflict in net/ipv4/tcp.c
Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
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 (92e963f50fc7 Linux 4.5-rc1)
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 (b562e44f507e Linux 4.5)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (df420fd68811 arc: [plat-nsimosci*] use ezchip network driver)
Merging arm/for-next (1b3bf847977c Merge branches 'amba', 'fixes', 'misc' and 'tauros2' into for-next)
Merging arm-perf/for-next/perf (fe638401a091 arm64: perf: Extend ARMV8_EVTYPE_MASK to include PMCR.LC)
Merging arm-soc/for-next (6dae7e7ff600 ARM: SoC: Document merges)
Merging at91/at91-next (c40abde4b32e Merge branch 'at91-4.6-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (1305141d1a72 ARM: bcm2835: add bcm2835-aux-uart support to DT)
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 (0a05d3b71ada ARM: multi_v7_defconfig: Enable BCM283x)
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 (9e26d5f485d7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
Merging mvebu/for-next (5be603bdf1a7 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (aec24f100558 Merge branch 'omap-for-v4.6/fixes-not-urgent' into for-next)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/logicpd-torpedo-som.dtsi
Merging omap-pending/for-next (8fe097a3d99e ARM: DRA7: hwmod: Add reset data for PCIe)
Merging qcom/for-next (f17d0d578214 ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging renesas/next (f094c5346231 Merge branch 'heads/sh-drivers-for-v4.6' into next)
Merging rockchip/for-next (545d1b355f3a Merge branch 'v4.6-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 (466369e4e14b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (73e5379b0442 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/config64-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
Merging tegra/for-next (755f165105b1 Merge branch for-4.6/arm64 into for-next)
Merging arm64/for-next/core (2776e0e8ef68 arm64: kasan: Fix zero shadow mapping overriding kernel image shadow)
CONFLICT (content): Merge conflict in arch/arm64/mm/init.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cputype.h
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
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 (a3595962d824 m68knommu: remove obsolete 68360 support)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
Merging mips/mips-for-linux-next (a6cab95ec1ae Merge branch '4.5-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
Merging powerpc/next (d8c0282f4da6 Merge branch 'topic/mprofile-kernel' into next)
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 (80c544ded25a s390/pci: enforce fmb page boundary rule)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (35b90a2939a5 tile: Fix misspellings in comments.)
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 (c91e02bd9702 xtensa: support hardware breakpoints/watchpoints)
Merging btrfs/next (5e33a2bd7ca7 Btrfs: do not collect ordered extents when logging that inode exists)
Merging btrfs-kdave/for-next (5976318b4e96 Merge branch 'for-next-4.6-20160315' into for-next-20160315)
Merging ceph/master (cd8140c673d9 libceph: don't spam dmesg with stray reply warnings)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (1ae1602de028 configfs: switch ->default groups to a linked list)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (ab73ef46398e quota: Fix possible GPF due to uninitialised pointers)
Merging ext4/dev (600be30a8bc1 ext4: remove i_ioend_count)
Merging f2fs/dev (32b7602f7858 f2fs: submit node page write bios when really required)
CONFLICT (modify/delete): fs/f2fs/f2fs_crypto.h deleted in f2fs/dev and modified in HEAD. Version HEAD of fs/f2fs/f2fs_crypto.h left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto_key.c deleted in f2fs/dev and modified in HEAD. Version HEAD of fs/f2fs/crypto_key.c left in tree.
CONFLICT (modify/delete): fs/f2fs/crypto.c deleted in f2fs/dev and modified in HEAD. Version HEAD of fs/f2fs/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/crypto/fname.c
$ git rm -f fs/f2fs/f2fs_crypto.h fs/f2fs/crypto_key.c fs/f2fs/crypto.c
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (744742d692e3 fuse: Add reference counting for fuse_io_priv)
Merging gfs2/for-next (73b462d2808d GFS2: Eliminate parameter non_block on gfs2_inode_lookup)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (ecf782868399 Merge branch 'multipath')
Merging nfsd/nfsd-next (974e49fb648e sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a race)
Merging orangefs/for-next (2180c52cc729 Orangefs: fix sloppy cleanups of debugfs and sysfs init failures.)
Merging overlayfs/overlayfs-next (b81de061fa59 ovl: copy new uid/gid into overlayfs runtime inode)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (e4f6daac2033 ubi: Fix out of bounds write in volume update code)
Merging xfs/for-next (2cdb958aba6a Merge branch 'xfs-misc-fixes-4.6-4' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (c99dce976ab3 Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next)
CONFLICT (content): Merge conflict in fs/nfs/nfs4proc.c
Merging pci/next (6e6f498b039a Merge branch 'pci/resource' into next)
Merging hid/for-next (56e375d8eda6 Merge branch 'for-4.6/thingm' into for-next)
Merging i2c/i2c/for-next (b980a26d02d1 i2c: immediately mark ourselves as registered)
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 (630300d5fcb6 hwmon: Create an NSA320 hardware monitoring driver)
Merging v4l-dvb/master (1752d448bb5e Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Applying: Revert "kbuild: Add option to turn incompatible pointer check into error"
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (4b3ec0279397 Merge branch 'for-4.6' into for-next)
Merging pm/linux-next (0d571b62dd8e Merge branch 'pm-tools')
CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging thermal/next (33cae63614e6 Merge branches 'thermal-core' and 'thermal-intel' into next)
Merging thermal-soc/next (44fa372da981 Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (e38e5ce81c3e firewire: ABI documentation: libhinawa uses firewire-cdev)
Merging dlm/next (b81171cb6869 DLM: Save and restore socket callbacks properly)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (7ea5d41560d9 Merge branch 'for-linus' into next)
Merging net-next/master (1cdba5505555 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
CONFLICT (content): Merge conflict in net/rxrpc/rxkad.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-xp-gp.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-xp-db.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (ccfe1e853220 rtl8xxxu: Temporarily disable 8192eu device init)
Merging bluetooth/master (6a0e78072c2a Bluetooth: Fix potential buffer overflow with Add Advertising)
Merging mac80211-next/master (0a87cadbb54e nl80211: add feature for BSS selection support)
Merging rdma/for-next (a041fd16386b Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
$ git reset --hard HEAD^
Merging next-20160315 version of rdma
Merging mtd/master (9df4f913eb39 MAINTAINERS: add a maintainer for the NAND subsystem)
Merging l2-mtd/master (6871c1b96de8 mtd: nand: remove kerneldoc for removed function parameter)
Merging crypto/master (34074205bb9f crypto: qat - remove redundant arbiter configuration)
Merging drm/drm-next (211afd577a18 Merge tag 'drm-vc4-next-2016-03-14' of github.com:anholt/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (94669e6ba1ad drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.)
Merging drm-tegra/drm/tegra/for-next (5dff6a2179a0 gpu: host1x: Use a signed return type for do_relocs())
Merging drm-misc/topic/drm-misc (b47ff7e6a534 drm/atmel-hlcdc: use helper to get crtc state)
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 (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/juno-base.dtsi
Merging drm-vc4/drm-vc4-next (90d7116061f8 drm/vc4: Recognize a more specific compatible string for V3D.)
Merging regmap/for-next (7d2ac74e09dd Merge tag 'regmap-v4.6' into regmap-linus)
Merging sound/for-next (b62232d429fa ALSA: hda - Limit i915 HDMI binding only for HSW and later)
Merging sound-asoc/for-next (a3d7ec180e9f Merge remote-tracking branch 'asoc/fix/cs35l32' into asoc-linus)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (9979c1c70724 Input: snvs_pwrkey - fix returned value check of syscon_regmap_lookup_by_phandle())
Merging block/for-next (f18f62940d19 Merge branch 'for-4.6/drivers-merged' into for-next)
Merging device-mapper/for-next (98dbc9c6c616 dm: fix rq_end_stats() NULL pointer in dm_requeue_original_request())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (67b3fcff2da9 mmc: mediatek: Use mmc_regulator_set_vqmmc in start_signal_voltage_switch)
Merging md/for-next (00a41f985265 raid10: include bio_end_io_list in nr_queued to prevent freeze_array hang)
Merging mfd/for-mfd-next (acb61da505d5 mfd: intel-lpss: Pass I2C configuration via properties on BXT)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (0df6e32b0e36 power: pm2301-charger: use __maybe_unused to hide pm functions)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (0da1830bf47e Merge tag 'regulator-v4.6' into regulator-linus)
Merging security/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging tpmdd/next (0480adb1395b Merge branch 'master' into next)
Merging watchdog/master (c0732e8a5bb1 watchdog: Ensure that wdd is not dereferenced if NULL)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/foundation-v8.dts
Merging iommu/next (d459a0941140 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/io-pgtable', 'arm/renesas' and 'core' into next)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/mediatek/mt8173.dtsi
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (abfa6cd8cda7 modsign: Fix documentation on module signing enforcement parameter.)
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (fd97646b0595 audit: Fix typo in comment)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (fa38a82096a1 scripts/dtc: Update to upstream version 53bf130b1cdd)
Merging mailbox/mailbox-for-next (f70ed3b5dc8b mailbox: rockchip: Add Rockchip mailbox driver)
Merging spi/for-next (d00de215041f Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus)
Merging tip/auto-latest (42357f7330db Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in kernel/sched/sched.h
CONFLICT (content): Merge conflict in kernel/memremap.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/efistub.h
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c
CONFLICT (content): Merge conflict in drivers/cpufreq/intel_pstate.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (7cc5a5d3cd4c ARM: socfpga: Enable OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (1cf8067b5418 tracing: Fix typoes in code comment and printk in trace_nop.c)
Merging rcu/rcu/next (7220b7742659 locktorture: Fix nil pointer dereferencing for cleanup paths)
Merging kvm/linux-next (f958ee745f70 Merge tag 'kvm-s390-next-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_64_vio_hv.c
CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp.S
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
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 (c54f0d6ae057 KVM: s390: allocate only one DMA page per VM)
Merging xen-tip/linux-next (4478c407ea38 xen/x86: Drop mode-selecting ifdefs in startup_xen())
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (5b4466b8f63b hp-wmi: Remove GPS rfkill support via pre-2009 interface)
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 (7296c33ed12e leds: triggers: simplify led_trigger_store)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (112d125a8947 Revert "driver-core: platform: probe of-devices only using list of compatibles")
Merging tty/tty-next (a95fc9c8e576 serial: 8250: describe CONFIG_SERIAL_8250_RSA)
Merging usb/usb-next (ce53bfc4374c Merge tag 'usb-serial-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging usb-gadget/next (0561f77e2db9 usb: gadget: f_acm: Fix configfs attr name)
Merging usb-serial/usb-next (7084fa868b50 USB: serial: cp210x: add new access functions for large registers)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (2df122bdebab staging: lustre: fix aligments in lnet selftest)
CONFLICT (content): Merge conflict in include/linux/irqdomain.h
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/media/davinci_vpfe/davinci_vpfe_user.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/dvb-frontends/mn88473.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
$ git rm -f drivers/staging/dgap/dgap.c
Applying: staging: mark CONFIG_FSL_MC_BUS as broken for now
Merging char-misc/char-misc-next (16617535684f goldfish: Fix build error of missing ioremap on UM)
Merging extcon/extcon-next (ae64e42cc2b3 extcon: palmas: Drop IRQF_EARLY_RESUME flag)
Merging cgroup/for-next (10c2c49ff21e Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (3d926c1d4d08 Merge branch 'misc' into for-next)
Merging target-updates/for-next (484dfe2e26f7 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (9a7dea4939c8 cxgb4: update Kconfig and Makefile)
CONFLICT (content): Merge conflict in drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
Merging pinctrl/for-next (3c177a166253 pinctrl: single: Use a separate lockdep class)
Merging vhost/linux-next (030881372460 vhost_net: basic polling support)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (69ae9895d3fe MAINTAINERS: Add co-maintainer for remoteproc subsystems)
Merging gpio/for-next (ec57bde1a1f2 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in tools/Makefile
CONFLICT (content): Merge conflict in drivers/pinctrl/sunxi/pinctrl-sunxi.c
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Kconfig
CONFLICT (content): Merge conflict in MAINTAINERS
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (116e5575805d pwm: brcmstb: Fix check of devm_ioremap_resource() return code)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (d3781a74bcc9 clk: fixed-rate: Remove CLK_IS_ROOT)
CONFLICT (content): Merge conflict in drivers/clk/at91/clk-master.c
CONFLICT (content): Merge conflict in drivers/clk/at91/clk-main.c
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6accd8e9bf22 selftests: media_dcevice_test fix usage information)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (d6566346e17b Merge branch 'for-4.6/upstream' into for-next)
Merging coresight/next (f1e2c1b13dfa drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular)
CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-etm3x.c
Merging rtc/rtc-next (cee2cc215506 rtc: pcf2127: add pcf2129 device id)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (489011652a2d Merge branch 'for-4.6/pfn' into libnvdimm-for-next)
Merging akpm-current/current (99f0ba2d0ee6 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/huge_memory.c
CONFLICT (content): Merge conflict in include/linux/huge_mm.h
CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
CONFLICT (content): Merge conflict in arch/x86/realmode/rm/Makefile
CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
CONFLICT (content): Merge conflict in arch/x86/entry/vdso/Makefile
CONFLICT (content): Merge conflict in arch/x86/boot/compressed/Makefile
CONFLICT (content): Merge conflict in arch/x86/boot/Makefile
CONFLICT (content): Merge conflict in arch/mips/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: staging/goldfish: use 6-arg get_user_pages()
Applying: mm/mprotect.c: don't imply PROT_EXEC on non-exec fs
Applying: kernel/signal.c: add compile-time check for __ARCH_SI_PREAMBLE_SIZE
Applying: memremap: don't modify flags
Applying: memremap: add MEMREMAP_WC flag
Applying: drivers: dma-coherent: use MEMREMAP_WC for DMA_MEMORY_MAP
Applying: drivers: dma-coherent: use memset_io for DMA_MEMORY_IO mappings
Applying: kernel/...: convert pr_warning to pr_warn
Applying: dma-rename-dma__writecombine-to-dma__wc-checkpatch-fixes
Applying: alpha/extable: use generic search and sort routines
Applying: s390/extable: use generic search and sort routines
Applying: x86/extable: use generic search and sort routines
Applying: ia64/extable: use generic search and sort routines
Merging akpm/master (037d3676838d ia64/extable: use generic search and sort routines)
^ permalink raw reply
* linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2016-03-16 1:15 UTC (permalink / raw)
To: Doug Ledford, Herbert Xu; +Cc: linux-next, linux-kernel, Faisal Latif
Hi Doug,
After merging the rdma tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/infiniband/hw/i40iw/i40iw.h:57:0,
from drivers/infiniband/hw/i40iw/i40iw_cm.c:63:
drivers/infiniband/hw/i40iw/i40iw_osdep.h:175:12: warning: 'struct hash_desc' declared inside parameter list
u32 length, u32 value);
^
And it went downhill badly after that.
Caused by commit
896545098777 ("crypto: hash - Remove crypto_hash interface")
from the crypto tree interacting with commits
786c6adb3a94 ("i40iw: add puda code")
4e9042e647ff ("i40iw: add hw and utils files")
(at least) from the rdma tree.
Its a bit of a pain finding these conflicts now - it would have been
better a few weeks ago.
For now, all I can do is to use the rdma tree from next-20160315 for
today.
Herbert, any hints for Doug, Faisal?
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the rdma tree with the net-next tree
From: Stephen Rothwell @ 2016-03-16 0:58 UTC (permalink / raw)
To: Doug Ledford, David Miller, netdev
Cc: linux-next, linux-kernel, Amir Vadai, Maor Gottlieb
Hi all,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
between commit:
60ab4584f5bf ("net/mlx5_core: Set flow steering dest only for forward rules")
from the net-next tree and commit:
b3638e1a7664 ("net/mlx5_core: Introduce forward to next priority action")
from the rdma tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index e848d708d2b7,bf3446794bd5..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@@ -73,10 -73,13 +73,13 @@@
#define BY_PASS_MIN_LEVEL (KENREL_MIN_LEVEL + MLX5_BY_PASS_NUM_PRIOS +\
LEFTOVERS_MAX_FT)
-#define KERNEL_MAX_FT 2
-#define KERNEL_NUM_PRIOS 1
+#define KERNEL_MAX_FT 3
+#define KERNEL_NUM_PRIOS 2
#define KENREL_MIN_LEVEL 2
+ #define ANCHOR_MAX_FT 1
+ #define ANCHOR_NUM_PRIOS 1
+ #define ANCHOR_MIN_LEVEL (BY_PASS_MIN_LEVEL + 1)
struct node_caps {
size_t arr_sz;
long *caps;
@@@ -360,8 -367,13 +367,13 @@@ static void del_rule(struct fs_node *no
memcpy(match_value, fte->val, sizeof(fte->val));
fs_get_obj(ft, fg->node.parent);
list_del(&rule->node.list);
+ if (rule->sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {
+ mutex_lock(&rule->dest_attr.ft->lock);
+ list_del(&rule->next_ft);
+ mutex_unlock(&rule->dest_attr.ft->lock);
+ }
- fte->dests_size--;
- if (fte->dests_size) {
+ if ((fte->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
+ --fte->dests_size) {
err = mlx5_cmd_update_fte(dev, ft,
fg->id, fte);
if (err)
@@@ -762,9 -835,9 +835,10 @@@ static struct mlx5_flow_rule *alloc_rul
if (!rule)
return NULL;
+ INIT_LIST_HEAD(&rule->next_ft);
rule->node.type = FS_TYPE_FLOW_DEST;
- memcpy(&rule->dest_attr, dest, sizeof(*dest));
+ if (dest)
+ memcpy(&rule->dest_attr, dest, sizeof(*dest));
return rule;
}
@@@ -783,12 -856,16 +857,17 @@@ static struct mlx5_flow_rule *add_rule_
return ERR_PTR(-ENOMEM);
fs_get_obj(ft, fg->node.parent);
- /* Add dest to dests list- added as first element after the head */
+ /* Add dest to dests list- we need flow tables to be in the
+ * end of the list for forward to next prio rules.
+ */
tree_init_node(&rule->node, 1, del_rule);
- list_add_tail(&rule->node.list, &fte->node.children);
+ if (dest && dest->type != MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE)
+ list_add(&rule->node.list, &fte->node.children);
+ else
+ list_add_tail(&rule->node.list, &fte->node.children);
- fte->dests_size++;
- if (fte->dests_size == 1)
+ if (dest)
+ fte->dests_size++;
+ if (fte->dests_size == 1 || !dest)
err = mlx5_cmd_create_fte(get_dev(&ft->node),
ft, fg->id, fte);
else
^ 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