hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I737X1

-------------------------------

Expand qos_level from {-1,0} to [-2, 2], to distinguish the tasks expected
to be with extremely high or low priority level. Using qos_level_weight
to reweight the shares when calculating group's weight. Meanwhile,
set offline task's schedule policy to SCHED_IDLE so that it can be
preempted at check_preempt_wakeup.
Signed-off-by: NZhao Wenhui <zhaowenhui8@huawei.com>

m1600-dirver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6RNK1
CVE: NA

--------------------------------

The m1600 smart NIC is a series of network interface card
for the Data Center Area. The m1600 network card supports
checksum, sriov and other hardware offloading.
Signed-off-by: NYi Chen <open@nebula-matrix.com>

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6N4EP
CVE: NA

--------------------------------

This reverts commit fc3bfef5.

This commit causes the interface to change.

Fixes: fc3bfef5 ("config: enable bcache for x86 by default")
Signed-off-by: NChao Zhu <tom_toworld@163.com>

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6N4EP
CVE: NA

--------------------------------

openEuler supports bcache by default on x86 platforms
Signed-off-by: NChao Zhu <tom_toworld@163.com>

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6SIY2

-------------------------------
Signed-off-by: NGuan Jing <guanjing6@huawei.com>

hulk inclusion
category: feature
bugzilla: 186575, https://gitee.com/openeuler/kernel/issues/I526XC

--------------------------------
Signed-off-by: Ntanghui <tanghui20@huawei.com>
Signed-off-by: NZheng Zucheng <zhengzucheng@huawei.com>
Reviewed-by: NZhang Qiao <zhangqiao22@huawei.com>

euleros inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5HF3M
CVE: NA

Reference: https://gitee.com/openeuler/kernel/pulls/41

--------------------------------

set CONFIG_QOS_SCHED_PRIO_LB to y:

This feature enable priority load balance
for QoS scheduler, which prefer migrating online tasks
and migrating offline tasks secondly.
Signed-off-by: Nzhangsong <zhangsong34@huawei.com>

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6HNB8
CVE: N/A

Intel-SIG: openeuler_defconfig: Enable ACPI Platform Runtime
Mechanism(PRM) feature support

--------------------------------------------

Enable ACPI Platform Runtime Mechanism(PRM) feature support by default.

For the purpose to validate PRM from user space, set:
- CONFIG_ACPI_DEBUGGER = y
- CONFIG_ACPI_DEBUGGER_USER = m
Signed-off-by: NAubrey Li <aubrey.li@linux.intel.com>

Ramaxel inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I63SYR
CVE: NA

----------------------------------

The project is stopped and the hardware will not be available
in the market. So remove the driver.
Signed-off-by: NYanling Song <songyl@ramaxel.com>

3snic inclusion
category: feature
feature: sssraid
bugzilla: https://gitee.com/openeuler/kernel/issues/I64M90
CVE: NA

------------------------------------------

This commit is to support 3SNIC 3S5XX RAID/HBA controllers.
RAID controllers support RAID 0/1/5/6/10/50/60 modes;
HBA controlllers support RAID 0/1/10 modes.
RAID/HBA support SAS/SATA HDD/SSD.
Signed-off-by: Nliangry <liangry1@3snic.com>
Reviewed-by: Jiang Yu<yujiang@3snic.com>
Reviewed-by: NSteven Song <steven.song@3snic.com>
Signed-off-by: NSteven Song <steven.song@3snic.com>

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64MOK
CVE: NA

--------------------------------

There is priority inversion problem, so we disable
CONFIG_QOS_SMT_EXPELLER temporary until we fix it.
Signed-off-by: NGuan Jing <guanjing6@huawei.com>

Intel inclusion
category: feature
feature: Intel In Filed Scan(IFS)
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I651S7
CVE: N/A

Intel-SIG: openeuler_defconfig: Enable Intel In Field Scan(IFS) as kernel module

--------------------------------------------

Enable Intel In Field Scan(IFS) as kernel module in openeuler_defconfig.
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5Y6RT
CVE: NA

Bugfix：
1.add cl72_prbs control
2.fix bug of backplane down restart an73
3.fix speed change bug of marvell xaui phy
when executing "ethtool -s ethName"
4.fix bug of mac related register configurations in kx4/kx mode
5.adjust input parameters in configure file
6.fix bug of "ethtool -p" function with ocp card
7.fix QinQ TCP/UDP packet traffic bug
8.fix bug of autonegoation between KR board and botong switch chip
9.add support for "ethtool -N xxx ... action"
10.fix bug when in kr mode, core dumping will
occasionally happen while os is booting up
11.add support for "ethtool -f xxx" to burn firmware
12.fix flow director udp port match function bug
13.fix bug of "ethtool -f"
14.fix bug of the case that link down event in kr mode
may occasionally cause kernel call trace in kr mode
15.change flow director default mode from perfect mode
to signature mode so that queue vectors
can be bound to cpus automatically
16.add FEC support in kr mode
17.add support for led and polarity configuration in firmware.
18.add NETDEV_F_HW_CSUM feature support
19.turn on/off led light when execute "ifconfig up/down"
20.fix bug of geneve dst port error setting
when enable geneve hw offload
21.fix bug of advertise speed error showing by "ethtool -s"
22.fix bug of vxlan/geneve hw offload feature.
23.Add support for vxlan/geneve port number
setting in hardware register.
24.add support for oem ssid and svid.
25.add inspur oem ssid 0x0075 support for "ethtool -p".
26.add flash unlock when upgrading image

