linux-kernel - linux-next: manual merge of the akpm tree with the kunit 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: <20191105204526.32f19975@canb.auug.org.au>
Date:   Tue, 5 Nov 2019 20:45:26 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Shuah Khan <skhan@...uxfoundation.org>,
        Brendan Higgins <brendanhiggins@...gle.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        David Gow <davidgow@...gle.com>
Subject: linux-next: manual merge of the akpm tree with the kunit tree

Hi all,

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

  MAINTAINERS
  lib/Kconfig.debug
  lib/Makefile
  lib/list-test.c

between commit:

  ea2dd7c0875e ("lib/list-test: add a test for the 'list' doubly linked list")

from the kunit tree and patch:

  "lib/list-test.c: add a test for the 'list' doubly linked list"

from the akpm tree.

I fixed it up (I just assume that these are different versions of the
same patch, so I just dropped the version in the akpm tree) 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