shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity
979,394 Commits 55 Branches 2,486 Tags
299d8c0b4b43400a0232c04ea58d600a7471703b
Commit Graph

979394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Kroah-Hartman
299d8c0b4b Merge 5.10.45 into android13-5.10 
Changes in 5.10.45
	net: ieee802154: fix null deref in parse dev addr
	HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65
	HID: a4tech: use A4_2WHEEL_MOUSE_HACK_B8 for A4TECH NB-95
	HID: hid-input: add mapping for emoji picker key
	HID: hid-sensor-hub: Return error for hid_set_field() failure
	HID: quirks: Add quirk for Lenovo optical mouse
	HID: multitouch: set Stylus suffix for Stylus-application devices, too
	HID: Add BUS_VIRTUAL to hid_connect logging
	HID: usbhid: fix info leak in hid_submit_ctrl
	drm/tegra: sor: Do not leak runtime PM reference
	gpu: host1x: Split up client initalization and registration
	drm/tegra: sor: Fully initialize SOR before registration
	ARM: OMAP1: Fix use of possibly uninitialized irq variable
	ARM: OMAP2+: Fix build warning when mmc_omap is not built
	gfs2: Prevent direct-I/O write fallback errors from getting lost
	gfs2: fix a deadlock on withdraw-during-mount
	HID: gt683r: add missing MODULE_DEVICE_TABLE
	riscv: Use -mno-relax when using lld linker
	gfs2: Fix use-after-free in gfs2_glock_shrink_scan
	scsi: target: core: Fix warning on realtime kernels
	ethernet: myri10ge: Fix missing error code in myri10ge_probe()
	scsi: qedf: Do not put host in qedf_vport_create() unconditionally
	Bluetooth: Add a new USB ID for RTL8822CE
	scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V
	nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues()
	nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails
	nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue()
	nvme-loop: do not warn for deleted controllers during reset
	net: ipconfig: Don't override command-line hostnames or domains
	drm/amd/display: Allow bandwidth validation for 0 streams.
	drm/amdgpu: refine amdgpu_fru_get_product_info
	drm/amd/display: Fix potential memory leak in DMUB hw_init
	drm/amd/amdgpu:save psp ring wptr to avoid attack
	rtnetlink: Fix missing error code in rtnl_bridge_notify()
	net/x25: Return the correct errno code
	net: Return the correct errno code
	fib: Return the correct errno code
	Linux 5.10.45

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9264081de933d60172cfa07a7d170b1e5dafac29
 2021-06-21 11:02:28 +02:00
Matthias Maennich
2637b5e5c6 ANDROID: Drop the -master suffix from the clang prebuilts 
This suffix is now obsolete, get rid of it.

Bug: 170775957
Signed-off-by: Matthias Maennich <maennich@google.com>
Change-Id: Iaa72b2a75767b642fa82cd69da142a078fb643e6
 2021-06-18 13:39:24 +00:00
Jing Xiangfeng
0668144ca2 FROMGIT: usb: typec: Add the missed altmode_id_remove() in typec_register_altmode() 
typec_register_altmode() misses to call altmode_id_remove() in an error
path. Add the missed function call to fix it.

Fixes: 8a37d87d72 ("usb: typec: Bus type for alternate modes")
Cc: stable <stable@vger.kernel.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Link: https://lore.kernel.org/r/20210617073226.47599-1-jingxiangfeng@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 03026197bb
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0a0b9880604f6da396351f7b82322394e23604db
 2021-06-18 10:14:52 +02:00
Kyle Tso
048e6e1953 FROMGIT: usb: typec: tcpm: Relax disconnect threshold during power negotiation 
If the voltage is being decreased in power negotiation, the Source will
set the power supply to operate at the new voltage level before sending
PS_RDY. Relax the threshold before sending Request Message so that it
will not race with Source which begins to adjust the voltage right after
it sends Accept Message (PPS) or tSrcTransition (25~35ms) after it sends
Accept Message (non-PPS).

The real threshold will be set after Sink receives PS_RDY Message.

Fixes: f321a02cae ("usb: typec: tcpm: Implement enabling Auto Discharge disconnect support")
Cc: stable <stable@vger.kernel.org>
Cc: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210616090102.1897674-1-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 2b537cf877
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7f3f8d8485796e51dcb969e528f962d1ba518799
 2021-06-18 10:14:52 +02:00
Kyle Tso
f4c6dc5b4e FROMGIT: usb: typec: tcpm: Ignore Vsafe0v in PR_SWAP_SNK_SRC_SOURCE_ON state 
In PR_SWAP_SNK_SRC_SOURCE_ON state, Vsafe0v is expected as well so do
nothing here to avoid state machine going into SNK_UNATTACHED.

Fixes: 28b43d3d74 ("usb: typec: tcpm: Introduce vsafe0v for vbus")
Cc: stable <stable@vger.kernel.org>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kyle Tso <kyletso@google.com>
Link: https://lore.kernel.org/r/20210615173206.1646477-1-kyletso@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit fed09e0bf9
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iec2977b857bd6a743cc554349191c7871ae92be1
 2021-06-18 10:14:52 +02:00
Badhri Jagan Sridharan
133443a393 FROMGIT: usb: typec: tcpci: Fix up sink disconnect thresholds for PD 
"Table 4-3 VBUS Sink Characteristics" of "Type-C Cable and Connector
Specification" defines the disconnect voltage thresholds of various
configurations. This change fixes the disconnect threshold voltage
calculation based on vSinkPD_min and vSinkDisconnectPD as defined
by the table.

Fixes: e1a97bf80a ("usb: typec: tcpci: Implement Auto discharge disconnect callbacks")
Cc: stable <stable@vger.kernel.org>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20210615174323.1160132-1-badhri@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 4288debeaa
 https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-next)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iefff860a879d5ae383272ca116ba6e34bbedc823
 2021-06-18 10:14:52 +02:00
Greg Kroah-Hartman
037a447b7a Linux 5.10.45 
Link: https://lore.kernel.org/r/20210616152835.407925718@linuxfoundation.org
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Fox Chen <foxhlchen@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Pavel Machek (CIP) <pavel@denx.de>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Hulk Robot <hulkrobot@huawei.com>
Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 2021-06-18 10:00:06 +02:00
Zheng Yongjun
808fcc1e70 fib: Return the correct errno code 
[ Upstream commit 59607863c5 ]

When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Zheng Yongjun
d8b2e3e17c net: Return the correct errno code 
[ Upstream commit 49251cd002 ]

When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Zheng Yongjun
04c1556bfc net/x25: Return the correct errno code 
[ Upstream commit d773695866 ]

When kalloc or kmemdup failed, should return ENOMEM rather than ENOBUF.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Jiapeng Chong
0aa3569508 rtnetlink: Fix missing error code in rtnl_bridge_notify() 
[ Upstream commit a8db57c1d2 ]

The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'err'.

Eliminate the follow smatch warning:

net/core/rtnetlink.c:4834 rtnl_bridge_notify() warn: missing error code
'err'.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Victor Zhao
9250f97fd5 drm/amd/amdgpu:save psp ring wptr to avoid attack 
[ Upstream commit 2370eba9f5 ]

[Why]
When some tools performing psp mailbox attack, the readback value
of register can be a random value which may break psp.

[How]
Use a psp wptr cache machanism to aovid the change made by attack.

v2: unify change and add detailed reason

Signed-off-by: Victor Zhao <Victor.Zhao@amd.com>
Signed-off-by: Jingwen Chen <Jingwen.Chen2@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Roman Li
9e8c2af010 drm/amd/display: Fix potential memory leak in DMUB hw_init 
[ Upstream commit c5699e2d86 ]

[Why]
On resume we perform DMUB hw_init which allocates memory:
dm_resume->dm_dmub_hw_init->dc_dmub_srv_create->kzalloc
That results in memory leak in suspend/resume scenarios.

[How]
Allocate memory for the DC wrapper to DMUB only if it was not
allocated before.
No need to reallocate it on suspend/resume.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Signed-off-by: Roman Li <roman.li@amd.com>
Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Jiansong Chen
75fa7fbef1 drm/amdgpu: refine amdgpu_fru_get_product_info 
[ Upstream commit 5cfc912582 ]

1. eliminate potential array index out of bounds.
2. return meaningful value for failure.

Signed-off-by: Jiansong Chen <Jiansong.Chen@amd.com>
Reviewed-by: Jack Gui <Jack.Gui@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Bindu Ramamurthy
34fe4ccb1f drm/amd/display: Allow bandwidth validation for 0 streams. 
[ Upstream commit ba8e59773a ]

[Why]
Bandwidth calculations are triggered for non zero streams, and
in case of 0 streams, these calculations were skipped with
pstate status not being updated.

[How]
As the pstate status is applicable for non zero streams, check
added for allowing 0 streams inline with dcn internal bandwidth
validations.

Signed-off-by: Bindu Ramamurthy <bindu.r@amd.com>
Reviewed-by: Roman Li <Roman.Li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:06 +02:00
Josh Triplett
ecd26536ec net: ipconfig: Don't override command-line hostnames or domains 
[ Upstream commit b508d5fb69 ]

If the user specifies a hostname or domain name as part of the ip=
command-line option, preserve it and don't overwrite it with one
supplied by DHCP/BOOTP.

For instance, ip=::::myhostname::dhcp will use "myhostname" rather than
ignoring and overwriting it.

Fix the comment on ic_bootp_string that suggests it only copies a string
"if not already set"; it doesn't have any such logic.

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Hannes Reinecke
511a010291 nvme-loop: do not warn for deleted controllers during reset 
[ Upstream commit 6622f9acd2 ]

During concurrent reset and delete calls the reset workqueue is
flushed, causing nvme_loop_reset_ctrl_work() to be executed when
the controller is in state DELETING or DELETING_NOIO.
But this is expected, so we shouldn't issue a WARN_ON here.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Hannes Reinecke
155c2fea4b nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() 
[ Upstream commit 4237de2f73 ]

We need to check the NVME_LOOP_Q_LIVE flag in
nvme_loop_destroy_admin_queue() to protect against duplicate
invocations eg during concurrent reset and remove calls.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Hannes Reinecke
620424df29 nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails 
[ Upstream commit 1c5f8e882a ]

When the call to nvme_enable_ctrl() in nvme_loop_configure_admin_queue()
fails the NVME_LOOP_Q_LIVE flag is not cleared.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Hannes Reinecke
1c80ca596c nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues() 
[ Upstream commit a6c144f3d2 ]

The queue count is increased in nvme_loop_init_io_queues(), so we
need to reset it to 1 at the end of nvme_loop_destroy_io_queues().
Otherwise the function is not re-entrant safe, and crash will happen
during concurrent reset and remove calls.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Ewan D. Milne
b8fdea0695 scsi: scsi_devinfo: Add blacklist entry for HPE OPEN-V 
[ Upstream commit e57f5cd99c ]

Apparently some arrays are now returning "HPE" as the vendor.

Link: https://lore.kernel.org/r/20210601175214.25719-1-emilne@redhat.com
Signed-off-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Larry Finger
f8ac1bd527 Bluetooth: Add a new USB ID for RTL8822CE 
[ Upstream commit 4d96d3b0ef ]

Some models of the RTL8822ce utilize a different USB ID. Add this
new one to the Bluetooth driver.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Daniel Wagner
5491d97078 scsi: qedf: Do not put host in qedf_vport_create() unconditionally 
[ Upstream commit 79c932cd6a ]

Do not drop reference count on vn_port->host in qedf_vport_create()
unconditionally. Instead drop the reference count in qedf_vport_destroy().

Link: https://lore.kernel.org/r/20210521143440.84816-1-dwagner@suse.de
Reported-by: Javed Hasan <jhasan@marvell.com>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Jiapeng Chong
609b56e979 ethernet: myri10ge: Fix missing error code in myri10ge_probe() 
[ Upstream commit f336d0b93a ]

The error code is missing in this code scenario, add the error code
'-EINVAL' to the return value 'status'.

Eliminate the follow smatch warning:

drivers/net/ethernet/myricom/myri10ge/myri10ge.c:3818 myri10ge_probe()
warn: missing error code 'status'.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:05 +02:00
Maurizio Lombardi
5d5f0d945d scsi: target: core: Fix warning on realtime kernels 
[ Upstream commit 515da6f429 ]

