Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Deepin-Kernel-SIG] [Upstream] Backport some commits by Uniontech from v6.12~v6.13 #514

Merged
merged 15 commits into from
Dec 4, 2024
Merged

[Deepin-Kernel-SIG] [Upstream] Backport some commits by Uniontech from v6.12~v6.13 #514

merged 15 commits into from
Dec 4, 2024

Conversation

Avenger-285714
Copy link
Collaborator

  • MIPS: loongson3_defconfig: Enable blk_dev_nvme by default
    MIPS: loongson3_defconfig: Update configs dependencies
    iio: accel: adxl355: Fix typo "accelaration"
    xhci: debugfs: Add virt endpoint state to xhci debugfs
    scripts/spelling.txt: add typo "exprienced" and "rewritting"
    leds: rgb: leds-group-multicolor: Correct the typo 'acccess'
    drm/amdgpu: Fix typo "acccess" and improve the comment style here
    platform/x86/intel/pmt: Correct the typo 'ACCCESS_LOCAL'
    HID: replace BUG_ON() with WARN_ON()
    arm64: dts: colibri-imx8x: Fix typo "rewritting"
    eth: Fix typo 'accelaration'. 'exprienced' and 'rewritting'
    erofs: simplify definition of the log functions
    crypto: qat - Fix typo "accelaration"
    ARM: 9435/1: ARM/nommu: Fix typo "absence"

Avenger-285714 and others added 14 commits December 4, 2024 15:23
@Avenger-285714
ARM: 9435/1: ARM/nommu: Fix typo "absence"
dc2aba4 
commit fb5af7d5405bf89a848819d1af007dfc73e9fb57 upstram.

There is a spelling mistake of 'absense' in comments which
should be 'absence'.

Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: WangYuli <[email protected]>
Reviewed-by: Vladimir Murzin <[email protected]>
Signed-off-by: Russell King (Oracle) <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
crypto: qat - Fix typo "accelaration"
813c967 
commit 2ab74b57bac72106ea00b0196e50f28b27cc0ae8 upstream.

There is a spelling mistake of 'accelaration' in comments which
should be 'acceleration'.

Signed-off-by: WangYuli <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
erofs: simplify definition of the log functions
d7e7bfa 
commit 90655ee279b299c33dc51be87787b54222d3d2fb upstream.

Use printk instead of pr_info/err to reduce
redundant code.

Signed-off-by: Gou Hao <[email protected]>
Reviewed-by: Gao Xiang <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Gao Xiang <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
eth: Fix typo 'accelaration'. 'exprienced' and 'rewritting'
265ba96 
commit 9e2ffec543b088b4c7dc24a40438cbd3426fb71c upstream.

There are some spelling mistakes of 'accelaration', 'exprienced' and
'rewritting' in comments which should be 'acceleration', 'experienced'
and 'rewriting'.

Suggested-by: Simon Horman <[email protected]>
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: WangYuli <[email protected]>
Reviewed-by: Donald Hunter <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Andrew Lunn <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
arm64: dts: colibri-imx8x: Fix typo "rewritting"
0abdefd 
commit 393271aa712a5b6292ae9122eec8e1b789a382b6 upstream.

There is a spelling mistake of 'rewritting' in comments which
should be 'rewriting'.

Suggested-by: Simon Horman <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Signed-off-by: Shawn Guo <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@matrix-wsk @Avenger-285714
HID: replace BUG_ON() with WARN_ON()
58eb403 
commit 2e592244c4874c5e7808ac27f62443e8ff87d901 upstream.

There is no need to kill the system entirely in HID with BUG_ON,
use WARN_ON to handle fault more gracefully which allow the system
to keep running.

Signed-off-by: He Lugang <[email protected]>
Signed-off-by: Jiri Kosina <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
platform/x86/intel/pmt: Correct the typo 'ACCCESS_LOCAL'
c13a530 
commit 31440fe70167a1014f2433eb64b9888a24b30fd3 upstream.

There is a spelling mistake of 'ACCCESS_LOCAL' which should be
'ACCESS_LOCAL'.

Cc: Thomas Zimmermann <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Reviewed-by: Ilpo Järvinen <[email protected]>
Signed-off-by: Ilpo Järvinen <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
drm/amdgpu: Fix typo "acccess" and improve the comment style here
93e6139 
commit 307b4ab7baf3cf53b3aecc5330a2b0e3fd357371 upstream.

There are some spelling mistakes of 'acccess' in comments which
should be instead of 'access'.

And the comment style should be like this:
 /*
  * Text
  * Text
  */

Suggested-by: Christian König <[email protected]>
Link: https://lore.kernel.org/all/[email protected]/
Acked-by: Thomas Zimmermann <[email protected]>
Link: https://lore.kernel.org/all/[email protected]/
Reviewed-by: Christian König <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
leds: rgb: leds-group-multicolor: Correct the typo 'acccess'
86d05eb 
commit da0806e4e886a58ad258720042cb5b1fe32de728 upstream.

There is a spelling mistake of 'acccess' which should be instead of
'access'.

Signed-off-by: WangYuli <[email protected]>
Acked-by: Thomas Zimmermann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Lee Jones <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
scripts/spelling.txt: add typo "exprienced" and "rewritting"
f2cb7ce 
commit f3adb88e6c0b50e18dab3d58b1d6c5abd35dfcf7 upstream.

