Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Pearson, Robert B" <robert.pearson2@hpe.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Doug Ledford <dledford@redhat.com>,
        Jason Gunthorpe <jgg@mellanox.com>
CC:     Bob Pearson <rpearsonhpe@gmail.com>,
        Jason Gunthorpe <jgg@nvidia.com>,
        Jason Gunthorpe <jgg@ziepe.ca>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Martin Wilck <mwilck@suse.com>
Subject: RE: linux-next: manual merge of the rdma tree with Linus' tree
Thread-Topic: linux-next: manual merge of the rdma tree with Linus' tree
Thread-Index: AQHW/1Kql+xQKgMgsUyVf/ppryA44KpRvYUA
Date:   Wed, 10 Feb 2021 18:57:24 +0000
Message-ID: <CS1PR8401MB0821C1E95BE58300FF3B87C8BC8D9@CS1PR8401MB0821.NAMPRD84.PROD.OUTLOOK.COM>
References: <20210210131542.215ea67c@canb.auug.org.au>
In-Reply-To: <20210210131542.215ea67c@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 99a9e594-4d8e-48a3-8207-08d8cdf5b451
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Feb 2021 18:57:24.8067
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: VI2DMRpzxysAv5LBNdetD+fMYk6fWosXnkePZbuauyXbjIQRA2mVjN3FoR6Yo1E0A2GO3mKd7lg0PSk+Qrq4kw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR8401MB0357
X-OriginatorOrg: hpe.com
X-HPE-SCL: -1
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.737
 definitions=2021-02-10_08:2021-02-10,2021-02-10 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0
 clxscore=1011 priorityscore=1501 bulkscore=0 suspectscore=0 malwarescore=0
 phishscore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000
 definitions=main-2102100168
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It looks like f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code leftovers f=
rom RXE"") has not been applied to rdma for-next which is where I do my wor=
k. Not sure how it got upstream.

bob

-----Original Message-----
From: Stephen Rothwell <sfr@canb.auug.org.au>=20
Sent: Tuesday, February 9, 2021 8:16 PM
To: Doug Ledford <dledford@redhat.com>; Jason Gunthorpe <jgg@mellanox.com>
Cc: Pearson, Robert B <robert.pearson2@hpe.com>; Bob Pearson <rpearsonhpe@g=
mail.com>; Jason Gunthorpe <jgg@nvidia.com>; Jason Gunthorpe <jgg@ziepe.ca>=
; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Linux Next Mail=
ing List <linux-next@vger.kernel.org>; Martin Wilck <mwilck@suse.com>
Subject: linux-next: manual merge of the rdma tree with Linus' tree

Hi all,

Today's linux-next merge of the rdma tree got a conflict in:

  drivers/infiniband/sw/rxe/rxe_net.c

between commit:

  f1b0a8ea9f12 ("Revert "RDMA/rxe: Remove VLAN code leftovers from RXE"")

from Linus' tree and commit:

  899aba891cab ("RDMA/rxe: Fix FIXME in rxe_udp_encap_recv()")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This is now f=
ixed as far as linux-next is concerned, but any non trivial conflicts shoul=
d 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/infiniband/sw/rxe/rxe_net.c
index 943914c2a50c,36d56163afac..000000000000
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@@ -153,15 -152,14 +153,19 @@@ static struct dst_entry *rxe_find_route
  static int rxe_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
  {
  	struct udphdr *udph;
+ 	struct rxe_dev *rxe;
  	struct net_device *ndev =3D skb->dev;
 +	struct net_device *rdev =3D ndev;
- 	struct rxe_dev *rxe =3D rxe_get_dev_from_net(ndev);
  	struct rxe_pkt_info *pkt =3D SKB_TO_PKT(skb);
 =20
+ 	/* takes a reference on rxe->ib_dev
+ 	 * drop when skb is freed
+ 	 */
+ 	rxe =3D rxe_get_dev_from_net(ndev);
 +	if (!rxe && is_vlan_dev(rdev)) {
 +		rdev =3D vlan_dev_real_dev(ndev);
 +		rxe =3D rxe_get_dev_from_net(rdev);
 +	}
  	if (!rxe)
  		goto drop;
 =20