On realtime kernels, spin_lock_irq*(spinlock_t) do not disable the
interrupts, a call to irqs_disabled() will return false thus firing a
warning in __transport_wait_for_tasks().

Remove the warning and also replace assert_spin_locked() with
lockdep_assert_held()

Link: https://lore.kernel.org/r/20210531121326.3649-1-mlombard@redhat.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Hillf Danton
a61156314b gfs2: Fix use-after-free in gfs2_glock_shrink_scan 
[ Upstream commit 1ab19c5de4 ]

The GLF_LRU flag is checked under lru_lock in gfs2_glock_remove_from_lru() to
remove the glock from the lru list in __gfs2_glock_put().

On the shrink scan path, the same flag is cleared under lru_lock but because
of cond_resched_lock(&lru_lock) in gfs2_dispose_glock_lru(), progress on the
put side can be made without deleting the glock from the lru list.

Keep GLF_LRU across the race window opened by cond_resched_lock(&lru_lock) to
ensure correct behavior on both sides - clear GLF_LRU after list_del under
lru_lock.

Reported-by: syzbot <syzbot+34ba7ddbf3021981a228@syzkaller.appspotmail.com>
Signed-off-by: Hillf Danton <hdanton@sina.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Khem Raj
bb73f2f789 riscv: Use -mno-relax when using lld linker 
[ Upstream commit ec3a5cb611 ]

lld does not implement the RISCV relaxation optimizations like GNU ld
therefore disable it when building with lld, Also pass it to
assembler when using external GNU assembler ( LLVM_IAS != 1 ), this
ensures that relevant assembler option is also enabled along. if these
options are not used then we see following relocations in objects

0000000000000000 R_RISCV_ALIGN     *ABS*+0x0000000000000002

These are then rejected by lld
ld.lld: error: capability.c:(.fixup+0x0): relocation R_RISCV_ALIGN requires unimplemented linker relaxation; recompile with -mno-relax but the .o is already compiled with -mno-relax

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Bixuan Cui
35277c1a66 HID: gt683r: add missing MODULE_DEVICE_TABLE 
[ Upstream commit a4b494099a ]

This patch adds missing MODULE_DEVICE_TABLE definition which generates
correct modalias for automatic loading of this driver when it is built
as an external module.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Bixuan Cui <cuibixuan@huawei.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Bob Peterson
7a557de079 gfs2: fix a deadlock on withdraw-during-mount 
[ Upstream commit 865cc3e9cc ]

Before this patch, gfs2 would deadlock because of the following
sequence during mount:

mount
   gfs2_fill_super
      gfs2_make_fs_rw <--- Detects IO error with glock
         kthread_stop(sdp->sd_quotad_process);
            <--- Blocked waiting for quotad to finish

logd
   Detects IO error and the need to withdraw
   calls gfs2_withdraw
      gfs2_make_fs_ro
         kthread_stop(sdp->sd_quotad_process);
            <--- Blocked waiting for quotad to finish

gfs2_quotad
   gfs2_statfs_sync
      gfs2_glock_wait <---- Blocked waiting for statfs glock to be granted

glock_work_func
   do_xmote <---Detects IO error, can't release glock: blocked on withdraw
      glops->go_inval
      glock_blocked_by_withdraw
         requeue glock work & exit <--- work requeued, blocked by withdraw

This patch makes a special exception for the statfs system inode glock,
which allows the statfs glock UNLOCK to proceed normally. That allows the
quotad daemon to exit during the withdraw, which allows the logd daemon
to exit during the withdraw, which allows the mount to exit.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Andreas Gruenbacher
c3e9ea16ad gfs2: Prevent direct-I/O write fallback errors from getting lost 
[ Upstream commit 43a511c44e ]

When a direct I/O write falls entirely and falls back to buffered I/O and the
buffered I/O fails, the write failed with return value 0 instead of the error
number reported by the buffered I/O. Fix that.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Yongqiang Liu
864b5a8d53 ARM: OMAP2+: Fix build warning when mmc_omap is not built 
[ Upstream commit 040ab72ee1 ]

GCC reports the following warning with W=1:

arch/arm/mach-omap2/board-n8x0.c:325:19: warning:
variable 'index' set but not used [-Wunused-but-set-variable]
325 |  int bit, *openp, index;
    |                   ^~~~~

Fix this by moving CONFIG_MMC_OMAP to cover the rest codes
in the n8x0_mmc_callback().

Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Maciej Falkowski
247ec8ee0b ARM: OMAP1: Fix use of possibly uninitialized irq variable 
[ Upstream commit 3c4e0147c2 ]

The current control flow of IRQ number assignment to `irq` variable
allows a request of IRQ of unspecified value,
generating a warning under Clang compilation with omap1_defconfig on
linux-next:

arch/arm/mach-omap1/pm.c:656:11: warning: variable 'irq' is used
uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
        else if (cpu_is_omap16xx())
                 ^~~~~~~~~~~~~~~~~
./arch/arm/mach-omap1/include/mach/soc.h:123:30: note: expanded from macro
'cpu_is_omap16xx'
                                        ^~~~~~~~~~~~~
arch/arm/mach-omap1/pm.c:658:18: note: uninitialized use occurs here
        if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",
                        ^~~
arch/arm/mach-omap1/pm.c:656:7: note: remove the 'if' if its condition is
always true
        else if (cpu_is_omap16xx())
             ^~~~~~~~~~~~~~~~~~~~~~
arch/arm/mach-omap1/pm.c:611:9: note: initialize the variable 'irq' to
silence this warning
        int irq;
               ^
                = 0
1 warning generated.

The patch provides a default value to the `irq` variable
along with a validity check.

Signed-off-by: Maciej Falkowski <maciej.falkowski9@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1324
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Thierry Reding
3c0ad70cba drm/tegra: sor: Fully initialize SOR before registration 
[ Upstream commit 5dea42759b ]

Before registering the SOR host1x client, make sure that it is fully
initialized. This avoids a potential race condition between the SOR's
probe and the host1x device initialization in cases where the SOR is
the final sub-device to register to a host1x instance.

Reported-by: Jonathan Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Thierry Reding
9c1d492baa gpu: host1x: Split up client initalization and registration 
[ Upstream commit 0cfe5a6e75 ]

In some cases we may need to initialize the host1x client first before
registering it. This commit adds a new helper that will do nothing but
the initialization of the data structure.

At the same time, the initialization is removed from the registration
function. Note, however, that for simplicity we explicitly initialize
the client when the host1x_client_register() function is called, as
opposed to the low-level __host1x_client_register() function. This
allows existing callers to remain unchanged.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:04 +02:00
Pavel Machek (CIP)
570b3e4020 drm/tegra: sor: Do not leak runtime PM reference 
[ Upstream commit 73a395c467 ]

It's theoretically possible for the runtime PM reference to leak if the
code fails anywhere between the pm_runtime_resume_and_get() and
pm_runtime_put() calls, so make sure to release the runtime PM reference
in that case.

Practically this will never happen because none of the functions will
fail on Tegra, but it's better for the code to be pedantic in case these
assumptions will ever become wrong.

Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
[treding@nvidia.com: add commit message]
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Anirudh Rayabharam
b1e3596416 HID: usbhid: fix info leak in hid_submit_ctrl 
[ Upstream commit 6be388f4a3 ]

In hid_submit_ctrl(), the way of calculating the report length doesn't
take into account that report->size can be zero. When running the
syzkaller reproducer, a report of size 0 causes hid_submit_ctrl) to
calculate transfer_buffer_length as 16384. When this urb is passed to
the usb core layer, KMSAN reports an info leak of 16384 bytes.

To fix this, first modify hid_report_len() to account for the zero
report size case by using DIV_ROUND_UP for the division. Then, call it
from hid_submit_ctrl().

Reported-by: syzbot+7c2bb71996f95a82524c@syzkaller.appspotmail.com
Signed-off-by: Anirudh Rayabharam <mail@anirudhrb.com>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Mark Bolhuis
1dfd9f18ca HID: Add BUS_VIRTUAL to hid_connect logging 
[ Upstream commit 48e33befe6 ]

Add BUS_VIRTUAL to hid_connect logging since it's a valid hid bus type and it
should not print <UNKNOWN>

Signed-off-by: Mark Bolhuis <mark@bolhuis.dev>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Ahelenia Ziemiańska
258d3fdbb1 HID: multitouch: set Stylus suffix for Stylus-application devices, too 
[ Upstream commit bc8b796f61 ]

This re-adds the suffix to Win8 stylus-on-touchscreen devices,
now that they aren't erroneously marked as MT

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Saeed Mirzamohammadi
6a142ea610 HID: quirks: Add quirk for Lenovo optical mouse 
[ Upstream commit 3b25200768 ]

The Lenovo optical mouse with vendor id of 0x17ef and product id of
0x600e experiences disconnecting issues every 55 seconds:

[38565.706242] usb 1-1.4: Product: Lenovo Optical Mouse
[38565.728603] input: Lenovo Optical Mouse as /devices/platform/scb/fd500000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/usb1/1-1/1-1.4/1-1.4:1.0/0003:17EF:600E.029A/input/input665
[38565.755949] hid-generic 0003:17EF:600E.029A: input,hidraw1: USB HID v1.11 Mouse [Lenovo Optical Mouse] on usb-0000:01:00.0-1.4/input0
[38619.360692] usb 1-1.4: USB disconnect, device number 48
[38620.864990] usb 1-1.4: new low-speed USB device number 49 using xhci_hcd
[38620.984011] usb 1-1.4: New USB device found, idVendor=17ef,idProduct=600e, bcdDevice= 1.00
[38620.998117] usb 1-1.4: New USB device strings: Mfr=0, Product=2,SerialNumber=0

This adds HID_QUIRK_ALWAYS_POLL for this device in order to work properly.

Signed-off-by: Saeed Mirzamohammadi <saeed.mirzamohammadi@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Srinivas Pandruvada
716a087adc HID: hid-sensor-hub: Return error for hid_set_field() failure 
[ Upstream commit edb032033d ]

In the function sensor_hub_set_feature(), return error when hid_set_field()
fails.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Dmitry Torokhov
0bd8a4b46c HID: hid-input: add mapping for emoji picker key 
[ Upstream commit 7b229b13d7 ]

HUTRR101 added a new usage code for a key that is supposed to invoke and
dismiss an emoji picker widget to assist users to locate and enter emojis.

This patch adds a new key definition KEY_EMOJI_PICKER and maps 0x0c/0x0d9
usage code to this new keycode. Additionally hid-debug is adjusted to
recognize this new usage code as well.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Mateusz Jończyk
b3c5bfc43c HID: a4tech: use A4_2WHEEL_MOUSE_HACK_B8 for A4TECH NB-95 
[ Upstream commit 9858c74c29 ]

This mouse has a horizontal wheel that requires special handling.
Without this patch, the horizontal wheel acts like a vertical wheel.

In the output of `hidrd-convert` for this mouse, there is a
`Usage (B8h)` field. It corresponds to a byte in packets sent by the
device that specifies which wheel generated an input event.

The name "A4TECH" is spelled in all capitals on the company website.

Signed-off-by: Mateusz Jończyk <mat.jonczyk@o2.pl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Nirenjan Krishnan
be6c988792 HID: quirks: Set INCREMENT_USAGE_ON_DUPLICATE for Saitek X65 
[ Upstream commit 25bdbfbb2d ]

The Saitek X65 joystick has a pair of axes that were used as mouse
pointer controls by the Windows driver. The corresponding usage page is
the Game Controls page, which is not recognized by the generic HID
driver, and therefore, both axes get mapped to ABS_MISC. The quirk makes
the second axis get mapped to ABS_MISC+1, and therefore made available
separately.

Signed-off-by: Nirenjan Krishnan <nirenjan@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Dan Robertson
c7836de2ca net: ieee802154: fix null deref in parse dev addr 
[ Upstream commit 9fdd04918a ]

Fix a logic error that could result in a null deref if the user sets
the mode incorrectly for the given addr type.

