From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 349C6C43334 for ; Tue, 14 Jun 2022 02:47:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236665AbiFNCrP (ORCPT ); Mon, 13 Jun 2022 22:47:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352572AbiFNCqv (ORCPT ); Mon, 13 Jun 2022 22:46:51 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D97040E59; Mon, 13 Jun 2022 19:24:51 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4LMXMP5k7pz4yTf; Tue, 14 Jun 2022 12:24:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1655173490; bh=7r/wSZntjyx/vAomnCuxBPjB/OyUEqKUwv9dafChlXo=; h=Date:From:To:Cc:Subject:From; b=DX1W8DswoFWnxurxN5OOgLILu45/GqIZBPxo2tFwJT4uYk4ydo32GjwPuoldQWycz XwDh2/bNXs15YHrRwnEOk+wqo+JbUW6/GpykGrzlVdUXeEaAXHtg92cegOm0TGq7F/ SZy1aCbTsUVwA3yqNLDRZ3tTcmoNwMCfRjpPRIYhSGaZLgcrEnJiNUZshDPfsh3Mvp lOB+mrHWie7XSa/gP0FE/1EQr+2ZAN/G1bIbNmKKyMrXv3xjXrdOPahzD4gyDV9WB4 HHhP84sxMDIQx+VTtEGH6g/bChbITO2bQImlgz/XSFzrd/GbmWlPXnakWGyD9BwNuN uhWKPqSBewt+w== Date: Tue, 14 Jun 2022 12:24:48 +1000 From: Stephen Rothwell To: Greg KH Cc: Greg Kroah-Hartman , Larry Finger , Linux Kernel Mailing List , Linux Next Mailing List , Nam Cao Subject: linux-next: manual merge of the staging tree with the staging.current tree Message-ID: <20220614122448.1360395f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Sx/3I2jev=dZ0zCrj1O3tyP"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Sx/3I2jev=dZ0zCrj1O3tyP Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/r8188eu/os_dep/ioctl_linux.c between commit: 96f0a54e8e65 ("staging: r8188eu: Fix warning of array overflow in ioctl_l= inux.c") from the staging.current tree and commit: ac663ae22f02 ("staging: r8188eu: replace FIELD_OFFSET with offsetof") from the staging tree. I fixed it up (I just used the latter) 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. --=20 Cheers, Stephen Rothwell --Sig_/Sx/3I2jev=dZ0zCrj1O3tyP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKn8XAACgkQAVBC80lX 0GxUeAf6Aok1SQgrFlfCbdPq4p9T7sTFS8OjHzJecbSmOiWrHuPwTopzwB0KDYky XvGHfSmF86HDaMs00rW6hwv7XEZQELz2R/hX1gUHQG7LB07zIh+RtZi+LY+A1GKn gYi31LbD2DlZ14WRFlkVlJDi92nGnX3k17HILbeYQhM0rNwWFmQFWVN7pUBwOdzI RhG8WwIuWeANahHLDx9Gw4GZTP1PgRvIg8EuvVhQ/4RZ4lZGBDD6RlJay2boWwqn YRhU3E1/HIiXSGpTMFFPFwRxxbwpDsFYY26Ddzbuxm1zVxDcsH/WJV2PX/5hAR05 T7nIKluKTr8nNUqyu2XrRo3nptmnIQ== =6X2/ -----END PGP SIGNATURE----- --Sig_/Sx/3I2jev=dZ0zCrj1O3tyP--