Net-Swift Official Website:
https://www.net-swift.comSigned-off-by: NDuanqiangWen <duanqiangwen@net-swift.com>

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I61PSD
CVE: NA

set NGBE_DEBUG_FS、NGBE_POLL_LINK_STATUS、NGBE_SYSFS
default config in x86/arm64 arch
Signed-off-by: NDuanqiang Wen <duanqiangwen@net-swift.com>

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I61PSD
CVE: NA

1.add CONFIG_NETSWIFT_NGBE=m in x64/arm64 openeuler_defconfig
2.add config for ngbe module in netswift Kconfig
Signed-off-by: NDuanqiang Wen <duanqiangwen@net-swift.com>

Some configs' values are incorrect, use update_oedefconfig fix it.
Signed-off-by: NLiu Chao <liuchao173@huawei.com>

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5F6X6
CVE: NA

--------------------------------

Enable CONFIG_BPF_SCHED for x86 by default.
Signed-off-by: NRen Zhijie <renzhijie2@huawei.com>
Signed-off-by: NHui Tang <tanghui20@huawei.com>

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I61AXT
CVE: N/A

Within uprobe handlers, the pc register could be
modified. In this situation, there is no need to
do a single stepping. Just like the kprobe, we
skip it.
Signed-off-by: NLongjun Luo <luolongjun@huawei.com>

category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I596WO
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel IDXD driver.

--------------------------------------------

Enable necessary kernel configs for Intel IDXD driver in
openeuler_defconfig for Intel DSA/IAA features.
Signed-off-by: NXiaochen Shen <xiaochen.shen@intel.com>

hulkl inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZG61

-------------------------------

In cgroupv1, cgroup writeback is not supproted for two problems:
1) Blkcg_css and memcg_css are mounted on different cgroup trees.
   Therefore, blkcg_css cannot be found according to a certain memcg_css.
2) Buffer I/O is worked by kthread, which is in the root_blkcg.
   Therefore, blkcg cannot limit wbps and wiops of buffer I/O.

We solve the two problems to support cgroup writeback on cgroupv1.
1) A memcg is attached to the blkcg_root css when the memcg was created.
2) We add a member "wb_blkio_ino" in mem_cgroup_legacy_files.
   User can attach a memcg to a cerntain blkcg through echo the file
   inode of the blkcg into the wb_blkio of the memcg.
3) inode_cgwb_enabled() return true when memcg and io are both mounted
   on cgroupv2 or both on cgroupv1.
4) Buffer I/O can find a blkcg according to its memcg.

Thus, a memcg can find a certain blkcg, and cgroup writeback can be
supported on cgroupv1.
Signed-off-by: NLu Jialin <lujialin4@huawei.com>

Intel inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5MJBR
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel AMX

--------------------------------------------

Enable necessary kernel configs for Intel AMX in openeuler_defconfig.
Reviewed-by: NLin Wang <lin.x.wang@intel.com>
Signed-off-by: NJason Zeng <jason.zeng@intel.com>
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

Intel inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5MJBR
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel NTB LTR vendor support for gen4 NTB

--------------------------------------------

Enable necessary kernel configs for Intel NTB LTR vendor support for gen4 NTB in openeuler_defconfig.
Reviewed-by: NWu Zheng <wu.zheng@intel.com>
Signed-off-by: NJason Zeng <jason.zeng@intel.com>
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

Intel inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5MJBR
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel SPR HFI

--------------------------------------------

Enable necessary kernel configs for Intel SPR HFI in openeuler_defconfig.
Signed-off-by: NJason Zeng <jason.zeng@intel.com>
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

Intel inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5MJBR
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel PMT

--------------------------------------------

Enable necessary kernel configs for Intel PMT in openeuler_defconfig.
Signed-off-by: NJason Zeng <jason.zeng@intel.com>
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

Intel inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I5MJBR
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel SGX virtualization

--------------------------------------------

Enable necessary kernel configs for Intel SGX virtualization in openeuler_defconfig.
Reviewed-by: NZhiquan Li <zhiquan1.li@intel.com>
Signed-off-by: NJason Zeng <jason.zeng@intel.com>
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

Intel inclusion
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I610P3
CVE: NA

Intel-SIG: openeuler_defconfig: Enable configs for Intel Emmitsburg pinctrl

--------------------------------------------

Enable necessary kernel configs for Intel Emmitsburg pinctrl in
openeuler_defconfig.
Signed-off-by: NAichun Shi <aichun.shi@intel.com>