Signed-off-by: Dan Robertson <dan@dlrobertson.com>
Acked-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20210423040214.15438-2-dan@dlrobertson.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
 2021-06-18 10:00:03 +02:00
Maciej Żenczykowski
66ab983e19 ANDROID: minor fixups of xt_IDLETIMER support 
Add missing newline termination to a bunch of pr_debug()/pr_err()

Test: builds, and kernel net tests passes
Bug: 183485987
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I53eccc88c383259bc7a71ea688f728a0908fa765
 2021-06-17 16:12:37 +00:00
Greg Kroah-Hartman
71594e9899 Merge branch 'android12-5.10' into 'android13-5.10' 
Catch up on lots of commits that only went into the 12 branch that also
need to be here in the 13 branch.

This consists of the following commits merged:

76081a5f72 FROMLIST: kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
fbf19aeacc gki_config: Disable CONFIG_DEBUG_STACK_USAGE
b44e46bb04 FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
54e7412d4f FROMGIT: mm: slub: move sysfs slab alloc/free interfaces to debugfs
45d0c6c5aa ANDROID: gki - CONFIG_NET_SCH_FQ=y
79f44ef795 ANDROID: GKI: Kconfig.gki: Add GKI_HIDDEN_ETHERNET_CONFIGS
79258e28eb FROMLIST: media: Kconfig: Fix DVB_CORE can't be selected as module
0451e8af91 ANDROID: Update ABI and symbol list
1ac622485e Revert "net: usb: cdc_ncm: don't spew notifications"
9e08e97ec6 Merge 5.10.43 into android12-5.10
b9ae3287e3 ANDROID: Fips 140: move fips symbols entirely in own list
3871aa16fd ANDROID: core of xt_IDLETIMER send_nl_msg support
b4355a880a ANDROID: start to re-add xt_IDLETIMER send_nl_msg support
a11dacedd6 ANDROID: add fips140.ko symbols to module ABI
868be244bb ANDROID: inject correct HMAC digest into fips140.ko at build time
6be141eb36 ANDROID: crypto: fips140 - perform load time integrity check
0672a69424 FROMLIST: crypto: shash - stop comparing function pointers to avoid breaking CFI
254da9ba36 ANDROID: arm64: module: preserve RELA sections for FIPS140 integrity selfcheck
15f0fc91e1 ANDROID: arm64: simd: omit capability check in may_use_simd()
6772dcc141 ANDROID: kbuild: lto: permit the use of .a archives in LTO modules
ddea30c684 ANDROID: arm64: only permit certain alternatives in the FIPS140 module
9c556792b7 ANDROID: crypto: lib/aes - add vendor hooks for AES library routines
7a689ebc67 ANDROID: crypto: lib/sha256 - add vendor hook for sha256() routine
4190dbd6ad UPSTREAM: KVM: arm64: Mark the host stage-2 memory pools static
6288fa47f4 UPSTREAM: arm64: mm: don't use CON and BLK mapping if KFENCE is enabled
e44e1f38be UPSTREAM: x86/build: Fix location of '-plugin-opt=' flags
5df654d642 UPSTREAM: binder: Return EFAULT if we fail BINDER_ENABLE_ONEWAY_SPAM_DETECTION
2aee873ab2 UPSTREAM: usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe()
ff1eb3fcd0 UPSTREAM: usb: dwc3: core: Add missing GHWPARAMS9 doc
52ce94e8bf UPSTREAM: KVM: arm64: Fix error return code in init_hyp_mode()
67d005b0ac UPSTREAM: KVM: arm64: Support PREL/PLT relocs in EL2 code
c04f2026cf UPSTREAM: iommu/mediatek: Always enable the clk on resume
c46f002566 UPSTREAM: mm: page_alloc: ignore init_on_free=1 for debug_pagealloc=1
282faf9977 UPSTREAM: dt-bindings: iommu: mediatek: update mediatek,iommu.yaml references
db8e491a1b UPSTREAM: media: mtk: fix mtk-smi dependency
def7a8e7d7 UPSTREAM: software node: Allow node addition to already existing device
d0db984f3e UPSTREAM: coresight: etm-perf: Fix define build issue when built as module
3ddee7b2ee UPSTREAM: kbuild: lto: Merge module sections if and only if CONFIG_LTO_CLANG is enabled
94cf2b2d1d UPSTREAM: kunit: tool: Disable PAGE_POISONING under --alltests
a1cc08d515 UPSTREAM: gpiolib: Fix error return code in gpiolib_dev_init()
5f7ec0f4c3 UPSTREAM: memblock: fix section mismatch warning
96fd9e07c0 UPSTREAM: software node: Fix device_add_software_node()
4378c305d9 UPSTREAM: gpio: fix NULL-deref-on-deregistration regression
2fc5237198 BACKPORT: kbuild: fix UNUSED_KSYMS_WHITELIST for Clang LTO
f107d073ce UPSTREAM: kbuild: lto: add _mcount to list of used symbols
9bf26f0ace UPSTREAM: arm64: Add missing ISB after invalidating TLB in enter_vhe
b1843022a9 UPSTREAM: kbuild: Move .thinlto-cache removal to 'make clean'
4150d73816 UPSTREAM: parisc: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY
e11b323bca UPSTREAM: kbuild: prevent CC_FLAGS_LTO self-bloating on recursive rebuilds
631b4dba04 UPSTREAM: regulator: qcom-rpmh: fix build after QCOM_COMMAND_DB is tristate
4e0d16b049 UPSTREAM: dma-buf: cma_heap: Include linux/vmalloc.h to fix build failures on MIPS
4fef0d39b8 UPSTREAM: signal/parisc: Remove parisc specific definition of __ARCH_UAPI_SA_FLAGS
259e0a28b9 UPSTREAM: nl80211: fix kernel-doc warning in the new SAE attribute
8cc6bf3aaf ANDROID: abi_gki_aarch64_qcom: Add cpuidle_psci and gic_resume symbols
5fd82d3115 ANDROID: gic-v3: Export gic_resume() for vendor GIC enhancements
fb49b843af ANDROID: cpuidle-psci: Add vendor hook for cpuidle psci enter and exit
6227516eed FROMGIT: usb: typec: mux: Fix copy-paste mistake in typec_mux_match
623c68fc85 FROMGIT: usb: typec: ucsi: Clear PPM capability data in ucsi_init() error path
a685bf3fce ANDROID: export cpuset_cpus_allowed()for GKI purpose.
12be942aad ANDROID: GKI: Update abi_gki_aarch64_qcom list for shmem reclaim
4373261be0 ANDROID: tracing: Add generic flag for register tracing disable
c9b8fa644f ANDROID: user: Add vendor hook to user for GKI purpose
9975da5f43 ANDROID: mm: allow fast reclaim of shmem pages
13af062abf ANDROID: vendor_hooks: Export the tracepoints sched_stat_sleep and sched_waking to let module probe them
d7f8a548b8 FROMLIST: remoteproc: use freezable workqueue for crash notifications
06229c49eb UPSTREAM: erofs: support adjust lz4 history window size
0a24d25f08 UPSTREAM: erofs: use sync decompression for atomic contexts only
0ca4eafb39 UPSTREAM: erofs: use workqueue decompression for atomic contexts only
5a44e4bc13 UPSTREAM: erofs: avoid memory allocation failure during rolling decompression
4ae1c8a4d0 UPSTREAM: erofs: force inplace I/O under low memory scenario
46a00756cb UPSTREAM: erofs: insert to managed cache after adding to pcl
b1c757466f UPSTREAM: erofs: get rid of magical Z_EROFS_MAPPING_STAGING
567f25f92d ANDROID: abi_gki_aarch64_qcom: Add thermal_cooling_device_register
027f748df3 ANDROID: ABI: Update allowed list for QCOM
87378c6fbc FROMGIT: usb: typec: tcpm: Do not finish VDM AMS for retrying Responses
72133c19f5 FROMGIT: usb: fix various gadget panics on 10gbps cabling
912ecda3a6 FROMGIT: usb: fix various gadgets null ptr deref on 10gbps cabling.
9953e42b79 FROMGIT: usb: f_ncm: only first packet of aggregate needs to start timer
0b198ecef5 FROMGIT: USB: f_ncm: ncm_bitrate (speed) is unsigned
569693970c ANDROID: gki - CONFIG_NET_SCH_{CODEL,FQ_CODEL,SFQ}=y
ebab44be93 ANDROID: gki - enable CONFIG_USB_CONFIGFS_{EEM,ECM}=y
0dd4d6b58c ANDROID: gki - enable CONFIG_USB_NET_CDC_EEM=y
57743c387e ANDROID: gki - enable CONFIG_USB_RTL8150=y
2699fa478d ANDROID: mm: vmscan: support equal reclaim for anon and file pages
4a819fbf90 ANDROID: qcom: Add more neighbor and dev related symbols
5267b2b574 ANDROID: GKI: Update abi_gki_aarch64_qcom for process killed symbol
813d6c9121 ANDROID: mm/memory_hotplug: Relax remove_memory_subsection error checking
d98a1df787 ANDROID: usb: typec: tcpm: Fixup the wait time for SNK_DISCOVERY
bb6f011afc FROMGIT: usb: typec: tcpm: Fix misuses of AMS invocation
1139005f05 ANDROID: Update the ABI representation
0ba59d42cb ANDROID: Update the generic symbol list
2a1bc2387d ANDROID: abi_gki_aarch64_qcom: Add symbols for 32bit execve
3f5e8b830c ANDROID: sched: create trace points for 32bit execve
79cb255c79 BACKPORT: FROMGIT: mm: arch: remove indirection level in alloc_zeroed_user_highpage_movable()
5083a1ca9d UPSTREAM: arm64: kasan: Set TCR_EL1.TBID1 when KASAN_HW_TAGS is enabled
a1580311c3 ANDROID: freezer: Add vendor hook to freezer for GKI purpose.
00dc4c64e6 ANDROID: kernel: Fix passing NULL to __pa_symbol()
27c285003d ANDROID: sched: Add vendor hook to select ilb cpu
5ed6c99c8f ANDROID: GKI: enable CONFIG_EROFS_FS=y
2d5c7aedc0 FROMGIT: dt-bindings: connector: Replace BIT macro with generic bit ops
505d41dcf1 FROMGIT: usb: dwc3: debugfs: Add and remove endpoint dirs dynamically
4c323ffd1c FROMGIT: dt-bindings: connector: Add PD rev 2.0 VDO definition
bbdac2c2ad FROMGIT: usb: typec: tcpm: Correct the responses in SVDM Version 2.0 DFP
22116da321 FROMGIT: Revert "usb: dwc3: core: Add shutdown callback for dwc3"
4fa67303ce Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10
5cf77864a3 ANDROID: arm scmi: add vendor hook to adjust the rx timeout.
89e44fb838 FROMGIT: userfaultfd: fix UFFDIO_CONTINUE ioctl request definition
72863addaa FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support
c2c081d009 BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test
b96a58e012 FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test
9f837b909a FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type
0b161cf6fc FROMGIT: userfaultfd/shmem: modify shmem_mfill_atomic_pte to use install_pte()
6a41f38998 FROMGIT: userfaultfd/shmem: advertise shmem minor fault support
81231b63ad FROMGIT: userfaultfd/shmem: support UFFDIO_CONTINUE for shmem
0c959cd889 BACKPORT: FROMGIT: userfaultfd/shmem: support minor fault registration for shmem
5f6dc07839 BACKPORT: FROMGIT: userfaultfd/shmem: combine shmem_{mcopy_atomic,mfill_zeropage}_pte
84330a5f50 Revert "BACKPORT: FROMGIT: userfaultfd: support minor fault handling for shmem"
13e14ca0e0 Revert "FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type"
72a3f935ad Revert "FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test"
8f6445acee Revert "BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test"
442b6e0704 Revert "FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support"
21a8683a8b Revert "FROMLIST: userfaultfd/shmem: fix minor fault page leak"
f57e3e5112 ANDROID: GKI: 6/4/2021 KMI update
f1a161b019 ANDROID: media: v4l2-core: extend the v4l2 format to support request
bf769b7216 ANDROID: vendor_hooks: add hook and OEM data for slab shrink
0b76ef69f6 ANDROID: sched: Add oem data in struct rq
f88eb0d245 ANDROID: android: Add nr_swap_pages to debug_symbols driver
9b5c870516 ANDROID: GKI: Enable CONFIG_PCIEAER for arm64 andx86_64
186313055b UPSTREAM: media: docs: Document CLL and Mastering display colorimetry controls
43461c878a UPSTREAM: media: v4l: Add HDR10 static metadata controls
683232ea4c UPSTREAM: media: uapi: Move the H264 stateless control types out of staging
372b24bad2 ANDROID: GKI: Add OEM data to mutex/rwsem
b3df6eb195 FROMGIT: usb: typec: tcpci: Make symbol 'tcpci_apply_rc' static
29be10211c FROMGIT: usb: typec: tcpci: Implement callback for apply_rc
750135f7ae FROMGIT: usb: typec: tcpm: Move TCPC to APPLY_RC state during PR_SWAP
a7d161dc5a ANDROID: GKI: device.h: add rcu_head back to struct device_link
60ea20ed1e FROMGIT: drivers: base: Reduce device link removal code duplication
cead4664c2 FROMGIT: drivers: base: Fix device link removal
fb57fa3d60 UPSTREAM: scsi: ufs-mediatek: Keep VCC always-on for specific devices
caa3c2bab0 UPSTREAM: scsi: ufs: Allow regulators being always-on
4ac5f3e178 UPSTREAM: scsi: ufs-mediatek: Use correct path to fix compile error
1898121800 UPSTREAM: scsi: ufs-mediatek: Introduce event_notify implementation
c88e6599d2 BACKPORT: scsi: ufs: Introduce event_notify variant function
f92f904d55 Revert "Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940""
e86d688e51 Revert "Revert "PM: runtime: Fix unpaired parent child_count for force_resume""
df50ab971a Revert "Revert "kyber: fix out of bounds access when preempted""
a993cac61a Revert "Revert "usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4""
556758235b Revert "Revert "mm: fix struct page layout on 32-bit systems""
e1611d8751 ANDROID: GKI: Enlarge OEM data reserved in task_struct
474a726efd ANDROID: GKI: add OEM data in cma struct
ab20ac9696 FROMGIT: scsi: ufs: Remove redundant checks of !hba in suspend/resume callbacks
523a4fd3f4 FROMGIT: scsi: ufs: Minor adjustments to error handling
8fbb826868 BACKPORT: FROMGIT: scsi: ufs: Clean up and refactor clk-scaling feature
099309ec7b FROMGIT: scsi: ufs: Remove redundant null checking of devfreq instance
6440a2c00d FROMGIT: scsi: ufs: Refactor cancelling clkscaling works
67eb703be2 FROMGIT: scsi: ufs: Give clk scaling min gear a value
0226db1f3a BACKPORT: FROMGIT: scsi: ufs: Refactor ufshcd_init/exit_clk_scaling/gating()
5ee06e06fb BACKPORT: FROMGIT: scsi: ufs: Protect some contexts from unexpected clock scaling
e0d506a786 FROMGIT: scsi: ufs: Stop hardcoding the scale down gear
b9a049ac4e FROMGIT: Revert "Make sure clk scaling happens only when HBA is runtime ACTIVE"
3a3b24ef29 BACKPORT: FROMGIT: scsi: ufs: Protect PM ops and err_handler from user access through sysfs
47149e58f4 ANDROID: Update the ABI xml and symbol list
18eae90751 FROMGIT: timer_list: Print name of per-cpu wakeup device
41b08205cb FROMGIT: tick/broadcast: Program wakeup timer when entering idle if required
130cd0ecfa FROMGIT: tick/broadcast: Prefer per-cpu oneshot wakeup timers to broadcast
4b3ac410bc FROMGIT: tick/broadcast: Split __tick_broadcast_oneshot_control() into a helper
fbcfac4490 FROMGIT: tick/broadcast: Drop unneeded CONFIG_GENERIC_CLOCKEVENTS_BROADCAST guard
5621e45f70 FROMGIT: usb: gadget: f_fs: Ensure io_completion_wq is idle during unbind
7b163b6295 FROMGIT: usb: typec: tcpm: cancel send discover hrtimer when unregister tcpm port
f793ff4b81 FROMGIT: usb: typec: tcpm: cancel frs hrtimer when unregister tcpm port
693c200239 FROMGIT: usb: typec: tcpm: cancel vdm and state machine hrtimer when unregister tcpm port
e4046d6ecc FROMGIT: usb: typec: tcpm: Properly handle Alert and Status Messages
e3e4ee0e9f ANDROID: usb: export tracepoint for dwc3_complete_trb
da4b3a9637 ANDROID: GKI: Request enable some kernel configs for background speed limit function
016d3f7b69 ANDROID: vendor_hooks: Export the tracepoints task_rename
f2d87eb3a0 Revert "Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests""
3bcdb496f4 ANDROID: signal: Add vendor hook for memory reaping
3f491d10dc Revert "ANDROID: mm: oom_kill: reap memory of a task that receives SIGKILL"
4794cb419d FROMGIT: kfence: unconditionally use unbound work queue
cdd895c318 FROMLIST: bootconfig: Share the checksum function with tools
88fa7f8bf0 FROMLIST: docs: bootconfig: Update for mixing value and subkeys
0b3bf71fa3 FROMLIST: tools/bootconfig: Support mixed value and subkey test cases
a504731003 FROMLIST: bootconfig: Support mixing a value and subkeys under a key
7559923b1a FROMLIST: bootconfig: Change array value to use child node
d5554e5096 FROMLIST: tools/bootconfig: Fix a build error accroding to undefined fallthrough
4c1097df5d ANDROID: Add an extra wake flag for android vendor use
28e408cd4c Revert "drivers: base: Fix device link removal"
c5d480cd47 Merge 5.10.42 into android12-5.10
4a85b01172 Revert "FROMLIST: Makefile: add -fuse-ld=lld to KBUILD_HOSTLDFLAGS when LLVM=1"
247a0be702 Revert "ANDROID: Makefile: add compiler-rt dependency explicitly"
45bd3ff939 FROMLIST: crypto: arm64/aes-ce - stop using SIMD helper for skciphers
2dabae8b98 FROMLIST: crypto: arm64/aes-neonbs - stop using SIMD helper for skciphers
71b39cf2e5 ANDROID: cgroup/cpuset: Do not access task_cs(p) outside of RCU
1099a4407d ANDROID: dma-heap: Let system heap report total pool size
196f1975a8 ANDROID: sched: Gate sched_stat tracepoint exports on CONFIG_SCHEDSTATS
4a9c2f05e4 ANDROID: GKI: Update abi_gki_aarch64_qcom list
a4fbf60f6e ANDROID: vmlinux.lds.h: Keep .eh_frame with CFI
bcfe28b62f ANDROID: vendor_hooks: Add vendor hook for tcpm logs
2e2fd329bb UPSTREAM: usb: pd: Set PD_T_SINK_WAIT_CAP to 310ms
b4c4426985 UPSTREAM: usb: dwc3: gadget: Disable gadget IRQ during pullup disable
7a9089951e FROMLIST: sched: Defer wakeup in ttwu() for unschedulable frozen tasks
3128f5e30c FROMLIST: freezer: Add frozen_or_skipped() helper function
7b04b63e1c Revert "ANDROID: vmlinux.lds.h: Define SANITIZER_DISCARDS with CONFIG_CFI_CLANG"
a6bb1af39d ANDROID: vendor_hooks: Export the tracepoints sched_stat_iowait, sched_stat_blocked, sched_stat_wait to let modules probe them
db81ae3c3e FROMGIT: kasan: speed up mte_set_mem_tag_range
3983753280 ANDROID: vendor_hooks: Add hooks for cpufreq_acct_update_power
7a36600f99 ANDROID: GKI: add symbol list file for xiaomi
6f33bce13a ANDROID: usb: export tracepoint for usb gadget connect/disconnect
0c811ab6f7 ANDROID: usb: add EXPORT_TRACE_SYMBOL to export tracepoint
fe2ecaf37f ANDROID: usb: add EXPORT_TRACE_SYMBOL to export tracepoint
4d5d751670 UPSTREAM: usb: core: reduce power-on-good delay time of root hub
2c6791b32f UPSTREAM: fuse: fix matching of FUSE_DEV_IOC_CLONE command
5e424f8596 ANDROID: fuse/passthrough: API V2 with __u32 open argument
b6996d317c UPSTREAM: usb: typec: ucsi: Clear pending after acking connector change
37af541faf UPSTREAM: xhci: Fix 5.12 regression of missing xHC cache clearing command after a Stall
fb808d7c18 UPSTREAM: xhci: fix giving back URB with incorrect status regression in 5.12
12b1e5746c Merge 5.10.41 into android12-5.10
22bc7e38f1 BACKPORT: FROMGIT: scsi: ufs: Fix a possible NULL pointer issue
a0b04503a2 FROMGIT: scsi: ufs: Replace sprintf and snprintf with sysfs_emit
24455210fa FROMGIT: usb: typec: tcpm: Refactor logic to enable/disable auto vbus dicharge
ee87839030 FROMGIT: usb: typec: tcpm: Fix up PR_SWAP when vsafe0v is signalled
cadbca1c5e ANDROID: vendor_hooks: Add a hook for task tagging
4968ab31d1 Merge 5.10.40 into android12-5.10
9f8cf79e74 ANDROID: Update virtual platform symbol list
347bb119f5 ANDROID: dm-user: Fix build warnings
77d89f6d91 ANDROID: abi_gki_aarch64_qcom: Add devfreq_get_devfreq_by_node symbol
629a82a0f3 ANDROID: abi_gki_aarch64_mtk: Remove execute permissions
fbdf9cd38a FROMLIST: mm: page_alloc: dump migrate-failed pages only at -EBUSY
8c944335a3 ANDROID: Fix access invalid addr because it is not initialized
3134ed20c7 f2fs: introduce FI_COMPRESS_RELEASED instead of using IMMUTABLE bit
e79067da34 f2fs: compress: remove unneeded preallocation
42bbf0bcc2 f2fs: avoid attaching SB_ACTIVE flag during mount/remount
df59b5b285 f2fs: atgc: export entries for better tunability via sysfs
b6202381e2 f2fs: compress: fix to disallow temp extension
c3e569d5b8 f2fs: let's allow compression for mmap files
6662ac477e f2fs: add MODULE_SOFTDEP to ensure crc32 is included in the initramfs
c23597effb f2fs: return success if there is no work to do
5a18a6da18 UPSTREAM: kasan: slab: always reset the tag in get_freepointer_safe()
df15808ad3 ANDROID: abi_gki_aarch64_qcom: Add topology update symbols
9d80dbe0a3 ANDROID: dm-user: Fail the IO if there is no daemon
78a9cd650a ANDROID: add initial symbol list for mtk
4b280e66ee ANDROID: fix a warning due to type mismatch in pr_warn
2f056f11e8 ANDROID: sched: fix race with CPU hot-unplug when overriding affinity
b6cab5d17d ANDROID: GKI: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S
5212e0235f ANDROID: abi_gki_aarch64_qcom: Add kthread cgroup migration rvh symbol
80fef39de7 ANDROID: usb: gadget: Resolve NULL pointer dereference in composite_disconnect
2ea27b7efa ANDROID: GKI: Kconfig.gki: enable CONFIG_HMM_MIRROR with HIDDEN GPU
3a71ca1496 ANDROID: mm: page_pinner: skip marking failure on freeable pages
0249af9c0e ANDROID: mm: page_alloc: skip dump pages for freeable page
72488b3be4 ANDROID: mm, oom: add vendor hook to prevent oom panic
83aa0320cf FROMLIST: kthread: Fix kthread_mod_delayed_work vs kthread_cancel_delayed_work_sync race
844b79385a f2fs: compress: clean up parameter of __f2fs_cluster_blocks()
11297f9ea4 f2fs: compress: remove unneeded f2fs_put_dnode()
bb5f20d10c f2fs: atgc: fix to set default age threshold
b0d1189801 f2fs: Prevent swap file in LFS mode
f69aba5779 f2fs: fix to avoid racing on fsync_entry_slab by multi filesystem instances
bdc14e1a49 f2fs: restructure f2fs page.private layout
e7eb6b5377 f2fs: add cp_error check in f2fs_write_compressed_pages
1a200c451e f2fs: compress: rename __cluster_may_compress
3b14b6a653 FROMGIT: usb: typec: tcpm: Respond Not_Supported if no snk_vdo
5b94901e9e FROMGIT: usb: typec: tcpm: Properly interrupt VDM AMS
d79aca773d FROMGIT: usb: typec: tcpm: Use LE to CPU conversion when accessing msg->header
855f802610 Merge 5.10.39 into android12-5.10
762674c166 UPSTREAM: swiotlb: Fix the type of index
26a8c2ab13 ANDROID: Don't add image to all target with KBUILD_MIXED_TREE
1592e43590 ANDROID: I3C: Enable I3C core framework
211fb51c3b ANDROID: GKI: Update abi_gki_aarch64_qcom for hung task detect
14fbfc9c0e ANDROID: GKI: 5/21 KMI update
3a173ef887 FROMGIT: blk-mq: clearing flush request reference in tags->rqs[]
72018550d7 FROMGIT: blk-mq: clear stale request in tags->rq[] before freeing one request pool
c944b0c934 FROMGIT: blk-mq: grab rq->refcount before calling ->fn in blk_mq_tagset_busy_iter
0270bff881 Revert "ANDROID: GKI: Enable CONFIG_KUNIT"
ad14489b58 BACKPORT: block: Remove queue_limits.bio_max_bytes
c141d9773b FROMGIT: kasan: use dump_stack_lvl(KERN_ERR) to print stacks
53efd89f41 FROMGIT: fix for "printk: introduce dump_stack_lvl()"
359a038bbf FROMGIT: printk: introduce dump_stack_lvl()
0aa48437bf UPSTREAM: arm64: mte: Remove unused mte_assign_mem_tag_range()
63990c63c3 UPSTREAM: arm64: mte: make the per-task SCTLR_EL1 field usable elsewhere
8bc6337823 ANDROID: vendor_hooks: add hooks for slab memory leak debugging
70094f39c7 Revert "Revert "ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20""
17f9730086 ANDROID: GKI: Disable CONFIG_ZONE_DMA on arm64
065b3eabbd ANDROID: abi_gki_aarch64_qcom: Add *gic_v3_set_affinity trace syms
e80bcd4627 ANDROID: mmc: Add vendor hooks
3bd9ad7eb4 ANDROID: gic-v3: Change GIC v3 vendor hook to restricted
0dc97b664f ANDROID: GKI: enable hidden configs for DMA
6f3a72c462 ANDROID: GKI: remove kernel_read from abi symbol list
51dc321c7d Revert "Revert "mmc: block: Issue a cache flush only when it's enabled""
e606ad4aae Revert "ANDROID: GKI: restore a part of "struct mmc_host""
71a3aa889d Revert "Revert "media: v4l2-ctrls: fix reference to freed memory""
4cef9277ba Revert "Revert "sched,fair: Alternative sched_slice()""
63524ab60a FROMGIT: usb: typec: tcpm: Send DISCOVER_IDENTITY from dedicated work
60b53937ab FROMGIT: usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4
10823e5b1e Revert "Revert "nvme-pci: set min_align_mask""
c53986ee8b Revert "Revert "swiotlb: respect min_align_mask""
a4094253bf Revert "Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single""
9bd37c7924 Revert "Revert "swiotlb: refactor swiotlb_tbl_map_single""
8ebef45db5 Revert "Revert "swiotlb: clean up swiotlb_tbl_unmap_single""
2893baee79 Revert "Revert "swiotlb: factor out a nr_slots helper""
7b5e000065 Revert "Revert "swiotlb: factor out an io_tlb_offset helper""
fb0759a0d9 Revert "Revert "swiotlb: add a IO_TLB_SIZE define""
20fa297001 Revert "Revert "driver core: add a min_align_mask field to struct device_dma_parameters""
4d55905007 Revert "Revert "capabilities: require CAP_SETFCAP to map uid 0""
b73471e4e7 Revert "ANDROID: usb: typec: ucsi: Ensure bounds check when accessing src_pdos"
167612c1d4 ANDROID: Fix compilation error with huge_pmd_share()
f2f8d7326a UPSTREAM: mm: memblock: add more debug logs
a46e3fa139 UPSTREAM: mm: memblock: drop __init from memblock functions to make it inline
c8df669b7c ANDROID: modpost: Check for KBUILD_MIXED_TREE for Modules.symvers
17b9c24b25 ANDROID: hung_task: Add vendor hook for hung task detect
1b6f2f6e29 ANDROID: vendor_hooks: add hook to balance_dirty_pages()
dc5241048f ANDROID: vendor_hooks: Add hooks for reducing virtual address fragmentation
f150653471 ANDROID: abi_gki_aarch64_qcom: Add aes_encrypt/aes_expandkey
15acc8fac6 ANDROID: iommu: Add vendor hook for iova allocation and free tracking
9b6836900e ANDROID: iommu/io-pgtable-arm: Fix unmapping loop in __arm_lpae_unmap()
bb0eadd830 ANDROID: kernel: Fix debug_kinfo warning message
c34cd7750e Revert "mm: fix struct page layout on 32-bit systems"
4940c943b4 Revert "usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4"
59870a78d4 Revert "kyber: fix out of bounds access when preempted"
6120544b9b Revert "PM: runtime: Fix unpaired parent child_count for force_resume"
cb23d3ef63 Revert "clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940"
76002c201f Merge 5.10.38 into android12-5.10
4f99801693 ANDROID: ABI: Update allowed list for QCOM
f0fb442d31 ANDROID: Update the ABI xml
86eb213d08 ANDROID: Update the generic symbol list
8848be1eb3 ANDROID: Update the generic symbol list
ebe59c0c1a ANDROID: Update the generic symbol list
5330d613ad ANDROID: abi_gki_aarch64_qcom: Add missing symbols for i3c
394f893451 ANDROID: dm-user: Drop additional reference
560fdb20e4 FROMGIT: scsi: ufs: ufs-mediatek: Fix power down spec violation
b5b3246504 UPSTREAM: scsi: ufs-mediatek: Support option to disable auto-hibern8
12386e9df6 UPSTREAM: scsi: ufs-mediatek: Decouple features from platform bindings
78a43fa169 BACKPORT: scsi: ufs-mediatek: Support VA09 regulator operations
d711e7960c UPSTREAM: scsi: ufs: Add retry flow for failed HBA enabling
f72ddd6f7c UPSTREAM: module: unexport find_module and module_mutex
58980df739 FROMLIST: scsi: ufs: Increase the usable queue depth
8b1ed7526f ANDROID: abi_gki_aarch64_qcom: Add vmemdup_user
2bb462a3af ANDROID: cgroup: add vendor hook to cgroup .attach()
fe24b7f8cd ANDROID: gki_defconfig: Enable HID_BETOP_FF JOYSTICK_XPAD_FF and JOYSTICK_XPAD_LEDS
64d5c84867 ANDROID: abi_gki_aarch64_qcom: Add devm_rproc_* APIs
b6e60f0673 ANDROID: Incremental fs: Add uid to INCFS_IOC_GET_LAST_READ_ERROR
25c3b9e0fe ANDROID: Incremental fs: Make sysfs_name changeable on remount
ed8f5159f0 ANDROID: Incremental fs: Count pending_reads even when very short
f57d242977 ANDROID: sched/fair: export sysctl_sched_min_granularity symbol
73599c263e ANDROID: Fix compat hwcap reporting on asymmetric 32-bit SoCs
17f230fd93 Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests"
262fd53a10 BACKPORT: sched/uclamp: Allow to reset a task uclamp constraint value
db77ed2052 ANDROID: GKI: restore termiox fields
18593eb97f Revert "spi: Fix use-after-free with devm_spi_alloc_*"
e054456ced Merge 5.10.37 into android12-5.10
5c5381fe0a Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-5.10.y' into android12-5.10
d8ef677e32 FROMGIT: block: avoid double io accounting for flush request
56cfcf6cbd UPSTREAM: kasan: fix kasan_byte_accessible() to be consistent with actual checks
e4d47d9a03 FROMLIST: blk-mq: Swap two calls in blk_mq_exit_queue()
fdbfae0347 ANDROID: FUSE OWNERS pointing to android-mainline OWNERS
3b80f9485d BACKPORT: scsi: ufs: Refactor ufshcd_setup_clocks() to remove skip_ref_clk
ac75369368 Revert "xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume"
f66d96b14a ANDROID: vendor_hooks: Add hooks to dup_task_struct
727ab0f839 ANDROID: arm64: enable compat vdso
0c4574ebd8 UPSTREAM: arm64: vdso32: drop -no-integrated-as flag
ff128c2d77 BACKPORT: scsi: ufs-mediatek: Add HS-G4 support
371de759e9 UPSTREAM: scsi: ufs: Add enums for UniPro version higher than 1.6
d1d160b6ee FROMGIT: usb: typec: tcpm: Fix SINK_DISCOVERY current limit for Rp-default
5aafea29ad FROMGIT: xhci: Do not use GFP_KERNEL in (potentially) atomic context
22ae3660e8 FROMGIT: xhci: Fix giving back cancelled URBs even if halted endpoint can't reset
41fe558317 ANDROID: usb: gadget: f_accessory: update SS/SSP descriptors
3d24408745 Revert "sched,fair: Alternative sched_slice()"
36b2c4814a Revert "media: v4l2-ctrls: fix reference to freed memory"
a12132f848 ANDROID: GKI: restore a part of "struct mmc_host"
36c1596556 Revert "mmc: block: Issue a cache flush only when it's enabled"
a1ac3f3093 Merge 5.10.36 into android12-5.10
3c75179a31 ANDROID: iommu/io-pgtable-arm: Free underlying page tables for large mappings
345f1259a0 Revert "UPSTREAM: usb: gadget: f_uac2: validate input parameters"
fe580539f6 ANDROID: vendor_hooks: Add hooks for account irqtime process tick
cf061f35b0 BACKPORT: arm64: fpsimd: run kernel mode NEON with softirqs disabled
7fd5bd54c4 UPSTREAM: arm64: assembler: introduce wxN aliases for wN registers
dccc5bf4b7 BACKPORT: arm64: assembler: remove conditional NEON yield macros
a9e54b6010 UPSTREAM: fsverity: relax build time dependency on CRYPTO_SHA256
f90c8ffbd8 UPSTREAM: fscrypt: relax Kconfig dependencies for crypto API algorithms
57e54404ba UPSTREAM: crypto: arm64/gcm - move authentication tag check to SIMD domain
18525713bb UPSTREAM: crypto: arm64/crc-t10dif - move NEON yield to C code
3249282a95 UPSTREAM: crypto: arm64/aes-ce-mac - simplify NEON yield
4e2acf6395 UPSTREAM: crypto: arm64/aes-neonbs - remove NEON yield calls
2a5f8c85c5 UPSTREAM: crypto: arm64/sha512-ce - simplify NEON yield
cfb375ea9f UPSTREAM: crypto: arm64/sha3-ce - simplify NEON yield
7878a8b055 UPSTREAM: crypto: arm64/sha2-ce - simplify NEON yield
0c278c4b40 UPSTREAM: crypto: arm64/sha1-ce - simplify NEON yield
e7b1004dbf UPSTREAM: arm64: assembler: add cond_yield macro
665fe01c67 UPSTREAM: crypto: remove cipher routines from public crypto API
acff6cbc94 UPSTREAM: chcr_ktls: use AES library for single use cipher
bc6ca71187 ANDROID: add OWNERS for sysfs-fs-f2fs
4738608080 FROMGIT: mm/memory_hotplug: rate limit page migration warnings
b3a1591e82 ANDROID: db845c_gki.fragment: Add QCOM_TSENSE config to avoid thermal crashes
5abbf39685 UPSTREAM: usb: gadget: f_uac2: validate input parameters
5feadee52b UPSTREAM: usb: f_uac2: adds support for SS and SSP
030ee5e654 f2fs: return EINVAL for hole cases in swap file
446e972fab ANDROID: Update the ABI xml and symbol list
2f998899f3 f2fs: avoid swapon failure by giving a warning first
ae8c2a7501 ANDROID: topology: Add flag to indicate topology has been updated
4c4dcb8c24 f2fs: compress: fix to assign cc.cluster_idx correctly
7c6c8dacd4 f2fs: compress: fix race condition of overwrite vs truncate
4de3199a4a f2fs: compress: fix to free compress page correctly
4b1ceab67b f2fs: support iflag change given the mask
fd97226b07 f2fs: avoid null pointer access when handling IPU error
101a64c6c8 ANDROID: Update the ABI xml and symbol list
27eb5ffcb7 ANDROID: Add missing CFI jump table symbols to kallsyms
a1fbf0ead8 Revert "BACKPORT: bio: limit bio max size"
a4af23d274 ANDROID: thermal: Add vendor thermal_pm_notify_suspend function
68d3da6c97 ANDROID: qcom: Add neighbor related symbols
cd04f7fab9 ANDROID: usb: typec: ucsi: Ensure bounds check when accessing src_pdos
107ad0ea68 FROMGIT: usb: typec: tcpm: Fix wrong handling for Not_Supported in VDM AMS
93d7a4c7ea ANDROID: Update the ABI xml and symbol list
c0df53e0ee FROMGIT: usb: dwc3: omap: improve extcon initialization
96d46a7342 FROMGIT: usb: typec: ucsi: Put fwnode in any case during ->probe()
e9c04db1d5 FROMGIT: usb: dwc3: gadget: Return success always for kick transfer in ep queue
c3f92e5f6c FROMGIT: usb: dwc3: gadget: Free gadget structure only after freeing endpoints
56f681803f FROMGIT: usb: dwc2: Fix gadget DMA unmap direction
28ceb4d07f FROMGIT: usb: dwc3: gadget: Rename EOPF event macros to Suspend
36695d0e77 FROMGIT: usb: dwc3: gadget: Enable suspend events
d9d0c09e0a Revert "capabilities: require CAP_SETFCAP to map uid 0"
0ddd59c5da Revert "driver core: add a min_align_mask field to struct device_dma_parameters"
17ba7dfe20 Revert "swiotlb: add a IO_TLB_SIZE define"
78957dcb2c Revert "swiotlb: factor out an io_tlb_offset helper"
cb27079661 Revert "swiotlb: factor out a nr_slots helper"
28a2f5f10f Revert "swiotlb: clean up swiotlb_tbl_unmap_single"
0fb49e91d4 Revert "swiotlb: refactor swiotlb_tbl_map_single"
2201384121 Revert "swiotlb: don't modify orig_addr in swiotlb_tbl_sync_single"
b4ae4430ab Revert "swiotlb: respect min_align_mask"
abc5254824 Revert "nvme-pci: set min_align_mask"
bfac7b85a0 Merge 5.10.35 into android12-5.10
be6f5cf52c UPSTREAM: block: fix inflight statistics of part0
79d3d549f9 ANDROID: GKI: 5/7 KMI update
9458fa0dda BACKPORT: bio: limit bio max size
f9d86ad18a ANDROID: i2c: Add vendor hook to allow assign dev_name to I2C devices
0493c72d6d UPSTREAM: binder: tell userspace to dump current backtrace when detected oneway spamming
f0e99852cb ANDROID: arm64: module: add RELA metadata for FIPS140 use
85f86ef6a8 ANDROID: GKI: rename filp_open to filp_open_block in symbol lists
81ab760224 ANDROID: GKI: dwc3: add Android ABI padding to some structures
866797c77d FROMGIT: usb: dwc3: gadget: Handle DEV_TXF_FLUSH_BYPASS capability
e275019d8c FROMGIT: usb: dwc3: Capture new capability register GHWPARAMS9
b48bcb27ae FROMGIT: usb: dwc3: core: Do core softreset when switch mode
bc1dd753bd ANDROID: android: Add symbols to debug_symbols driver
0cf9435352 BACKPORT: FROMGIT: remoteproc: add is_iomem to da_to_va
775d6f9faf FROMGIT: remoteproc: introduce is_iomem to rproc_mem_entry
f6fdbe9edc ANDROID: abi_gki_aarch64_qcom: Add __bitmap_andnot and cpumask_any_but
188186232a ANDROID: abi_gki_aarch64_qcom: Add __kfifo_free
75a0e03539 ANDROID: abi_gki_aarch64_qcom: Add __page_pinner_migration_failed
8219786218 ANDROID: vendor_hooks: set debugging data when rt_mutex is working
938dc2b9b0 ANDROID: abi_gki_aarch64_qcom: Add irq_do_set_affinity
32b8d85352 ANDROID: Update the ABI xml and symbol list
99fdfd2fa3 ANDROID: ABI: Update the generic symbol list
d88c1e77fd ANDROID: irq: manage: Export irq_do_set_affinity symbol
8c32ea7937 FROMLIST: usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP
44a71750f2 ANDROID: GKI: Enable CONFIG_USB_CONFIGFS_F_UAC2
03cd19b0ae ANDROID: Update the ABI xml and symbol list
2b223f9af1 UPSTREAM: remoteproc: core: Remove casting to rproc_handle_resource_t
14d632886f ANDROID: GKI: enable CONFIG_MTK_TIMER
f7128c7533 ANDROID: sched: Add vendor hooks for update_topology
70d7834861 fsverity: relax build time dependency on CRYPTO_SHA256
5e76a34a26 fscrypt: relax Kconfig dependencies for crypto API algorithms
26e61ea36d ANDROID: GKI: Enable CONFIG_EXFAT_FS in gki_defconfig
29203f8c8f ANDROID: cgroup: Add android_rvh_cgroup_force_kthread_migration
7fe4b54bf0 ANDROID: Update the ABI xml and symbol list
2bb3e44126 FROMLIST: sched: Fix out-of-bound access in uclamp
458e81ecf7 ANDROID: mm: spf: fix task fault accounting
348fb920cf ANDROID: Update the ABI xml and symbol list
e765451bf1 Merge 5.10.34 into android12-5.10
15d55f1f0a Revert "ANDROID: gki_defconfig: temporarily disable KFENCE in GKI"
f423a39522 ANDROID: Update the ABI xml and symbol list
514f06c0b0 FROMGIT: mmc: sdhci: Check for reset prior to DMA address unmap
25a0835d5e ANDROID: ABI: Add symbols for CONFIG_PAGE_PINNER
94acc25d0e ANDROID: GKI: Enable CONFIG_PAGE_PINNER
d600eedfb6 ANDROID: mm: page_pinner: use put_user_page at unstable_tree_search_insert
c2b7c24bc1 ANDROID: mm: page_pinner: unattribute follow_page in munlock_vma_pages_range
ec1dbc10ad ANDROID: mm: page_pinner: use put_user_page at add_page_for_migration
67668f721b ANDROID: mm: page_pinner: use put_user_page at dump_user_range
d14850835c ANDROID: mm: page_pinner: use put_user_page at seq_print_vma_name
2de28a0bdd ANDROID: mm: page_pinner: use put_user_page at fuse_copy_finish
f8d9ffe242 ANDROID: mm: page_pinner: use put_user_page at get_futex_key
d3b077bc15 ANDROID: mm: page_pinner: use put_user_page at copy_string
df9a9d821c ANDROID: mm: page_pinner: use put_user_page at access_remote_vm
ddc4a48797 ANDROID: mm: page_pinner: introduce failure_tracking feature
6e12c5b7d4 ANDROID: mm: introduce page_pinner
926cf69af5 ANDROID: vendor_hooks: Fix psi_event build warning
35014985c2 ANDROID: vendor_hooks: Add hooks for binder proc transaction
577f73412f ANDROID: vendor_hooks: tune reclaim inactive ratio
32124e310c ANDROID: dma-buf: Make DMA-BUF sysfs stats kobjects not send uevents
396a6adfd3 ANDROID: vendor_hooks: bypass shrink slab
0907114be2 Merge 5.10.33 into android12-5.10
9dd11f75e9 FROMGIT: kbuild: update config_data.gz only when the content of .config is changed
ea2c091f13 ANDROID: arm64: Initialise mismatched compat hwcaps from CPU notifier
c5de0d2e10 UPSTREAM: ARM: 9039/1: assembler: generalize byte swapping macro into rev_l
d3f36ae0bb UPSTREAM: ARM: 9035/1: uncompress: Add be32tocpu macro
f72dbeced2 FROMGIT: kfence: use power-efficient work queue to run delayed work
f696af3d11 FROMGIT: kfence: maximize allocation wait timeout duration
b9bb7f3153 FROMGIT: kfence: await for allocation using wait_event
cb42770670 FROMGIT: kfence: zero guard page after out-of-bounds access
372e663644 UPSTREAM: kfence: make compatible with kmemleak
fba94942cc UPSTREAM: kfence: fix reports if constant function prefixes exist
0dedbe7401 UPSTREAM: kfence: fix printk format for ptrdiff_t
7919cae0a9 ANDROID: Support disabling symbol trimming
327b2266d2 ANDROID: Incremental fs: Fix pseudo-file attributes
a64f42d1df ANDROID: sched: Fix missing RQCF_UPDATED in migrate_tasks
28b4b1588e FROMLIST: mm, thp: Relax the VM_DENYWRITE constraint on file-backed THPs
c2c576792a ANDROID: GKI: Update the generic symbol list
edc5c62da7 ANDROID: ABI: Add symbols for crypto
5a641fb83f ANDROID: ABI: Update the ABI XML
39111fc404 Revert "ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20"
2337b9185a ANDROID: vendor_hooks: Add hook for binder
cf881c74d3 UPSTREAM: crypto: arm/blake2s - fix for big endian
0126a08dcd UPSTREAM: crypto: arm/blake2b - drop unnecessary return statement
ccc8708bde FROMGIT: kasan, arm64: tests supports for HW_TAGS async mode
d5a19199c7 FROMGIT: arm64: mte: Report async tag faults before suspend
27ecc98407 FROMGIT: arm64: mte: Enable async tag check fault
c3ca7ea141 FROMGIT: arm64: mte: Conditionally compile mte_enable_kernel_*()
a2f1f07ff4 ANDROID: ABI: Update the ABI xml
621d2bbc84 ANDROID: ABI: Update the generic symbol list
c8bf55afd9 f2fs: drop inplace IO if fs status is abnormal
99139afb1f f2fs: compress: remove unneed check condition
28a1e40c06 f2fs: clean up left deprecated IO trace codes
f35a48edeb f2fs: avoid using native allocate_segment_by_default()
12a68f402e f2fs: remove unnecessary struct declaration
546252f29c ANDROID: selinux: add vendor hook in selinux
4870b68f3f FROMGIT: arm64: mte: Enable TCO in functions that can read beyond buffer limits
f3f8d55011 ANDROID: sched: Add vendor hooks for update_load_avg
2f77dca33d ANDROID: Update ABI with __traceiter_*() additions
6ac06f08b2 ANDROID: Update the cf symbol list
eef08d7dc9 ANDROID: Update the qcom symbol list
020f00a46d ANDROID: Update the hikey960 symbol list
2d2d6428cd ANDROID: Update the generic symbol list
dbe96fb1b9 ANDROID: Update the exynos symbol list
da07f99f19 ANDROID: Update the db845c symbol list
c7d0729a2c UPSTREAM: arm64: Move PSTATE.TCO setting to separate functions
9a928af2cc FROMGIT: kasan: Add report for async mode
f47de37f1f FROMGIT: arm64: mte: Drop arch_enable_tagging()
8bd9e809e9 ANDROID: GKI: 4/23 KMI update
563c7d9596 FROMGIT: kasan: Add KASAN mode kernel parameter
433b85479b FROMGIT: arm64: mte: Add asynchronous mode support
ea97f39295 ANDROID: GKI: update ABI description
4ccc2a6dbc FROMLIST: remoteproc: core: Move cdev add before device add
35eacb5c87 ANDROID: mm: allow vmas with vm_ops to be speculatively handled
77e791866b ANDROID: sched: Add ANDROID_OEM_DATA_ARRAY in user_struct.
54f66141a8 ANDROID: sched: Add vendor hooks for sched.
58b10706f3 ANDROID: sched: Add vendor hooks to compute new cpu freq.
a629454175 Revert "Revert "net: xfrm: Localize sequence counter per network namespace""
2d9841f98d FROMGIT: usb: typec: tcpm: Allow slow charging loops to comply to pSnkStby
4e2ca165ba FROMGIT: usb: dwc3: gadget: Check for disabled LPM quirk
a6b8e73972 ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays
0f9bfa0e99 FROMLIST: export: Make CRCs robust to symbol trimming
e67935d786 ANDROID: Kconfig.gki Add SND_SOC_TOPOLOGY
327402e1e9 ANDROID: GKI: Change UCLAMP_BUCKETS_COUNT to 20
8451e2e48e FROMGIT: ASoC: soc-component: Add snd_soc_pcm_component_ack
ce1a244af8 UPSTREAM: ASoC: dmaengine_pcm: add peripheral configuration
1dbf9d8dbc UPSTREAM: dmaengine: add peripheral configuration
fb8304fcb8 UPSTREAM: PM: domains: use device's next wakeup to determine domain idle state
e049d04424 UPSTREAM: PM: domains: inform PM domain of a device's next wakeup
98de9de261 Revert "FROMLIST: PM / Domains: add domain feature flag for next wakeup"
14f2208945 Revert "FROMLIST: PM / domains: inform PM domain of a device's next wakeup"
f316415fb2 Revert "FROMLIST: PM / Domains: use device's next wakeup to determine domain idle state"
76782b5633 FROMGIT: mm: cma: add the CMA instance name to cma trace events
1cfa9bc019 FROMGIT: mm: cma: Add the CMA instance name to the cma_alloc_start trace event
c453643efa FROMGIT: mm: cma: add trace events for CMA alloc perf testing
48b3f756ed ANDROID: mm: compaction: fix isolate_and_split_free_page() redefinition
2ead8661c3 ANDROID: vendor_hooks: Fix build-break due to psi_event
d651e1d63c ANDROID: GKI: Update abi_gki_aarch64_qcom list for kprobe module
9b4e02e2ee ANDROID: GKI: Enable CONFIG_HIST_TRIGGERS
1e5b2db654 FROMGIT: tick/broadcast: Allow late registered device to enter oneshot mode
5a1b7a90e9 UPSTREAM: arm64: uaccess: split user/kernel routines
1eb51cfdb4 UPSTREAM: arm64: uaccess: refactor __{get,put}_user
800a0f7b36 BACKPORT: arm64: uaccess: rename privileged uaccess routines
acc13a8440 ANDROID: Incremental fs: Add INCFS_IOC_GET_LAST_READ_ERROR
6cce4fa251 ANDROID: Incremental fs: Fix INCFS_MAGIC_NUMBER casts
44ffa65110 ANDROID: Incremental fs: Add status to sysfs
3d471f0108 ANDROID: Incremental fs: fix u64 integer cast to pointer
ba9602b155 ANDROID: Incremental fs: stat should return actual used blocks
f4c368a3f9 ANDROID: Incremental fs: Add FS_IOC_READ_VERITY_METADATA
16350016d8 ANDROID: export find_user() & free_uid()for GKI purpose.
bc7711817e ANDROID: GKI: update ABI description
e38df2d204 ANDROID: GKI: Update abi_gki_aarch64_qcom for kgsl AO tracing support
52f8b40ff6 ANDROID: ABI: update symbols to unisoc whitelist for the fifth time
50aa353c69 ANDROID: sched: Add vendor hooks for cpu affinity.
0d74600d22 ANDROID: GKI: Update abi_gki_aarch64_qcom list for reverse migration
9197f16834 ANDROID: abi_gki_aarch64_generic: Add a few more symbols
14d08ba7a0 FROMGIT: usb: dwc3: gadget: Remove FS bInterval_m1 limitation
f8f7b2e9e7 ANDROID: abi_gki_aarch64_qcom: Add __bitmap_or
ad02576760 ANDROID: GKI: Update abi_gki_aarch64_qcom for gpio block read tracepoint
002566e608 FROMGIT: dt-bindings: connector: Add slow-charger-loop definition
ee5af5cb09 FROMGIT: usb: dwc3: gadget: Fix START_TRANSFER link state check
fcd2a56bb0 FROMGIT: usb: gadget: Fix double free of device descriptor pointers
3f315db5f8 FROMGIT: usb: typec: tcpm: Fix error while calculating PPS out values
32b16a3a3f Merge 5.10.32 into android12-5.10
b9836d4090 ANDROID: inline isolate_and_split_free_page
2e04650661 ANDROID: kernel: clear debug_kinfo precisely
295ce88224 ANDROID: cgroup: Add vendor hook for cpuset.
e162c57223 ANDROID: GKI: Update abi_gki_aarch64_qcom for PSI tracepoints
b79d1815c4 ANDROID: psi: Add vendor hooks for PSI tracing
25ede723cd ANDROID: abi_gki_aarch64_qcom: Add android_rvh_sched_setaffinity
ef4ff626b3 ANDROID: gki_defconfig: temporarily disable KFENCE in GKI
91a4e8d8c8 ANDROID: GKI: Update abi_gki_aarch64_qcom list for minidump
8cd9aa93b7 ANDROID: implement wrapper for reverse migration
ea527a52d1 ANDROID: cpuidle: enable TEO and MENU governors in gki_defconfig
3b9e4bd9f0 ANDROID: abi_gki_aarch64_qcom: Update symbol list
f096764239 ANDROID: clang: update to 12.0.5
e16264e625 ANDROID: Add initial Exynos symbol list
e98d2de6a6 ANDROID: mm: fix mixed declaration and code warning
73ae4bff1d ANDROID: sched/fair: call set_next_entity() on the replaced next task
6c3c18a4c9 FROMGIT: binder: fix the missing BR_FROZEN_REPLY in binder_return_strings
da9a1b44ee FROMLIST: drivers/clocksource/timer-of: Remove __init markings
23e7d05d56 ANDROID: GKI: Add support for a GKI_DEFCONFIG_FRAGMENT
de777f121d ANDROID: GKI: Update abi_gki_aarch64_qcom for logbuf tracepoint
ab8b108b0a Merge 5.10.31 into android12-5.10
47b8276da1 ANDROID: PCI: dwc: Export symbols for ep driver
005be5a71b ANDROID: abi_gki_aarch64_qcom: Add sock_setsockopt to list
35dafe72dd ANDROID: vendor_hooks: tune reclaim swappiness or scan type
edb1a85895 FROMGIT: media: docs: Document colorimetry class
e6b18e4945 FROMGIT: media: v4l: Add new Colorimetry Class
a0ac76fc0c FROMGIT: media: v4l2-ctrl: Add decoder conceal color control
a6edc4212b FROMGIT: media: v4l2-ctrl: add controls for long term reference.
e628415846 FROMGIT: media: v4l2-ctrls: Add control for AUD generation
9c6ccd3184 FROMGIT: media: docs: Deprecate mfc display delay controls
f677d55e99 FROMGIT: media: s5p-mfc: Use display delay and display enable std controls
2a3e5b8c90 FROMGIT: media: v4l2-ctrl: Make display delay and display enable std controls
308e49bc5f ANDROID: Make KMI_SYMBOL_LIST_STRICT_MODE overrideable
34fde61f72 ANDROID: logbuf: vendor hook for logbuf dump on oops
fc380a2a73 ANDROID: Incremental fs: fix minor printk format warning
1aff922933 Revert "net: xfrm: Localize sequence counter per network namespace"
9a705f0463 Merge 5.10.30 into android12-5.10
7d5e1de98e ANDROID: Kbuild: Add support for KBUILD_MIXED_TREE
e41d160482 ANDROID: build.config: Add vmlinux.symvers and modules.builtin to DIST_DIR
ef07904022 ANDROID: abi_gki_aarch64_qcom: Add thermal zone enable and unregister
b248dd37db FROMGIT: usb: typec: tcpm: Honour pSnkStdby requirement during negotiation
eed5187d41 FROMGIT: dm verity fec: fix misaligned RS roots IO
5ef36bda8f Revert "Revert "dm verity: fix FEC for RS roots unaligned to blo..."
fc503912fd Revert "Revert "dm bufio: subtract the number of initial sectors..."
2feb4789b7 ANDROID: smp: fix preprocessor conditional warning
f226790096 ANDROID: mm/memory_hotplug: fix minor printk format warnings
615edf1635 ANDROID: power_supply: inline empty power_supply_get_by_phandle_array()
3ab775d150 FROMGIT: usb: dwc3: core: Add shutdown callback for dwc3
fbb0ff48a7 FROMGIT: usb: dwc3: gadget: Ignore Packet Pending bit
8d92227969 ANDROID: usb: typec: tcpm: Update tcpm_update_sink_capabilities
c50ebbb88d ANDROID: GKI: Update the ABI xml
750af2afbe ANDROID: GKI: Add generic aarch64 symbol list
01a0d1ea31 ANDROID: usb: host: Use old init scheme when hook unavailable
6aee238019 Revert "dm bufio: subtract the number of initial sectors in dm_bufio_get_device_size"
59977fca5c Revert "dm verity: fix FEC for RS roots unaligned to block size"
ea2cf4bea8 Revert "ANDROID: AVB error handler to invalidate vbmeta partition."
6125b201cc f2fs: fix to avoid NULL pointer dereference
e4947f414c f2fs: avoid duplicated codes for cleanup
e882e7aeff f2fs: document: add description about compressed space handling
d2521bc897 ANDROID: gki_defconfig: reduce KFENCE pool size
c70d90263c FROMGIT: virt_wifi: Return micros for BSS TSF values
09eafb2817 ANDROID: stacktrace: export stack_trace_save_tsk/regs
6f6d8bb444 ANDROID: arm64: declare system_32bit_el0_cpumask as export
b492fa8a50 ANDROID: Fix compilation warning in __iommu_map_pages()
947f7639b3 ANDROID: iommu/io-pgtable-arm: Fix arguments for __arm_lpae_map()
40537e85f7 ANDROID: GKI: Bump KMI_GENERATION, ABI representation
af0bfc5b9d ANDROID: GKI: Update virtual device symbol list
216fe64b61 ANDROID: usb: host: free the offload TR by vendor hook
f10ea3ce74 f2fs: clean up build warnings
c62f09151d Merge 5.10.29 into android12-5.10
1d3b80670f ANDROID: Add GKI_HIDDEN_MM_CONFIGS to support ballooning.
92de566762 ANDROID: usb: dwc3: gadget: don't cancel the started requests
fbcbe0a7a6 FROMGIT: usb: typec: tcpm: update power supply once partner accepts
18a943bbaf FROMGIT: usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply
97e02abb86 FROMGIT: usb: typec: tcpm: Address incorrect values of tcpm psy for fixed supply
8a4d1dc880 ANDROID: first 4/9/2021 KMI update
b73c7360d9 ANDROID: Add a new core symbol list
28949c3e70 FROMLIST: iommu/arm-smmu: Implement the map_pages() IOMMU driver callback
8bc46bd74b FROMLIST: iommu/arm-smmu: Implement the unmap_pages() IOMMU driver callback
83dda912b3 FROMLIST: iommu/io-pgtable-arm-v7s: Implement arm_v7s_map_pages()
a9b45f6174 FROMLIST: iommu/io-pgtable-arm-v7s: Implement arm_v7s_unmap_pages()
ac3994447c FROMLIST: iommu/io-pgtable-arm: Implement arm_lpae_map_pages()
4ad6f2a43c FROMLIST: iommu/io-pgtable-arm: Implement arm_lpae_unmap_pages()
40ec873a9a BACKPORT: FROMLIST: iommu/io-pgtable-arm: Prepare PTE methods for handling multiple entries
08d46858c7 FROMLIST: iommu: Add support for the map_pages() callback
b9a5924547 FROMLIST: iommu: Hook up '->unmap_pages' driver callback
dcf8af32e6 FROMLIST: iommu: Split 'addr_merge' argument to iommu_pgsize() into separate parts
35dde30a45 FROMLIST: iommu: Use bitmap to calculate page size in iommu_pgsize()
16cabf65c7 BACKPORT: FROMLIST: iommu: Add a map_pages() op for IOMMU drivers
ba575b2222 BACKPORT: FROMLIST: iommu/io-pgtable: Introduce map_pages() as a page table op
ced8a6da9c FROMLIST: iommu: Add an unmap_pages() op for IOMMU drivers
1e74a0fd95 FROMLIST: iommu/io-pgtable: Introduce unmap_pages() as a page table op
46074eb650 Revert "Revert "net: introduce CAN specific pointer in the struct net_device""
e094831fec Revert "Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG""
b16bfd6279 Revert "Revert "bpf: Fix fexit trampoline.""
acff98ad6e Revert "ANDROID: GKI: hack to handle genksyms change in sound/soc/soc-core.c"
421e0ec416 Revert "Revert "can: dev: Move device back to init netns on owning netns delete""
fa5fc9f474 Revert "Revert "net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M""
ccd273758c Revert "Revert "net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S""
15ba58936b Revert "Revert "net: phy: broadcom: Avoid forward for bcm54xx_config_clock_delay()""
c4ac290425 Revert "Revert "net: phy: introduce phydev->port""
81d375222a ANDROID: abi_gki_aarch64_qcom: Add __tracepoint_android_rvh_replace_next_task_fair
a038be9b2c ANDROID: sched: Update android_rvh_check_preempt_wakeup hook
087cb51ae7 FROMGIT: scsi: ufs: ufs-debugfs: Add error counters
7c6fce275c FROMGIT: scsi: ufs: Refine error history functions
ed2197ba47 ANDROID: GKI: Add android_rvh_cpu_cgroup_online to qcom symbol list
ddeb3cdc3a ANDROID: sched: Add android_rvh_cpu_cgroup_online hook
02732576b1 FROMLIST: userfaultfd/shmem: fix minor fault page leak
26d1bb8087 FROMLIST: userfaultfd/hugetlbfs: Fix minor fault page leak
606bb05382 BACKPORT: FROMGIT: userfaultfd/selftests: unify error handling
642412b1ac FROMGIT: userfaultfd/selftests: only dump counts if mode enabled
f4ab74004a FROMGIT: userfaultfd/selftests: drop VERIFY check in locking_thread
56cfdd46b8 FROMGIT: userfaultfd/selftests: remove the time() check on delayed uffd
1e1eb31e95 FROMGIT: userfaultfd/selftests: use user mode only
2039d96cb7 FROMGIT: userfaultfd/selftests: exercise minor fault handling shmem support
91b66856b8 BACKPORT: FROMGIT: userfaultfd/selftests: reinitialize test context in each test
4a460b5cba FROMGIT: userfaultfd/selftests: create alias mappings in the shmem test
94f1573615 FROMGIT: userfaultfd/selftests: use memfd_create for shmem test type
d672123ec4 BACKPORT: FROMGIT: userfaultfd: support minor fault handling for shmem
357700fcc3 FROMGIT: userfaultfd/selftests: add test exercising minor fault handling
0dc6a0929f FROMGIT: userfaultfd: update documentation to describe minor fault handling
4a5cf92412 BACKPORT: FROMGIT: userfaultfd: add UFFDIO_CONTINUE ioctl
e6bf076c2a BACKPORT: FROMGIT: userfaultfd: hugetlbfs: only compile UFFD helpers if config enabled
2c64edbe69 FROMGIT: userfaultfd: disable huge PMD sharing for MINOR registered VMAs
4d3dd339de BACKPORT: FROMGIT: userfaultfd: add minor fault registration mode
343cacfa06 FROMGIT: hugetlb/userfaultfd: unshare all pmds for hugetlbfs when register wp
5c3d6acc99 FROMGIT: mm/hugetlb: move flush_hugetlb_tlb_range() into hugetlb.h
8b03b57113 FROMGIT: mm/hugetlb: fix build with !ARCH_WANT_HUGE_PMD_SHARE
f1d8bd5b4b FROMGIT: hugetlb/userfaultfd: forbid huge pmd sharing when uffd enabled
59caf93f36 BACKPORT: FROMGIT: hugetlb: pass vma into huge_pte_alloc() and huge_pmd_share()
9905016d1b ANDROID: arm64: coresight: Fix a sparse warning
1f99f71f2c ANDROID: usb: dwc3: export tracepoint for dwc3 read/write
c64c734708 ANDROID: GKI: hack to handle genksyms change in sound/soc/soc-core.c
bc751d322e Revert "bpf: Fix fexit trampoline."
21e2297dae Revert "bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG"
4a23c8ded3 Revert "net: introduce CAN specific pointer in the struct net_device"
e92949726c Merge 5.10.28 into android12-5.10
d623f1ff72 ANDROID: Add vendor hooks to signal.
128b8a7ad2 ANDROID: mm: cma: Add forward definition of cma in vendor hook
da3074b19c ANDROID: arm64/mm: fix minor printk format warning
db6a2dd55a FROMLIST: gcov: re-fix clang-11+ support
ad5be8a9b1 ANDROID: GKI: Add deferred_free to qcom symbol list
aeecae11f9 ANDROID: android/OWNERS: drop gki-abi-approvers@
1cdf332fe5 ANDROID: GKI: Update abi_gki_aarch64_qcom for VBO support
34fc082d21 ANDROID: qcom: Add dev, inet and skb related symbols
70249b572c FROMGIT: arm64: fix inline asm in load_unaligned_zeropad()
c51e9f8bf8 ANDROID: Add Image.lz4 to arm64 GKI outputs
a9b76c4519 UPSTREAM: drm/drm_vblank: set the dma-fence timestamp during send_vblank_event
430a4283cb UPSTREAM: dma-fence: allow signaling drivers to set fence timestamp
c18ab1d162 ANDROID: sched: Initialize arguments of android_rvh_replace_next_task_fair
6804a59039 ANDROID: usb: typec: tcpm: Add vendor hook to update current limit
c6e85ea56b ANDROID: mm: cma: add vendor hoook in cma_alloc()
180ab1b1e5 ANDROID: GKI: Update ABI XML
63785deb40 ANDROID: GKI: Update virtual_device symbol list
126c2fc191 ANDROID: dma-heap: Make the page-pool/deferred-free libraries built-in
8f3f46d77c ANDROID: vendor_hooks: Add hooks to recognize special worker thread.
af7214914a ANDROID: usb: typec: tcpm: Add vendor hook to store partner source capabilities
73be6141e9 UPSTREAM: KVM: arm64: Fix CPU interface MMIO compatibility detection
9b42d1c8d4 f2fs: modify open brace '{' following function definitions
1757598ffa f2fs: fix the periodic wakeups of discard thread
d731e43cfc f2fs: fix to avoid accessing invalid fio in f2fs_allocate_data_block()
380faaa0aa f2fs: fix to avoid GC/mmap race with f2fs_truncate()
52840dfa57 FROMGIT: xhci: prevent double-fetch of transfer and transfer event TRBs
c037ca6598 FROMGIT: xhci: fix potential array out of bounds with several interrupters
d535e4b2ca FROMGIT: xhci: check control context is valid before dereferencing it.
a201b4369c FROMGIT: xhci: check port array allocation was successful before dereferencing it
412bd71850 ANDROID: tracing: Make automounting in debugfs optional
eacad94c98 ANDROID: usb: add EXPORT_TRACE_SYMBOL to export tracepoint
70cf1983fe ANDROID: Add a build config fragment for KHWASan.
60aabb9a5b FROMGIT: driver core: Use unbound workqueue for deferred probes
519c8c6b2e ANDROID: usb: host: xhci: provide function prototype for xhci_address_device
5113fd3158 ANDROID: usb: host: add bus_suspend/bus_resume to xhci overrides
285973b22e ANDROID: usb: host: add address_device to xhci overrides
2e4b322b06 ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS
9d10efa2a0 ANDROID: usb: host: add max packet parameter on alloc_transfer_ring hook
3390f5d0dc ANDROID: usb: host: add xhci hooks for vendor specific container context
a7d2724e52 ANDROID: ABI: Update allowed symbol list for QCOM
a4d0971961 ANDROID: abi_gki_aarch64_qcom: Add android_rvh_probe_register
7361785b8f f2fs: set checkpoint_merge by default
e15d220552 f2fs: Fix a hungtask problem in atomic write
e4491f8134 f2fs: fix to restrict mount condition on readonly block device
b667340b25 f2fs: introduce gc_merge mount option
79d06e20a4 f2fs: fix to cover __allocate_new_section() with curseg_lock
6defd53006 f2fs: fix wrong alloc_type in f2fs_do_replace_block
f74afaf1bf f2fs: delete empty compress.h
cc4ff1f3de f2fs: fix a typo in inode.c
528611246f f2fs: allow to change discard policy based on cached discard cmds
adbeec301c f2fs: fix to avoid touching checkpointed data in get_victim()
e457ef6709 f2fs: fix to update last i_size if fallocate partially succeeds
c4346bbb51 f2fs: fix error path of f2fs_remount()
fcbab6e80b f2fs: fix wrong comment of nat_tree_lock
0d36b38e1e f2fs: fix to avoid out-of-bounds memory access
a940a9ad96 f2fs: don't start checkpoint thread in readonly mountpoint
f7dca8471d f2fs: do not use AT_SSR mode in FG_GC & high urgent BG_GC
48b532703f f2fs: add sysfs nodes to get runtime compression stat
a5717d2ca6 f2fs: fix to use per-inode maxbytes in f2fs_fiemap
26423921ac f2fs: fix to align to section for fallocate() on pinned file
a5407f50d3 f2fs: expose # of overprivision segments
672d8b3cab f2fs: fix error handling in f2fs_end_enable_verity()
5459e25504 f2fs: fix a redundant call to f2fs_balance_fs if an error occurs
60eac71600 f2fs: remove unused file_clear_encrypt()
533d45fefd f2fs: check if swapfile is section-alligned
e0a507f5c5 f2fs: fix last_lblock check in check_swap_activate_fast
8e8184cc49 f2fs: remove unnecessary IS_SWAPFILE check
54af5b35f4 f2fs: Replace one-element array with flexible-array member
1e2bd9c6c2 f2fs: compress: Allow modular (de)compression algorithms
7688fb401d f2fs: check discard command number before traversing discard pending list
6cd5fef390 f2fs: update comments for explicit memory barrier
14d0fdac3c f2fs: remove unused FORCE_FG_GC macro
b8719b37cd f2fs: avoid unused f2fs_show_compress_options()
841a52ae07 f2fs: fix panic during f2fs_resize_fs()
ba25abde92 f2fs: fix to allow migrating fully valid segment
c6acf57aeb f2fs: fix a spelling error
e262ecf61b f2fs: fix a spacing coding style

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic746701c2cc25419fe66f07ddc616618c9d39444
 2021-06-17 14:45:33 +02:00
