linux-kernel - Re: linux-next: manual merge of the tty tree with the slave-dma tree

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 7 Apr 2015 14:27:30 +0200
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Greg KH <greg@...ah.com>, Vinod Koul <vinod.koul@...el.com>,
	Linux-Next <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Xuelin Shi <xuelin.shi@...escale.com>
Subject: Re: linux-next: manual merge of the tty tree with the slave-dma tree

On Tue, Apr 7, 2015 at 11:28 AM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@@ -112,17 -125,8 +112,19 @@@ config FSL_DM
>           EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the Elo3 is on
>           some Txxx and Bxxx parts.
>
>  +config FSL_RAID
>  +        tristate "Freescale RAID engine Support"
>  +        depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
>  +        select DMA_ENGINE
>  +        select DMA_ENGINE_RAID
>  +        ---help---
>  +          Enable support for Freescale RAID Engine. RAID Engine is
>  +          available on some QorIQ SoCs (like P5020/P5040). It has
>  +          the capability to offload memcpy, xor and pq computation
>  +        for raid5/6.
>  +
> + source "drivers/dma/hsu/Kconfig"
> +
>   config MPC512X_DMA
>         tristate "Freescale MPC512x built-in DMA engine support"
>         depends on PPC_MPC512x || PPC_MPC831x

Does anyone care about sort order?
The hsu entry ended up in the middle of the Freescale section.

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/