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-next>] [day] [month] [year] [list]
Message-ID: <20240108143627.29ac91fe@canb.auug.org.au>
Date: Mon, 8 Jan 2024 14:36:27 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Yury Norov <yury.norov@...il.com>, Greg KH <greg@...ah.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Hugo Villeneuve
 <hvilleneuve@...onoff.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bitmap tree with the tty tree

Hi all,

Today's linux-next merge of the bitmap tree got a conflict in:

  drivers/tty/serial/sc16is7xx.c

between commits:

  8a1060ce9749 ("serial: sc16is7xx: fix invalid sc16is7xx_lines bitfield in case of probe error")
  3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using one regmap per port")

from the tty tree and commit:

  e63a961be48f ("serial: sc12is7xx: optimize sc16is7xx_alloc_line()")

from the bitmap tree.

I fixed it up (the former removed the function updated by the latter) 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

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