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 9F820C6FD1C for ; Wed, 22 Mar 2023 10:02:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjCVKCH (ORCPT ); Wed, 22 Mar 2023 06:02:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229905AbjCVKCD (ORCPT ); Wed, 22 Mar 2023 06:02:03 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 627995073E; Wed, 22 Mar 2023 03:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679479322; x=1711015322; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=b/pDjDAGBcg5WhI+AQMf4x0J3VeVkUcdJvmTMh6YlXI=; b=h9KN667D9P1rjP6kl/StBDHidxPIvXCZrgUxr0ecYyE+NtWnnKNKn1DL ZeUKop+uy31Ya8He6g+mvKKYsBDdWa5V0cw3PLkUijxJuWTkE737HK5XD PaMHK8cYnC+VQ5E/ENcVvG5ze68OLvFv7yMBikfTnZUKgN2L3GXu9CwpV UwvEo1K+hhKHhqZ46OHzQFcMj2vZkNlmAdR1T12wSvOoCrWbEe5wTn491 nnLhPmf5i8yfcNCkvFWwueYPYFI6zbiYk5+7MmfqTCuMzpNdUTFsZH3YS 3ZNUWSxcG+6krgiQjNWQcPWm17Ed0IWMS+PIp+5FMMVA8NNKcpSGW2uH8 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="339214454" X-IronPort-AV: E=Sophos;i="5.98,281,1673942400"; d="scan'208";a="339214454" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2023 03:01:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="750975537" X-IronPort-AV: E=Sophos;i="5.98,281,1673942400"; d="scan'208";a="750975537" Received: from smile.fi.intel.com ([10.237.72.54]) by fmsmga004.fm.intel.com with ESMTP; 22 Mar 2023 03:01:49 -0700 Received: from andy by smile.fi.intel.com with local (Exim 4.96) (envelope-from ) id 1pevHt-0075cJ-2t; Wed, 22 Mar 2023 12:01:45 +0200 Date: Wed, 22 Mar 2023 12:01:45 +0200 From: Andy Shevchenko To: Matti Vaittinen Cc: Matti Vaittinen , Noralf =?iso-8859-1?Q?Tr=F8nnes?= , Masahiro Yamada , Randy Dunlap , Shreeya Patel , Krzysztof Kozlowski , Jonathan Cameron , devicetree@vger.kernel.org, Zhigang Shi , Maxime Ripard , Heikki Krogerus , Lars-Peter Clausen , Paul Gazzillo , Maxime Ripard , =?iso-8859-1?Q?Ma=EDra?= Canal , Rob Herring , Dmitry Osipenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Javier Martinez Canillas , kunit-dev@googlegroups.com, Stephen Boyd , Emma Anholt , Liam Beguin , Greg Kroah-Hartman , Maarten Lankhorst , Thomas Zimmermann , Daniel Vetter , David Gow , "Rafael J. Wysocki" , Brendan Higgins , David Airlie , linux-kselftest@vger.kernel.org Subject: Re: [PATCH v5 0/8] Support ROHM BU27034 ALS sensor Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Wed, Mar 22, 2023 at 11:05:23AM +0200, Matti Vaittinen wrote: > Revision history: > v4 => v5: Mostly fixes to review comments from Andy and Jonathan. > - more accurate change-log in individual patches > - copy code from DRM test helper instead of moving it to simplify > merging 1) Why do you think this is a problem? 2) How would we avoid spreading more copies of the same code in the future? 1) Merge conflicts is not a bad thing. It shows that people tested their code in isolation and stabilized it before submitting to the upper maintainer. https://yarchive.net/comp/linux/git_merges_from_upstream.html 2) Spreading the same code when we _know_ this, should be very well justified. Merge conflict is an administrative point, and not a technical obstacle to avoid. > - document all exported GTS helpers. > - inline a few GTS helpers > - use again Milli lux for the bu27034 with RAW IIO_LIGHT channel and scale > - Fix bug from added in v4 bu27034 time setting. -- With Best Regards, Andy Shevchenko