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

Date:   Mon, 28 Nov 2022 12:07:12 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Mauro Carvalho Chehab <mchehab@...nel.org>
Cc:     Dave Hansen <dave.hansen@...ux.intel.com>,
        Hans de Goede <hdegoede@...hat.com>,
        "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.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 tip tree with the v4l-dvb-next tree

Hi all,

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

  drivers/staging/media/atomisp/pci/hmm/hmm_bo.c

between commit:

  f5cb5adaa8ec ("media: atomisp: Drop userptr support from hmm")

from the v4l-dvb-next tree and commit:

  062c9b2996e9 ("mm: Pass down mm_struct to untagged_addr()")

from the tip tree.

I fixed it up (the fomer removed the line 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