Alistair Delva
7f8b63a38e Revert "ANDROID: AVB error handler to invalidate vbmeta partition." 
This driver is not used and can cause problems if used on modern
devices. Remove it.

This reverts commit 6115619831.

Bug: 185178770
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I1d5acb96dda765a1e3ea0cf62a3bf4b2a78892ea
(cherry picked from commit d9d3fe628e)
Signed-off-by: Carlos Llamas <cmllamas@google.com>
 2021-06-16 17:49:01 +00:00
Greg Kroah-Hartman
82ea18a920 Revert "Revert "can: dev: Move device back to init netns on owning netns delete"" 
This reverts commit 4ca012d8ea.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3b19aef8e3332f23ef1f5d7919c9addb205e2ed1
 2021-06-16 18:02:05 +02:00
Greg Kroah-Hartman
b7d2c0cacc Revert "Revert "net: phy: broadcom: Fix RGMII delays for BCM50160 and BCM50610M"" 
This reverts commit d649abddc6.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1de37d6a4e061430c5236265e842dd7851be3cb7
 2021-06-16 18:02:05 +02:00
Greg Kroah-Hartman
8ad761788d Revert "Revert "net: phy: broadcom: Set proper 1000BaseX/SGMII interface mode for BCM54616S"" 
This reverts commit e444b4e1e9.

It is ok to bring this back now, as the ABI does not need to be
preserved anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I154d732042f13244b8720e98682b4d2d9e5e6ffd
 2021-06-16 18:02:05 +02:00