Received-SPF: pass (google.com: domain of linux-kernel+bounces-32119-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Sun, 21 Jan 2024 16:49:17 +0000
From: Jonathan Cameron <jic23@kernel.org>
To: Matti Vaittinen <mazziesaccount@gmail.com>
Cc: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>, Lars-Peter Clausen
 <lars@metafoo.de>, linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org
Subject: Re: [PATCH v2 2/2] MAINTAINERS: add IIO GTS tests
Message-ID: <20240121164901.6a4707ff@jic23-huawei>
In-Reply-To: <52c66fe2798192529738ac2ab98a27230a6ad8cd.1705328293.git.mazziesaccount@gmail.com>
References: <cover.1705328293.git.mazziesaccount@gmail.com>
	<52c66fe2798192529738ac2ab98a27230a6ad8cd.1705328293.git.mazziesaccount@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Mon, 15 Jan 2024 16:26:33 +0200
Matti Vaittinen <mazziesaccount@gmail.com> wrote:

> Add undersigned as a maintainer for IIO GTS helper's KUnit tests.
> 
> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
> 
> ---
> This may or may not conflict with the filename fix here:
> https://lore.kernel.org/all/CAO=gReFVhp7QK_XZRBO5vbv6fmFb4BdsZeQPSzWvuiz9UeQekA@mail.gmail.com/
> 
> Conflict should be very trivial so I didn't wait for the above fix to
> get in IIO tree. I can rebase and resend if this appears to be a problem
> though.
> ---
>  MAINTAINERS | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 40c754b4c39c..05c13e0f8c4d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -10310,6 +10310,7 @@ L:	linux-iio@vger.kernel.org
>  S:	Maintained
>  F:	drivers/iio/light/gain-time-scale-helper.c
>  F:	drivers/iio/light/gain-time-scale-helper.h
> +F:	drivers/iio/test/iio-test-gts.c
This needed a manual merge as you pointed out.

Otherwise all lgtm and applied to the togreg branch of iio.git.

It's on an odd base as the moment though so I'll rebase on rc1 once available.

Thanks,

Jonathan

>  
>  IIO MULTIPLEXER
>  M:	Peter Rosin <peda@axentia.se>