linux-kernel - linux-next: manual merge of the tty tree with the mm 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-next>] [day] [month] [year] [list]

Message-ID: <20240426145540.1593f8f4@canb.auug.org.au>
Date: Fri, 26 Apr 2024 14:55:40 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Andrew Morton <akpm@...ux-foundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Greg Kroah-Hartman
 <gregkh@...uxfoundation.org>, "Jiri Slaby (SUSE)" <jirislaby@...nel.org>,
 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 tty tree with the mm tree

Hi all,

Today's linux-next merge of the tty tree got conflicts in:

  include/linux/kfifo.h
  lib/kfifo.c

between commit:

  a8372870a0ae ("kfifo: don't use "proxy" headers")

from the mm-nonmm-unstable branch of the mm tree and commit:

  d52b761e4b1a ("kfifo: add kfifo_dma_out_prepare_mapped()")

from the tty 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 include/linux/kfifo.h
index 6b28d642f332,d613748de7ff..000000000000
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@@ -36,15 -36,11 +36,16 @@@
   * to lock the reader.
   */
  
 +#include <linux/array_size.h>
+ #include <linux/dma-mapping.h>
 -#include <linux/kernel.h>
  #include <linux/spinlock.h>
  #include <linux/stddef.h>
 -#include <linux/scatterlist.h>
 +#include <linux/types.h>
 +
 +#include <asm/barrier.h>
 +#include <asm/errno.h>
 +
 +struct scatterlist;
  
  struct __kfifo {
  	unsigned int	in;
diff --cc lib/kfifo.c
index 15acdee4a8f3,75ce9225548a..000000000000
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@@ -5,13 -5,14 +5,14 @@@
   * Copyright (C) 2009/2010 Stefani Seibold <stefani@...bold.net>
   */
  
 -#include <linux/kernel.h>
+ #include <linux/dma-mapping.h>
 -#include <linux/export.h>
 -#include <linux/slab.h>
  #include <linux/err.h>
 -#include <linux/log2.h>
 -#include <linux/uaccess.h>
 +#include <linux/export.h>
  #include <linux/kfifo.h>
 +#include <linux/log2.h>
 +#include <linux/scatterlist.h>
 +#include <linux/slab.h>
 +#include <linux/uaccess.h>
  
  /*
   * internal helper to calculate the unused elements in a fifo

Content of type "application/pgp-signature" skipped