The pull request you sent on Thu, 31 Aug 2023 22:42:24 +1000:
> https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
> tags/powerpc-6.6-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4ad0a4c2343d3981e92df2b39fa262be62a9091a
Thank you!
--
Deet-doot-do
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Hi Linus,
Please pull powerpc updates for 6.6.
There's a conflict in drivers/net/ethernet/freescale/fs_enet/fs_enet.h, where
the correct resolution is to drop the include of both linux/fs_enet_pd.h and
asm/fs_pd.h.
There's a trivial conflict in a