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 X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 303C8C4320E for ; Thu, 2 Sep 2021 09:30:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 195C961058 for ; Thu, 2 Sep 2021 09:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343672AbhIBJbR (ORCPT ); Thu, 2 Sep 2021 05:31:17 -0400 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]:57903 "EHLO wnew2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343566AbhIBJbP (ORCPT ); Thu, 2 Sep 2021 05:31:15 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailnew.west.internal (Postfix) with ESMTP id B326B2B0094C; Thu, 2 Sep 2021 05:30:16 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 02 Sep 2021 05:30:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=3Ndoi/9DZtcSDa4D0wet7sByYNJ CpnLWebIegCkqHM4=; b=qzWDblwvRoAKlFBrvxHgO+n7I1f0pni08r5bxXKV/Y5 SZwGN/yoHIA5z1DpExHKFoDXVbX0wN2HmPXaDeMKTV+ruhLi//9crw0X9pMA9QDZ I7K8D5u70O7DGodk5CVoP2W+7h3hg8/84nVMbJsVc29CFYJIbo893FmAPZYfOgE1 anyXEEyhzoW8Y6L9RGrT/SIO4TmutOQTLTv9F2oJKxJkDkr/NaB2fX7KhTqVxjgo jSJe0qfwr2i9QNjVrmTZbcJT5LdcyKPuxOwxmaKwnDd1NDbkYcvgS/ofBHDZ49N6 Vj3vwnEdZDpu46nq1n7rGLD4HT952inxFcAktvCUSLw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=3Ndoi/ 9DZtcSDa4D0wet7sByYNJCpnLWebIegCkqHM4=; b=YopbxvnFQKGn6bYlDB4xiX Y2aVDw1oM5Oi/oAlxaooN6+x0g+Mx1agO2RT/1nL45U42Ro9NWcROoV+fCR1Jf21 MSDh9L37vIdbGSvzWnr6ydpxKRO3uob/0NcFFF9iCGUNfA/BOXkcR+HJrXt+CtVE 78HE18WESS03jwruY0fRDcKHb0in9RaQPcNIjexSULnTCSi+3hjqOtDyKNYcOCJm JtricD9/Zqah/RfN/blCDWn+Dwg/CyKVcsJ+AUARUg5RlYAZSvqSMIUaOE4H9NPi eLSbgLEUiJ8eLIGM5VWaoaYdJuPHOsw20gT2hCNq/R8BydF+WeSY3KA1cqQAIuIw == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddruddvhedgudeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehttdertddttddvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucggtffrrghtthgvrhhnpeevueehje fgfffgiedvudekvdektdelleelgefhleejieeugeegveeuuddukedvteenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 2 Sep 2021 05:30:14 -0400 (EDT) Date: Thu, 2 Sep 2021 11:30:04 +0200 From: Greg KH To: Stephen Rothwell Cc: David Miller , Networking , Jonathan Cameron , Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List , Phillip Potter Subject: Re: linux-next: manual merge of the net-next tree with the iio-fixes, staging trees Message-ID: References: <20210830154618.204ac5c8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210830154618.204ac5c8@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 30, 2021 at 03:46:18PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/staging/rtl8188eu/include/osdep_intf.h > drivers/staging/rtl8188eu/os_dep/ioctl_linux.c > drivers/staging/rtl8188eu/os_dep/os_intfs.c > > between commit: > > 55dfa29b43d2 ("staging: rtl8188eu: remove rtl8188eu driver from staging dir") > > from the iio-fixes, staging trees and commit: > > 89939e890605 ("staging: rtlwifi: use siocdevprivate") > > from the net-next tree. > > I fixed it up (I have removed these files) 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 Should all now be resolved in Linus's tree. thanks, greg k-h