linux-kernel - Re: linux-next: manual merge of the iio tree with the char-misc.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250113142342.4578868a@canb.auug.org.au>
Date: Mon, 13 Jan 2025 14:23:42 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc: Jonathan Cameron <Jonathan.Cameron@...wei.com>, Javier Carrasco
 <javier.carrasco.cruz@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the iio tree with the
 char-misc.current tree

Hi all,

On Mon, 6 Jan 2025 15:21:07 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> Today's linux-next merge of the iio tree got a conflict in:
> 
>   drivers/iio/adc/ti-ads1119.c
> 
> between commit:
> 
>   54d394905c92 ("iio: adc: ti-ads1119: fix sample size in scan struct for triggered buffer")
> 
> from the char-misc.current tree and commit:
> 
>   2cfb4cd058d0 ("iio: adc: Use aligned_s64 instead of open coding alignment.")
> 
> from the iio 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/iio/adc/ti-ads1119.c
> index c268e27eec12,0a68ecdea4e6..000000000000
> --- a/drivers/iio/adc/ti-ads1119.c
> +++ b/drivers/iio/adc/ti-ads1119.c
> @@@ -500,8 -500,8 +500,8 @@@ static irqreturn_t ads1119_trigger_hand
>   	struct iio_dev *indio_dev = pf->indio_dev;
>   	struct ads1119_state *st = iio_priv(indio_dev);
>   	struct {
>  -		unsigned int sample;
>  +		s16 sample;
> - 		s64 timestamp __aligned(8);
> + 		aligned_s64 timestamp;
>   	} scan;
>   	unsigned int index;
>   	int ret;

This is now a conflict between the char-misc tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped