From: Paul Moore <paul@paul-moore.com>
To: Daniel Jurgens <danielj@mellanox.com>,
Doug Ledford <dledford@redhat.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the selinux tree with Linus' tree
Date: Mon, 22 May 2017 17:08:54 -0400 [thread overview]
Message-ID: <CAHC9VhQ1y1x3AarvfJYF0eMsJjqL3ofzixCxJyHs_xrr-P9s4w@mail.gmail.com> (raw)
In-Reply-To: <20170522123825.14d0a033@canb.auug.org.au>
On Sun, May 21, 2017 at 10:38 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the selinux tree got a conflict in:
>
> include/rdma/ib_verbs.h
>
> between commit:
>
> 2fc775726491 ("IB/opa-vnic: RDMA NETDEV interface")
>
> from Linus' tree and commit:
>
> 89b54b4d09bd ("IB/core: Enforce PKey security on QPs")
>
> from the selinux 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.
Thanks Stephen.
Daniel and Doug, does Stephen's patch look right to you?
> diff --cc include/rdma/ib_verbs.h
> index ba8314ec5768,c9e903fc824b..000000000000
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@@ -1890,7 -1878,10 +1930,8 @@@ enum ib_mad_result
> IB_MAD_RESULT_CONSUMED = 1 << 2 /* Packet consumed: stop processing */
> };
>
> -#define IB_DEVICE_NAME_MAX 64
> -
> struct ib_port_cache {
> + u64 subnet_prefix;
> struct ib_pkey_cache *pkey;
> struct ib_gid_table *gid;
> u8 lmc;
> @@@ -1912,34 -1903,12 +1953,40 @@@ struct ib_port_immutable
> u32 max_mad_size;
> };
>
> +/* rdma netdev type - specifies protocol type */
> +enum rdma_netdev_t {
> + RDMA_NETDEV_OPA_VNIC,
> + RDMA_NETDEV_IPOIB,
> +};
> +
> +/**
> + * struct rdma_netdev - rdma netdev
> + * For cases where netstack interfacing is required.
> + */
> +struct rdma_netdev {
> + void *clnt_priv;
> + struct ib_device *hca;
> + u8 port_num;
> +
> + /* control functions */
> + void (*set_id)(struct net_device *netdev, int id);
> + /* send packet */
> + int (*send)(struct net_device *dev, struct sk_buff *skb,
> + struct ib_ah *address, u32 dqpn);
> + /* multicast */
> + int (*attach_mcast)(struct net_device *dev, struct ib_device *hca,
> + union ib_gid *gid, u16 mlid,
> + int set_qkey, u32 qkey);
> + int (*detach_mcast)(struct net_device *dev, struct ib_device *hca,
> + union ib_gid *gid, u16 mlid);
> +};
> +
> + struct ib_port_pkey_list {
> + /* Lock to hold while modifying the list. */
> + spinlock_t list_lock;
> + struct list_head pkey_list;
> + };
> +
> struct ib_device {
> /* Do not access @dma_device directly from ULP nor from HW drivers. */
> struct device *dma_device;
--
paul moore
www.paul-moore.com
next prev parent reply other threads:[~2017-05-22 21:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 2:38 linux-next: manual merge of the selinux tree with Linus' tree Stephen Rothwell
2017-05-22 21:08 ` Paul Moore [this message]
2017-05-22 21:13 ` Daniel Jurgens
-- strict thread matches above, loose matches on Subject: below --
2023-06-05 0:52 Stephen Rothwell
2023-06-05 20:47 ` Paul Moore
2022-11-10 1:44 Stephen Rothwell
2022-11-10 2:26 ` Paul Moore
2021-09-21 1:17 Stephen Rothwell
2021-09-21 14:43 ` Paul Moore
2020-02-12 22:48 Stephen Rothwell
2020-02-12 23:03 ` Paul Moore
2013-07-26 3:48 Stephen Rothwell
2013-07-26 4:22 ` David Quigley
2013-07-26 7:38 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAHC9VhQ1y1x3AarvfJYF0eMsJjqL3ofzixCxJyHs_xrr-P9s4w@mail.gmail.com \
--to=paul@paul-moore.com \
--cc=danielj@mellanox.com \
--cc=dledford@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=niranjana.vishwanathapura@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).