summaryrefslogtreecommitdiff
path: root/samples/mei
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-05-10 15:34:50 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-13 20:31:44 +0200
commit7d5b2cbe7a8f918641e9c69f07bc2fe0989221a0 (patch)
treecdf036137ae15dbb064c489dcc48d6774b4650bd /samples/mei
parent6efb943b8616ec53a5e444193dccf1af9ad627b5 (diff)
comedi: remove editor modelines and cruft (again)
Commit fa60ce2cb450 ("treewide: remove editor modelines and cruft") is different from what I submitted. My original patch [1] did treewide cleanups including the comedi driver. Unfortunately, commit 8ffdff6a8cfb ("staging: comedi: move out of staging directory") moved drivers/staging/comedi/ to drivers/comedi/ before my patch landed on Linus' tree from akpm tree. If Andrew Morton had used Git, 'git merge' would have resolved such file moves properly without any manual intervention. Patches in akpm tree often get broken in his quilt workflows, and then people end up with sending fixup patches. [1] https://lkml.kernel.org/r/20210324054457.1477489-1-masahiroy@kernel.org Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Link: https://lore.kernel.org/r/20210510063450.412055-1-masahiroy@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'samples/mei')
0 files changed, 0 insertions, 0 deletions