From: Palmer Dabbelt <palmer@dabbelt.com>
To: linux-riscv@lists.infradead.org
Cc: Palmer Dabbelt <palmerdabbelt@google.com>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
pczarnecki@internships.antmicro.com, leonard.crestez@nxp.com,
peng.fan@nxp.com, joel@jms.id.au, linux-kernel@vger.kernel.org,
kernel-team@android.com
Subject: [PATCH] soc: canaan: Sort the Makefile alphabetically
Date: Mon, 22 Feb 2021 18:18:58 -0800 [thread overview]
Message-ID: <20210223021858.3809234-1-palmer@dabbelt.com> (raw)
From: Palmer Dabbelt <palmerdabbelt@google.com>
The rest of these are alphabetically sorted, and leaving it this way
causes a merge conflict.
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.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/
--
2.30.0.617.g56c4b15f3c-goog
next reply other threads:[~2021-02-23 2:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 2:18 Palmer Dabbelt [this message]
2021-02-23 2:31 ` [PATCH] soc: canaan: Sort the Makefile alphabetically Damien Le Moal
2021-02-23 2:58 ` Palmer Dabbelt
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=20210223021858.3809234-1-palmer@dabbelt.com \
--to=palmer@dabbelt.com \
--cc=Damien.LeMoal@wdc.com \
--cc=joel@jms.id.au \
--cc=kernel-team@android.com \
--cc=leonard.crestez@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmerdabbelt@google.com \
--cc=pczarnecki@internships.antmicro.com \
--cc=peng.fan@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).