Merge 1746db26 ("Merge tag 'pci-v6.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I1bbc8ce95541090794fce8e0ec4f3df68ef93434
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Introduce the ALSA Co-processor Acceleration API.

Bug: 385751166
Change-Id: I6ae6a39dee6ffdd3b6d00da67d3f9c1c7656d8ee
Signed-off-by: Zhipeng Wang <zhipeng.wang_1@nxp.com>

Merge b50ecc5a ("Merge tag 'perf-tools-for-v6.13-2024-11-24' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I39156e775c53c640ad374ff275b471f3bc697cb6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 6daf0882 ("Merge tag 'vfs-6.13.ecryptfs.mount.api' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I988e7493d220e6e159b0e4c9026029682e053f20
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 44b4d13b ("Merge tag 'f2fs-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I6ec9590be62069ac8064509fbacf446cacff45f3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Test: TreeHugger
Bug: 318399407
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3482eb2f388661b8e32ddd9f5c7d00abde8f8737
(cherry picked from commit b1dc7ef48b6a01e0608710e47201b1182d801183)

CONFIG_THERMAL_STATISTICS is not efficient way to
get large data via sysfs. This have been replaced
with the CONFIG_THERMAL_DEBUGFS and that should
be used instead.

Bug: 218825214
Test: TH
Change-Id: I6e7faf6094c7bd83dda5afb810cbd8777e485737
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
(cherry picked from commit b1564c0c9c935329a02c06e6a193be4cf742a3a0)

There are many UFS android tracehooks, some in places where there
already are existing trace points, and others where they are seemingly
not being used anymore.  As this is causing merge conflicts with
6.13-rc1, remove all that are not currently being used.  They can come
back later if they really are needed on a case-by-case basis.

Bug: 181359082
Cc: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I8822a8ef9d27f6b659b4fa10a4581157930ac2c3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge fb527fc1 ("Merge tag 'fuse-update-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse"

) into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	fs/fuse/fuse_i.h

Change-Id: I7e1f680e57d4f3de66c952c0e5f877f1992598e2
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge ff2a7a06 ("Merge tag 'gfs2-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ic6a8092d7f0cfcc24b831aeb00ad60182f466d0e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

This reverts commit ef1134dd.

Sometimes back commit cfb00a35 ("arm64: jump_label: Ensure patched
jump_labels are visible to all CPUs") got merged into all stable
branches wherever applicable with citing a bug in static key which
does not synchronizes among the cpus and adds IPI to all cores to
fix this.

Kfence is one of the user of static key and recently, it has been
observed that after above commit during toggling kfence_allocation_key
IPI is being sent to the core which are there low power mode which
has regressed power numbers and after disabling CONFIG_KFENCE_STATIC_KEYS
we see workload improved in the range of 1% - 10% resulting in 1% - 4%
power savings for few audio playback, video decode & display cases and
with no regression on benchmarks.

Bug: 394509835
Change-Id: I8efa3280bf115c33cc957f83ccb8e578730aa5f5
Signed-off-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>

Merge 0637a68b ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"

) into android-mainline

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	drivers/ufs/core/ufshcd.c

Change-Id: I7d34625abad340f06a090e302bd7a1cae623082f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

The perf-to-frequency scaling factors are used by intel_pstate on hybrid
platforms to cast performance levels to frequency on different types of
CPUs which is needed because the generic cpufreq sysfs interface works
in the frequency domain.

For some hybrid platforms already in the field, the scaling factors are
known, but for others (including some upcoming ones) they most likely
will be different and the only way to get them that scales is to use
information provided by the platform firmware.  In this particular case,
the requisite information can be obtained via CPPC.

If the P-core hybrid scaling factor for the given processor model is not
known, use CPPC to compute hybrid scaling factors for all CPUs.

Since the current default hybrid scaling factor is only suitable for a
few early hybrid platforms, add intel_hybrid_scaling_factor[] entries
for them and initialize the scaling factor to zero ("unknown") by
default.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/8476313.T7Z3S40VBb@rjwysocki.net


(cherry picked from commit 9b18d536b124357fee56d82b1462c02f78d219e5)

BUG=None
TEST=CQ

Change-Id: I0bb03326fef2b9142b8a32c155f09920cd45931e
Signed-off-by: Tim Van Patten <timvp@google.com>

Merge a3517717 ("Merge patch series "scsi: hisi_sas: Some fixes for hisi_sas"") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ide012cc331d0d6426aa549e6b2a304884412d20a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Resolves merge conflicts in:
	drivers/ufs/core/ufshcd.c

Change-Id: Ie9647cc4f0bd59ac126ebc79a9d3a9d251d3d27e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

select hidden Kconfig: DMA_ENGINE_RAID.

some dma devices selects DMA_ENGINE_RAID. this changes variable's type in
struct dmaengine_unmap_data.
it is required by dma device drivers to provide unified interface as modules.

Bug: 396582183

Change-Id: I85a819ae2da820c949fc0dd5667a31fa44d07e13
Signed-off-by: Bumyong Lee <bumyong.lee@samsung.com>
(cherry picked from commit 89542310160d3b0ff963cc8fd23186d5acd231df)

Clearing lrbp->cmd in error paths is no longer necessary since commit
549e91a9 ("scsi: ufs: core: Fix handling of lrbp->cmd").

Fixes: 89c0d898 ("Merge tag 'v6.4-rc1' into android-mainline")
Change-Id: Ie2ff5c83ac66a4639795ce4d84745e2a0d463f45
Signed-off-by: Bart Van Assche <bvanassche@google.com>

Steps on the way to 6.13-rc1

Change-Id: Ia3e1ae1f9c0cc64387e6fa132aa26a150cdd1560
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 78a2cbd8 ("Merge tag 'libnvdimm-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ie2624278534a61a472d384eefea060285228fbbd
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 2c22dc1e ("Merge tag 'mailbox-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: If185196ed354ae513fc683bd8bfd54f88a461a4e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 2d32fba0 ("Merge tag 'pinctrl-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I8be810e5c2d321193812044a614484d1a9b7d32e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 70dbb12e ("Merge tag 'i2c-for-6.13-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I0f4f02ca4a1a0bbb24f0b925317ba35323ce531d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 5d38cb9b ("Merge tag 'firewire-updates-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ia413e5cf5578635cb77f8329ac8e63ee61e77eea
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge e06635e2 ("Merge tag 'slab-for-6.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I2bc3beb25eeda521f43a3398a98774ed8be43b62
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge f5f4745a ("Merge tag 'mm-nonmm-stable-2024-11-24-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Ifc9d4c8627de3000229cf5fdb96940abd5e59c7b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 7f4f3b14 ("Merge tag 'trace-rust-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I83f0f2ab637e765da94b60a472b3c5c73498a3dc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 36843bfb ("Merge tag 'hardening-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I5f37ec9b23289a4c90eafaca552df24e4042820e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 4e07155d ("Merge tag 'fbdev-for-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I7133668fead493959f4c5b0ddd3b667851c39bc3
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 3e51108c ("Merge tag 'input-for-v6.13-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I1fb4ae1ccfa9e8139df912cb5655118d5b89ae9e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 9f16d5e6 ("Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I92f8d298856ee972cb22d3c37ea06b5fb79be459
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 42d9e8b7 ("Merge tag 'powerpc-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: Idc4c869b23d6a885aa3706665dc17296ab362bf5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 5c00ff74 ("Merge tag 'mm-stable-2024-11-18-19-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"

) into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I3dd4cc4e9f6cda049df70688b4318d1a19e963e9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I53e428ee5334506d515e1d1a7ae3a87361da4694
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 0938b161 ("mm: don't set readahead flag on a folio when lookahead_size > nr_to_read") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I139a93bb9e592f4facfb50731a2b23c57ae86392
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I30c4afe3099b22e2ffe05924c98388b165111806
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: Ib96aa5ada1c93e64880dc5c84f450c5d0fca6e88
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Steps on the way to 6.13-rc1

Change-Id: I07b99346ed01b4217375f0a719080876460c468e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

This reverts commit 7d91e4ee.

Change-Id: Id28ff300b0141f07848a7c14e2dcb6fe734e4b15
Signed-off-by: T.J. Mercier <tjmercier@google.com>

Merge e26060d1 ("mm: swap: make some count_mthp_stat() call-sites be THP-agnostic.") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I9d399f315947ddedc5913b7caad55c73a1312493
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Merge 7aefa598 ("powerpc: assert_pte_locked() use pte_offset_map_ro_nolock()") into android-mainline

Steps on the way to 6.13-rc1

Change-Id: I88a3006f8619054992a6d5b528a1bbb198562b2d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>