hulk inclusion
category: feature
bugzilla: 186841, https://gitee.com/openeuler/kernel/issues/I61188
CVE: NA

--------------------------------

Enable CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE by default.
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

openeuler inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6202L
CVE: NA

1. set CONFIG_CRYPTO_SM2/3 to y:
The module signature based on SM2 cert has been supported now.
So the SM2/3 should be enabled by default to support SM2 cert
in kernel boot process.

2. set CONFIG_CRYPTO_SM3_GENERIC to y:
sm3-generic is architecture independent and should be build
in case other modules fail.

3. set CONFIG_CRYPTO_SM4_GENERIC to m:
sm4-generic is architecture independent and should be build
in case other modules fail.

4. enable algorithm implementations related to architecture:
Enable SM4-CE, SM4-NEON, SM3-AVX to imporve algorithm
performance.
Signed-off-by: Nluhuaxin <luhuaxin1@huawei.com>

zhaoxin inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5SMFS
CVE: NA

--------------------------------------------

Set CONFIG_HW_RANDOM_ZHAOXIN to 'm' by default in openeuler_configs
Signed-off-by: Nleoliuoc <leoliu-oc@zhaoxin.com>

amd inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ZIMJ
CVE: NA

--------------------------------

Enable AMD perf branch sample feauture in x86 openeuler defconfig.
It's implemented as a bool type option, must set 'y' to enable it.
Signed-off-by: NXie Haocheng <haocheng.xie@amd.com>

amd inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5YNPT
CVE: NA

--------------------------------

Enable AMD Host System Management Port feauture built as a moudle
in x86 openeuler defconfig.
Signed-off-by: NXie Haocheng <haocheng.xie@amd.com>

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I53Q6M
CVE: NA

--------------------------------

openEuler need detect conflict of opening block device, so
enable it as default.
Signed-off-by: NLi Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: NZhang Yi <yi.zhang@huawei.com>
Reviewed-by: NChao Liu <liuchao173@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

euleros inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5DC4A
CVE: NA

--------------------------------

enable CONFIG_ETMEM by default.
Signed-off-by: Nliubo <liubo254@huawei.com>
Reviewed-by: NMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: NChao Liu <liuchao173@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5JMOU
CVE: NA

--------------------------------

if the NLS_CODEPAGE_437.ko does not exist in the bootrom system, but the
vfat filesystem depends on the NLS_CODEPAGE_437 module, the /boot/efi fails
to be mounted.
Change the value of NLS_CODEPAGE_437 from m to y in arch/arm64/configs
/openeuler_defconfig and arch/x86/configs/openeuler_defconfig.
Signed-off-by: Nzhanchengbin <zhanchengbin1@huawei.com>

mainline inclusion
from mainline-v5.19-rc1
commit 47010c04
category: feature
bugzilla: 187198, https://gitee.com/openeuler/kernel/issues/I5GVFO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=47010c040dec8af6347ec6259104fc13f7e7e30a

--------------------------------

The word of "free" is not expressive enough to express the feature of
optimizing vmemmap pages associated with each HugeTLB, rename this keywork
to "optimize".  In this patch , cheanup configs to make code more
expressive.

Link: https://lkml.kernel.org/r/20220404074652.68024-4-songmuchun@bytedance.comSigned-off-by: NMuchun Song <songmuchun@bytedance.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Conflicts:
	arch/arm64/configs/openeuler_defconfig
	arch/x86/configs/openeuler_defconfig
	Documentation/admin-guide/kernel-parameters.txt
	include/linux/hugetlb.h
	mm/Makefile
Signed-off-by: NLiu Shixin <liushixin2@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

zhaoxin inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I52DS7
CVE: NA

--------------------------------------------

Set CONFIG_SENSORS_ZHAOXIN_CPUTEMP to 'm' by default in
openeuler_defconfig.
Signed-off-by: NLeoLiuoc <LeoLiu-oc@zhaoxin.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I59Q07
CVE: NA

--------------------------------

Simple DMA test client. Say N unless you're debugging a DMA Device driver.
It doesn't need to be compiled into the vmlinux, change it to m.
Signed-off-by: NChao Liu <liuchao173@huawei.com>
Reviewed-by: NKai Liu <kai.liu@suse.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I52611
CVE: NA
Signed-off-by: NGuan Jing <guanjing6@huawei.com>
Reviewed-by: NChen Hui <judy.chenhui@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

hulk inclusion
category: feature
bugzilla: 186182, https://gitee.com/openeuler/kernel/issues/I4UOJI
CVE: NA

--------------------------------

enable CONFIG_MEMCG_MEMFS_INFO by default.
Signed-off-by: NLiu Shixin <liushixin2@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

Ramaxel inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4ZR0O
CVE: NA

----------------------------------

There are some issues of the driver that cannot be fixed now.
The driver is not good enough for the LTS quality requirements
of openEuler，so remove it.
Signed-off-by: NYanling Song <songyl@ramaxel.com>
Reviewed-by: NYang Gan <yanggan@ramaxel.com>
Acked-by: NXie Xiuqi <xiexiuqi@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>