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 D3463C433EF for ; Tue, 22 Feb 2022 11:42:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231755AbiBVLmh (ORCPT ); Tue, 22 Feb 2022 06:42:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231753AbiBVLmg (ORCPT ); Tue, 22 Feb 2022 06:42:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1CDE137744; Tue, 22 Feb 2022 03:42:11 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 924AEB81871; Tue, 22 Feb 2022 11:42:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3D28C340E8; Tue, 22 Feb 2022 11:42:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645530129; bh=D2KqbO6eGYgWoVDqwkm8sFaVGoXiE9qbHySLnP8AXg0=; h=From:To:Cc:Subject:Date:From; b=u+97p9UWGW4VFXXWPnxKX/v62ujsqpa04ERX8+I8KFoLc5/y1pVEnbY0ESQqnlUHa pFN7WzcTs6Dv2im2jPQ5KAhb/eC80MKUZAKi5dG0kOOdbjXAMYqokpF3ZiQVW2I8sU jmjx9+SkQ8Vs4TkfN2R955r3+bIDK1WSJ1FhQNp3fAYYyOCdZv8R/A4TZmCwZH3TOm YG/vnfYZafLNPo7K3qyPprLD7D6a4JTITgget5IoFM9GxczH25dPvFc0lj57lw3CKP gzDY5tRn1uzI+gD3wv8wMGnFUXoWaJZDO0WLsWlh9gMpiirL+tkKI/MDXPMp7uaxg8 ByzcHyB1KkWNw== From: broonie@kernel.org To: Thomas Bogendoerfer Cc: Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the mips tree with the asm-generic tree Date: Tue, 22 Feb 2022 11:42:03 +0000 Message-Id: <20220222114203.686638-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi all, Today's linux-next merge of the mips tree got a conflict in: arch/mips/sibyte/common/sb_tbprof.c between commit: 27e8140d7819b ("uaccess: fix type mismatch warnings from access_ok()") from the asm-generic tree and commit: 10242464e506b ("MIPS: sibyte: Add missing __user annotations in sb_tbprof.c") from the mips 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. diff --cc arch/mips/sibyte/common/sb_tbprof.c index 01d00b87d0f5a,bc47681e825a3..0000000000000 --- a/arch/mips/sibyte/common/sb_tbprof.c +++ b/arch/mips/sibyte/common/sb_tbprof.c (used the head version)