From: Vlastimil Babka <vbabka@suse•cz>
To: "Uwe Kleine-König" <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>
Subject: Re: linux-next: Tree for Dec 30
Date: Fri, 30 Dec 2022 22:21:28 +0100 [thread overview]
Message-ID: <6cf8cccc-0c73-1937-1ede-e3cf4b91aa40@suse.cz> (raw)
In-Reply-To: <20221230103016.ebcjz7lky7wfkz6h@pengutronix.de>
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
>
prev parent reply other threads:[~2022-12-30 21:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 10:30 linux-next: Tree for Dec 30 Uwe Kleine-König
2022-12-30 21:21 ` Vlastimil Babka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6cf8cccc-0c73-1937-1ede-e3cf4b91aa40@suse.cz \
--to=vbabka@suse$(echo .)cz \
--cc=alexander.deucher@amd$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=dmitry.osipenko@collabora$(echo .)com \
--cc=joel@jms$(echo .)id.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
--cc=willy@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox