linux-kernel - linux-next: manual merge of the set

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: <20200727210137.01a5d03d@canb.auug.org.au>
Date:   Mon, 27 Jul 2020 21:01:37 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christoph Hellwig <hch@....de>, Sebastian Reichel <sre@...nel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Yongqiang Liu <liuyongqiang13@...wei.com>
Subject: linux-next: manual merge of the set_fs tree with the battery tree

Hi all,

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

  drivers/power/supply/da9030_battery.c

between commit:

  9d832cd36c60 ("power: Convert to DEFINE_SHOW_ATTRIBUTE")

from the battery tree and commit:

  4d4901c6d748 ("seq_file: switch over direct seq_read method calls to seq_read_iter")

from the set_fs tree.

I fixed it up (I just used the former) 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