A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-25 06:03:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge tag 'LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4 into android13-5.4-lahaina

Browse source 
"LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-23300-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/kernel/msm-5.4:
  coresight: Fix duplicate and abnormal stop issues of PCIE sw path
  nl80211: fix beacon tx rate mask validation
  msm_ipa: Add flag to enable ipv6 option header
  soc:qcom: trivial fix
  soc: qcom: socinfo: Add sku sysfs support
  soc: qcom: socinfo: Add revision 16 support in socinfo structure
  mtd: msm_qpic_nand: Add mutex lock in system suspend/resume functions

 Conflicts:
	drivers/firmware/qcom_scm.c
	drivers/md/dm-verity-target.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/debugfs.c
	drivers/usb/gadget/function/f_fs.c

Change-Id: If237dbcd440d72c0a56ed7ca57f1d55a777973a5
This commit is contained in:
Michael Bestas 2023-12-11 20:34:10 +02:00
commit 0013ddf520
No known key found for this signature in database
GPG key ID: CC95044519BE6669
11 changed files with 2344 additions and 2171 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/uapi/linux/msm_ipa.h
View file

@ -1808,7 +1808,10 @@ struct ipa_ipgre_info {
* GRE header value.
*/
uint16_t gre_protocol;
uint8_t unused; /* for alignment */
/* If v6 tunnel: option header enabled then set "true"
* If v4 tunnel: option header enabled then set "false"
*/
uint8_t ipv6_option_hdr_enabled;
/*
* The number of valid elements in, and the accompanying
* exception_list, below