Add typo "exprienced" and "rewritting".
They were found and fixed in follow patches:

Link: https://lore.kernel.org/all/[email protected]/
Link: https://lore.kernel.org/all/[email protected]/
Link: https://lkml.kernel.org/r/[email protected]
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: WangYuli <[email protected]>
Suggested-by: Simon Horman <[email protected]>
Reviewed-by: Simon Horman <[email protected]>
Cc: Colin Ian King <[email protected]>
Cc: Jesse Brandeburg <[email protected]>
Cc: WangYuli <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
xhci: debugfs: Add virt endpoint state to xhci debugfs
af90ebb 
commit 6d00b6142d8e22b2bcd7532546830984b421e583 upstream.

The ring data structure of each xHCI endpoint might stop sending
data due to the virt endpoint state.

Show the virt endpoint state within the endpoint context via debugfs
to facilitate debugging.

Co-developed-by: Xu Rao <[email protected]>
Signed-off-by: Xu Rao <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Signed-off-by: Mathias Nyman <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
iio: accel: adxl355: Fix typo "accelaration"
615d674 
commit 640e98384fb14c7013d3305fcf2d5d46908d90a0 upstream.

There is a spelling mistake of 'accelaration' in comments which
should be 'acceleration'.

Signed-off-by: WangYuli <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jonathan Cameron <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
MIPS: loongson3_defconfig: Update configs dependencies
3f2d3a5 
commit 5cf28d2595a301863b60b880fd45359d28fa7d73 upstream.

Due to long-term changes in kernel build configurations,
run 'make savedefconfig' to update the build configuration
dependencies.

This commit does not affect the actual .config file content,
in preparation for future modifications to loongson3_defconfig.

Signed-off-by: WangYuli <[email protected]>
Signed-off-by: Thomas Bogendoerfer <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@Avenger-285714
MIPS: loongson3_defconfig: Enable blk_dev_nvme by default
c9a736e 
commit f67a922230e898dc7f399cf14489e513224d6c4b upstream.

A significant number of 3A4000 machines come with NVMe drives
pre-installed, so we should support it in its defconfig.

Tested-by: Erpeng Xu <[email protected]>
Tested-by: Qiang Ma <[email protected]>
Signed-off-by: WangYuli <[email protected]>
Signed-off-by: Thomas Bogendoerfer <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from avenger-285714. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot
Copy link

deepin pr auto review

代码审查意见：

  1. 在arch/arm/mm/dma-mapping-nommu.c文件中，将absense更正为absence，以修正拼写错误。
  2. 在arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi文件中，将rewritting更正为rewriting，以修正拼写错误。
  3. 在arch/mips/configs/loongson3_defconfig文件中，移除了CONFIG_BPF_SYSCALL和CONFIG_BPF_JIT的注释，这可能会影响内核的配置。建议确认是否故意移除这些配置，并确保移除这些配置不会影响内核的功能。
  4. 在drivers/crypto/intel/qat/qat_common/qat_hal.c文件中，注释中的accelaration更正为acceleration，以修正拼写错误。
  5. 在drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c和drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c文件中，注释中的accrss更正为access，以修正拼写错误。
  6. 在drivers/hid/hid-cp2112.c、drivers/hid/hid-lg4ff.c和drivers/hid/hid-sony.c文件中，使用WARN_ON代替BUG_ON，以避免在调试过程中导致系统崩溃。同时，添加了返回值以处理错误情况。
  7. 在drivers/iio/accel/adxl355_core.c文件中，注释中的accelaration更正为acceleration，以修正拼写错误。
  8. 在drivers/leds/rgb/leds-group-multicolor.c文件中，注释中的accrss更正为access，以修正拼写错误。
  9. 在drivers/net/ethernet/broadcom/bnxt/bnxt.c、drivers/net/ethernet/broadcom/tg3.c、drivers/net/ethernet/neterion/s2io.c文件中，注释中的exprienced更正为experienced，以修正拼写错误。
  10. 在drivers/platform/x86/intel/pmt/class.c文件中，注释中的ACCCESS_LOCAL更正为ACCESS_LOCAL，以修正拼写错误。
  11. 在drivers/usb/host/xhci-debugfs.c文件中，添加了dev->eps[ep_index].ep_state的打印，以提供更多的调试信息。
  12. 在fs/erofs/internal.h和fs/erofs/super.c文件中，移除了_erofs_err和_erofs_info函数的定义，并使用_erofs_printk函数替代，以简化代码并保持一致性。
  13. 在scripts/spelling.txt文件中，添加了exprienced到拼写检查列表中，以修正拼写错误。

总体来说，这些修改提高了代码的可读性和准确性，并修复了一些拼写错误。同时，对于移除CONFIG_BPF_SYSCALL和CONFIG_BPF_JIT的配置，需要进一步确认是否故意移除，并确保移除这些配置不会影响内核的功能。

@Avenger-285714 Avenger-285714 merged commit fb10083 into deepin-community:linux-6.6.y Dec 4, 2024
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chenchongbiao chenchongbiao Awaiting requested review from chenchongbiao

@hello666888999 hello666888999 Awaiting requested review from hello666888999

@Ink-Paper Ink-Paper Awaiting requested review from Ink-Paper

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Avenger-285714 @deepin-ci-robot @matrix-wsk