[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAMuHMdV6oZPBsuOyc_Pe=_rxJP3wPk65SfEdFEfqf5R-_RGqYA@mail.gmail.com>
Date: Tue, 29 Mar 2022 15:00:04 +0200
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Greg KH <gregkh@...uxfoundation.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Arnd Bergmann <arnd@...db.de>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Char/Misc and other driver updates for 5.18-rc1
On Mon, Mar 28, 2022 at 7:54 PM Greg KH <gregkh@...uxfoundation.org> wrote:
> The following changes since commit 7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3:
>
> Linux 5.17-rc6 (2022-02-27 14:36:33 -0800)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git tags/char-misc-5.18-rc1
>
> for you to fetch changes up to 37fd83916da2e4cae03d350015c82a67b1b334c4:
>
> firmware: google: Properly state IOMEM dependency (2022-03-18 14:18:15 +0100)
>
> ----------------------------------------------------------------
> Char/Misc and other driver updates for 5.18-rc1
>
> Here is the big set of char/misc and other small driver subsystem
> updates for 5.18-rc1.
>
> Included in here are merges from driver subsystems which contain:
> - iio driver updates and new drivers
> - fsi driver updates
> - fpga driver updates
> - habanalabs driver updates and support for new hardware
> - soundwire driver updates and new drivers
> - phy driver updates and new drivers
> - coresight driver updates
> - icc driver updates
>
> Individual changes include:
> - mei driver updates
> - interconnect driver updates
> - new PECI driver subsystem added
> - vmci driver updates
> - lots of tiny misc/char driver updates
>
> There will be two merge conflicts with your tree, one in MAINTAINERS
> which is obvious to fix up, and one in drivers/phy/freescale/Kconfig
> which also should be easy to resolve.
Unfortunately the conflict was resolved incorrectly (next-20220328
did have the correct resolution).
I've sent a patch to fix that.
https://lore.kernel.org/r/20220329125631.2915388-1-geert@linux-m68k.org/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Powered by blists - more mailing lists