linux-kernel - Re: linux-next: Tree for Dec 30

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-prev] [day] [month] [year] [list]

Message-ID: <6cf8cccc-0c73-1937-1ede-e3cf4b91aa40@suse.cz>
Date:   Fri, 30 Dec 2022 22:21:28 +0100
From:   Vlastimil Babka <vbabka@...e.cz>
To:     Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Dmitry Osipenko <dmitry.osipenko@...labora.com>,
        Joel Stanley <joel@....id.au>,
        Alex Deucher <alexander.deucher@....com>,
        Ard Biesheuvel <ardb@...nel.org>,
        Matthew Wilcox <willy@...radead.org>
Subject: Re: linux-next: Tree for Dec 30

On 12/30/22 11:30, Uwe Kleine-König wrote:
>  - In various files below mm/ between
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
> 	???
> 
>    and
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git for-next
> 	???

That's weird, because slab.git for-next is still exactly what was merged to
6.2-rc1, so when I try to merge it to master I just get "Already up to date."

>    I didn't feel confident to fix this conflict correctly and skipped merging the slab tree.

Nothing is lost then, but maybe it indicates some issue with your approach?
(didn't try to replicate it in full)

>  - In various files belwo mm/ between
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
> 	???
> 
>    and
> 
> 	git://git.infradead.org/users/willy/pagecache.git for-next
> 	???
> 
>    As above I didn't even try to fix these up and skipped merging the folio tree
> 
> Best regards
> Uwe
>