Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <6cf8cccc-0c73-1937-1ede-e3cf4b91aa40@suse.cz>
Date:   Fri, 30 Dec 2022 22:21:28 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: linux-next: Tree for Dec 30
To:     =?UTF-8?Q?Uwe_Kleine-K=c3=b6nig?= <u.kleine-koenig@pengutronix.de>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Dmitry Osipenko <dmitry.osipenko@collabora.com>,
        Joel Stanley <joel@jms.id.au>,
        Alex Deucher <alexander.deucher@amd.com>,
        Ard Biesheuvel <ardb@kernel.org>,
        Matthew Wilcox <willy@infradead.org>
References: <20221230103016.ebcjz7lky7wfkz6h@pengutronix.de>
Content-Language: en-US
From:   Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <20221230103016.ebcjz7lky7wfkz6h@pengutronix.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

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
>