linux-kernel - Re: [PATCH] soc: canaan: Sort the Makefile alphabetically

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <mhng-987a3cd7-9d3e-4471-b47a-67aa97629e7b@palmerdabbelt-glaptop>
Date:   Mon, 22 Feb 2021 18:58:21 -0800 (PST)
From:   Palmer Dabbelt <palmer@...belt.com>
To:     Damien Le Moal <Damien.LeMoal@....com>
CC:     linux-riscv@...ts.infradead.org,
        pczarnecki@...ernships.antmicro.com, leonard.crestez@....com,
        peng.fan@....com, joel@....id.au, linux-kernel@...r.kernel.org,
        kernel-team@...roid.com
Subject:     Re: [PATCH] soc: canaan: Sort the Makefile alphabetically

On Mon, 22 Feb 2021 18:31:43 PST (-0800), Damien Le Moal wrote:
> On 2021/02/23 11:19, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <palmerdabbelt@...gle.com>
> 
> The rest of these are alphabetically sorted, and leaving it this way
> causes a merge conflict.
> 
> Signed-off-by: Palmer Dabbelt <palmerdabbelt@...gle.com>
> 
> ---
> 
> I missed this when reviewing these patches, but happened across it when
> test merging from Linus' tree.  It goes back a way so I'm hesitant to
> rebase this one out just for cleanliness, but if I have to go back that
> far before sending the merge window PR I'll squash it in.
> ---
>  drivers/soc/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
> index fa7071246546..34b23645be14 100644
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@ -7,6 +7,7 @@ obj-$(CONFIG_ARCH_ACTIONS)	+= actions/
>  obj-y				+= aspeed/
>  obj-$(CONFIG_ARCH_AT91)		+= atmel/
>  obj-y				+= bcm/
> +obj-$(CONFIG_SOC_CANAAN)	+= canaan/
>  obj-$(CONFIG_ARCH_DOVE)		+= dove/
>  obj-$(CONFIG_MACH_DOVE)		+= dove/
>  obj-y				+= fsl/
> @@ -29,4 +30,3 @@ obj-$(CONFIG_ARCH_U8500)	+= ux500/
>  obj-$(CONFIG_PLAT_VERSATILE)	+= versatile/
>  obj-y				+= xilinx/
>  obj-$(CONFIG_ARCH_ZX)		+= zte/
> -obj-$(CONFIG_SOC_CANAAN)	+= canaan/
> 
>
> Yes. Should have sent that... Thanks.
>
> Reviewed-by: Damien Le Moal <damien.lemoal@....com>

No problem, it's on for-next.