Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update 5.12.x+fslc up to v5.12.5 #346

Merged
merged 365 commits into from
May 19, 2021
Merged

Conversation

zandrey
Copy link

@zandrey zandrey commented May 19, 2021

Automatic merge performed, no conflicts reported.

-- andrey

Michael Chan and others added 30 commits May 19, 2021 10:56
[ Upstream commit 7fbf359 ]

Support VF device IDs used by the Hyper-V hypervisor.

Reviewed-by: Vasundhara Volam <vasundhara-v.volam@broadcom.com>
Reviewed-by: Andy Gospodarek <gospo@broadcom.com>
Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 99e729b ]

Noticed failure as a crash on ia64 when tried to symbolize all backtraces
collected by page_owner=on:

    $ cat /sys/kernel/debug/page_owner
    <oops>

    CPU: 1 PID: 2074 Comm: cat Not tainted 5.12.0-rc4 Freescale#226
    Hardware name: hp server rx3600, BIOS 04.03 04/08/2008
    ip is at dereference_module_function_descriptor+0x41/0x100

Crash happens at dereference_module_function_descriptor() due to
use-after-free when dereferencing ".opd" section header.

All section headers are already freed after module is laoded successfully.

To keep symbolizer working the change stores ".opd" address and size after
module is relocated to a new place and before section headers are
discarded.

To make similar errors less obscure module_finalize() now zeroes out all
variables relevant to module loading only.

Link: https://lkml.kernel.org/r/20210403074803.3309096-1-slyfox@gentoo.org
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 7c0012f ]

Patch series "watchdog/softlockup: Report overall time and some cleanup", v2.

I dug deep into the softlockup watchdog history when time permitted this
year.  And reworked the patchset that fixed timestamps and cleaned up the
code[2].

I split it into very small steps and did even more code clean up.  The
result looks quite strightforward and I am pretty confident with the
changes.

[1] v2: https://lore.kernel.org/r/20201210160038.31441-1-pmladek@suse.com
[2] v1: https://lore.kernel.org/r/20191024114928.15377-1-pmladek@suse.com

This patch (of 6):

There are many touch_*watchdog() functions.  They are called in situations
where the watchdog could report false positives or create unnecessary
noise.  For example, when CPU is entering idle mode, a virtual machine is
stopped, or a lot of messages are printed in the atomic context.

These functions set SOFTLOCKUP_RESET instead of a real timestamp.  It
allows to call them even in a context where jiffies might be outdated.
For example, in an atomic context.

The real timestamp is set by __touch_watchdog() that is called from the
watchdog timer callback.

Rename this callback to update_touch_ts().  It better describes the effect
and clearly distinguish is from the other touch_*watchdog() functions.

Another motivation is that two timestamps are going to be used.  One will
be used for the total softlockup time.  The other will be used to measure
time since the last report.  The new function name will help to
distinguish which timestamp is being updated.

Link: https://lkml.kernel.org/r/20210311122130.6788-1-pmladek@suse.com
Link: https://lkml.kernel.org/r/20210311122130.6788-2-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit c9ad17c ]

The softlockup situation might stay for a long time or even forever.  When
it happens, the softlockup debug messages are printed in regular intervals
defined by get_softlockup_thresh().

There is a mystery.  The repeated message is printed after the full
interval that is defined by get_softlockup_thresh().  But the timer
callback is called more often as defined by sample_period.  The code looks
like the soflockup should get reported in every sample_period when it was
once behind the thresh.

It works only by chance.  The watchdog is touched when printing the stall
report, for example, in printk_stack_address().

Make the behavior clear and predictable by explicitly updating the
timestamp in watchdog_timer_fn() when the report gets printed.

Link: https://lkml.kernel.org/r/20210311122130.6788-3-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit fef06ef ]

The softlockup detector currently shows the time spent since the last
report.  As a result it is not clear whether a CPU is infinitely hogged by
a single task or if it is a repeated event.

The situation can be simulated with a simply busy loop:

	while (true)
	      cpu_relax();

The softlockup detector produces:

[  168.277520] watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [cat:4865]
[  196.277604] watchdog: BUG: soft lockup - CPU#1 stuck for 22s! [cat:4865]
[  236.277522] watchdog: BUG: soft lockup - CPU#1 stuck for 23s! [cat:4865]

But it should be, something like:

[  480.372418] watchdog: BUG: soft lockup - CPU#2 stuck for 26s! [cat:4943]
[  508.372359] watchdog: BUG: soft lockup - CPU#2 stuck for 52s! [cat:4943]
[  548.372359] watchdog: BUG: soft lockup - CPU#2 stuck for 89s! [cat:4943]
[  576.372351] watchdog: BUG: soft lockup - CPU#2 stuck for 115s! [cat:4943]

For the better output, add an additional timestamp of the last report.
Only this timestamp is reset when the watchdog is intentionally touched
from slow code paths or when printing the report.

Link: https://lkml.kernel.org/r/20210311122130.6788-4-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 1bc503c ]

The softlockup detector does some gymnastic with the variable
soft_watchdog_warn.  It was added by the commit 58687ac
("lockup_detector: Combine nmi_watchdog and softlockup detector").

The purpose is not completely clear.  There are the following clues.  They
describe the situation how it looked after the above mentioned commit:

  1. The variable was checked with a comment "only warn once".

  2. The variable was set when softlockup was reported. It was cleared
     only when the CPU was not longer in the softlockup state.

  3. watchdog_touch_ts was not explicitly updated when the softlockup
     was reported. Without this variable, the report would normally
     be printed again during every following watchdog_timer_fn()
     invocation.

The logic has got even more tangled up by the commit ed23587
("kernel/watchdog.c: print traces for all cpus on lockup detection").
After this commit, soft_watchdog_warn is set only when
softlockup_all_cpu_backtrace is enabled.  But multiple reports from all
CPUs are prevented by a new variable soft_lockup_nmi_warn.

Conclusion:

The variable probably never worked as intended.  In each case, it has not
worked last many years because the softlockup was reported repeatedly
after the full period defined by watchdog_thresh.

The reason is that watchdog gets touched in many known slow paths, for
example, in printk_stack_address().  This code is called also when
printing the softlockup report.  It means that the watchdog timestamp gets
updated after each report.

Solution:

Simply remove the logic. People want the periodic report anyway.

Link: https://lkml.kernel.org/r/20210311122130.6788-5-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 9f113bf ]

Any parallel softlockup reports are skipped when one CPU is already
printing backtraces from all CPUs.

The exclusive rights are synchronized using one bit in
soft_lockup_nmi_warn.  There is also one memory barrier that does not make
much sense.

Use two barriers on the right location to prevent mixing two reports.

[pmladek@suse.com: use bit lock operations to prevent multiple soft-lockup reports]
  Link: https://lkml.kernel.org/r/YFSVsLGVWMXTvlbk@alley

Link: https://lkml.kernel.org/r/20210311122130.6788-6-pmladek@suse.com
Signed-off-by: Petr Mladek <pmladek@suse.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Laurence Oberman <loberman@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit cd8499d ]

The GPIO configuration cannot be applied if the registers are inaccessible.
This prevented the headset mic from working on the Dell XPS 13 9343.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=114171
Signed-off-by: David Ward <david.ward@gatech.edu>
Link: https://lore.kernel.org/r/20210418134658.4333-5-david.ward@gatech.edu
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 34731ed ]

Without gpiolib, the driver fails to build:

    drivers/leds/blink/leds-lgm-sso.c:123:19: error: field has incomplete type 'struct gpio_chip'
            struct gpio_chip chip;
                             ^
    include/linux/gpio.h:107:8: note: forward declaration of 'struct gpio_chip'
    struct gpio_chip;
           ^
    drivers/leds/blink/leds-lgm-sso.c:263:3: error: implicit declaration of function 'gpiod_set_value' [-Werror,-Wimplicit-function-declaration]
                    gpiod_set_value(led->gpiod, val);
                    ^
    drivers/leds/blink/leds-lgm-sso.c:263:3: note: did you mean 'gpio_set_value'?
    include/linux/gpio.h:168:20: note: 'gpio_set_value' declared here
    static inline void gpio_set_value(unsigned gpio, int value)
                       ^
    drivers/leds/blink/leds-lgm-sso.c:345:3: error: implicit declaration of function 'gpiod_set_value' [-Werror,-Wimplicit-function-declaration]
                    gpiod_set_value(led->gpiod, 1);
                    ^

Add the dependency in Kconfig.

Fixes: c3987cd ("leds: lgm: Add LED controller driver for LGM SoC")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
…d_params()

[ Upstream commit 45c7eae ]

When kcalloc() returns NULL to __tcbp or of_count_phandle_with_args()
returns zero or -ENOENT to count, no error return code of
thermal_of_populate_bind_params() is assigned.
To fix these bugs, ret is assigned with -ENOMEM and -ENOENT in these
cases, respectively.

Fixes: a92bab8 ("of: thermal: Allow multiple devices to share cooling map")
Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210310122423.3266-1-baijiaju1990@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit d9b7eae ]

rcec_assoc_rciep() used "rciep->devfn" (a single byte encoding both the
device and function number) as the device number to check whether the
corresponding bit was set in the RCEC's Association Bitmap for RCiEPs.

But per PCIe r5.0, sec 7.9.10.2, "Association Bitmap for RCiEPs", the
32-bit bitmap contains one bit per device.  That bit applies to all
functions of the device.

Fix rcec_assoc_rciep() to convert the value of "rciep->devfn" to a device
number to ensure that RCiEP devices are correctly associated with the RCEC.

Reported-and-tested-by: Wen Jin <wen.jin@intel.com>
Fixes: 507b460 ("PCI/ERR: Add pcie_link_rcec() to associate RCiEPs")
Link: https://lore.kernel.org/r/20210222011717.43266-1-qiuxu.zhuo@intel.com
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Sean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 7dede88 ]

F2FS_IOC_FLUSH_DEVICE/F2FS_IOC_RESIZE_FS needs to migrate all blocks of
target segment to other place, no matter the segment has partially or fully
valid blocks.

However, after commit 803e74b ("f2fs: stop GC when the victim becomes
fully valid"), we may skip migration due to target segment is fully valid,
result in failing the ioctl interface, fix this.

Fixes: 803e74b ("f2fs: stop GC when the victim becomes fully valid")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 3ab0598 ]

f2fs_resize_fs() hangs in below callstack with testcase:
- mkfs 16GB image & mount image
- dd 8GB fileA
- dd 8GB fileB
- sync
- rm fileA
- sync
- resize filesystem to 8GB

kernel BUG at segment.c:2484!
Call Trace:
 allocate_segment_by_default+0x92/0xf0 [f2fs]
 f2fs_allocate_data_block+0x44b/0x7e0 [f2fs]
 do_write_page+0x5a/0x110 [f2fs]
 f2fs_outplace_write_data+0x55/0x100 [f2fs]
 f2fs_do_write_data_page+0x392/0x850 [f2fs]
 move_data_page+0x233/0x320 [f2fs]
 do_garbage_collect+0x14d9/0x1660 [f2fs]
 free_segment_range+0x1f7/0x310 [f2fs]
 f2fs_resize_fs+0x118/0x330 [f2fs]
 __f2fs_ioctl+0x487/0x3680 [f2fs]
 __x64_sys_ioctl+0x8e/0xd0
 do_syscall_64+0x33/0x80
 entry_SYSCALL_64_after_hwframe+0x44/0xa9

The root cause is we forgot to check that whether we have enough space
in resized filesystem to store all valid blocks in before-resizing
filesystem, then allocator will run out-of-space during block migration
in free_segment_range().

Fixes: b4b1006 ("f2fs: refactor resize_fs to avoid meta updates in progress")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 28e18ee ]

The  uninitialized variable dn.node_changed does not get set when a
call to f2fs_get_node_page fails.  This uninitialized value gets used
in the call to f2fs_balance_fs() that may or not may not balances
dirty node and dentry pages depending on the uninitialized state of
the variable. Fix this by only calling f2fs_balance_fs if err is
not set.

Thanks to Jaegeuk Kim for suggesting an appropriate fix.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: 2a34076 ("f2fs: call f2fs_balance_fs only when node was changed")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 936d368 ]

The added device_property_present() call causes a build
failure in some configurations because of the missing header:

drivers/rtc/rtc-tps65910.c:422:7: error: implicit declaration of function 'device_property_present' [-Werror,-Wimplicit-function-declaration]

Fixes: 454ba15 ("rtc: tps65910: Support wakeup-source property")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20210225134215.2263694-1-arnd@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 3d2ee78 ]

Analog to the issue in the common mdt_loader code the MSS ELF loader
does not validate that p_filesz bytes will fit in the memory region and
that the loaded segments are not truncated. Fix this in the same way
as proposed for the mdt_loader.

Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Fixes: 135b9e8 ("remoteproc: qcom_q6v5_mss: Validate modem blob firmware size before load")
Link: https://lore.kernel.org/r/20210312232002.3466791-1-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 1e83130 ]

IRQ domain alloc function should return zero on success. Non-zero value
indicates failure.

Link: https://lore.kernel.org/r/20210303142202.25780-1-pali@kernel.org
Fixes: fc54bae ("PCI: iproc: Allow allocation of multiple MSIs")
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
Acked-by: Ray Jui <ray.jui@broadcom.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit b5d9209 ]

Fix to return negative error code -ENODEV from the unsupported revision
error handling case instead of 0, as done elsewhere in this function.

Link: https://lore.kernel.org/r/20210308135619.19133-1-weiyongjun1@huawei.com
Fixes: 0cdface ("PCI: brcmstb: support BCM4908 with external PERST# signal controller")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Krzysztof Wilczyński <kw@linux.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit c99e755 ]

In pci_scan_device(), if pci_setup_device() fails for any reason, the code
will not release device's of_node by calling pci_release_of_node().  Fix
that by calling the release function.

Fixes: 98d9f30 ("pci/of: Match PCI devices to OF nodes dynamically")
Link: https://lore.kernel.org/r/20210124232826.1879-1-dmitry.baryshkov@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
…w_handler hook

[ Upstream commit a506bd5 ]

The commit 1879445 ("perf/core: Set event's default
::overflow_handler()") set a default event->overflow_handler in
perf_event_alloc(), and replace the check event->overflow_handler with
is_default_overflow_handler(), but one is missing.

Currently, the bp->overflow_handler can not be NULL. As a result,
enable_single_step() is always not invoked.

Comments from Zhen Lei:

 https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210207105934.2001-1-thunder.leizhen@huawei.com/

Fixes: 1879445 ("perf/core: Set event's default ::overflow_handler()")
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Cc: Wang Nan <wangnan0@huawei.com>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit e1175f0 ]

Now, fallocate() on a pinned file only allocates blocks which aligns
to segment rather than section, so GC may try to migrate pinned file's
block, and after several times of failure, pinned file's block could
be migrated to other place, however user won't be aware of such
condition, and then old obsolete block address may be readed/written
incorrectly.

To avoid such condition, let's try to allocate pinned file's blocks
with section alignment.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 88f2cfc ]

In the case of expanding pinned file, map.m_lblk and map.m_len
will update in each round of section allocation, so in error
path, last i_size will be calculated with wrong m_lblk and m_len,
fix it.

Fixes: f5a53ed ("f2fs: support aligned pinned file")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 6613bc2 ]

get_features ops of pci_epc_ops may return NULL, causing NULL pointer
dereference in pci_epf_test_alloc_space function. Let us add a check for
pci_epc_feature pointer in pci_epf_test_bind before we access it to avoid
any such NULL pointer dereference and return -ENOTSUPP in case
pci_epc_feature is not found.

When the patch is not applied and EPC features is not implemented in the
platform driver, we see the following dump due to kernel NULL pointer
dereference.

Call trace:
 pci_epf_test_bind+0xf4/0x388
 pci_epf_bind+0x3c/0x80
 pci_epc_epf_link+0xa8/0xcc
 configfs_symlink+0x1a4/0x48c
 vfs_symlink+0x104/0x184
 do_symlinkat+0x80/0xd4
 __arm64_sys_symlinkat+0x1c/0x24
 el0_svc_common.constprop.3+0xb8/0x170
 el0_svc_handler+0x70/0x88
 el0_svc+0x8/0x640
Code: d2800581 b9403ab9 f9404ebb 8b394f60 (f9400400)
---[ end trace a438e3c5a24f9df0 ]---

Link: https://lore.kernel.org/r/20210324101609.79278-1-shradha.t@samsung.com
Fixes: 2c04c5b ("PCI: pci-epf-test: Use pci_epc_get_features() to get EPC features")
Signed-off-by: Sriram Dash <dash.sriram@gmail.com>
Signed-off-by: Shradha Todi <shradha.t@samsung.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Reviewed-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 61461fc ]

In CP disabling mode, there are two issues when using LFS or SSR | AT_SSR
mode to select victim:

1. LFS is set to find source section during GC, the victim should have
no checkpointed data, since after GC, section could not be set free for
reuse.

Previously, we only check valid chpt blocks in current segment rather
than section, fix it.

2. SSR | AT_SSR are set to find target segment for writes which can be
fully filled by checkpointed and newly written blocks, we should never
select such segment, otherwise it can cause panic or data corruption
during allocation, potential case is described as below:

 a) target segment has 'n' (n < 512) ckpt valid blocks
 b) GC migrates 'n' valid blocks to other segment (segment is still
    in dirty list)
 c) GC migrates '512 - n' blocks to target segment (segment has 'n'
    cp_vblocks and '512 - n' vblocks)
 d) If GC selects target segment via {AT,}SSR allocator, however there
    is no free space in targe segment.

Fixes: 4354994 ("f2fs: checkpoint disabling")
Fixes: 093749e ("f2fs: support age threshold based garbage collection")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 823d13e ]

In order to avoid race with f2fs_do_replace_block().

Fixes: f5a53ed ("f2fs: support aligned pinned file")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit f8b139e ]

IS_ERR() and PTR_ERR() use wrong pointer, it should be
writeback_fid, fix it.

Link: http://lkml.kernel.org/r/20210330130632.1054357-1-yangyingliang@huawei.com
Fixes: 5bfe97d ("9p: Fix writeback fid incorrectly being attached to dentry")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
[Dominique: adjusted commit summary]
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 23738e7 ]

When we mount an unclean f2fs image in a readonly block device, let's
make mount() succeed only when there is no recoverable data in that
image, otherwise after mount(), file fsyned won't be recovered as user
expected.

Fixes: 938a184 ("f2fs: give a warning only for readonly partition")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit be1ee45 ]

In the cache writing process, if it is an atomic file, increase the page
count of F2FS_WB_CP_DATA, otherwise increase the page count of
F2FS_WB_DATA.

When you step into the hook branch due to insufficient memory in
f2fs_write_begin, f2fs_drop_inmem_pages_all will be called to traverse
all atomic inodes and clear the FI_ATOMIC_FILE mark of all atomic files.

In f2fs_drop_inmem_pages,first acquire the inmem_lock , revoke all the
inmem_pages, and then clear the FI_ATOMIC_FILE mark. Before this mark is
cleared, other threads may hold inmem_lock to add inmem_pages to the inode
that has just been emptied inmem_pages, and increase the page count of
F2FS_WB_CP_DATA.

When the IO returns, it is found that the FI_ATOMIC_FILE flag is cleared
by f2fs_drop_inmem_pages_all, and f2fs_is_atomic_file returns false,which
causes the page count of F2FS_WB_DATA to be decremented. The page count of
F2FS_WB_CP_DATA cannot be cleared. Finally, hungtask is triggered in
f2fs_wait_on_all_pages because get_pages will never return zero.

process A:				process B:
f2fs_drop_inmem_pages_all
->f2fs_drop_inmem_pages of inode#1
    ->mutex_lock(&fi->inmem_lock)
    ->__revoke_inmem_pages of inode#1	f2fs_ioc_commit_atomic_write
    ->mutex_unlock(&fi->inmem_lock)	->f2fs_commit_inmem_pages of inode#1
					->mutex_lock(&fi->inmem_lock)
					->__f2fs_commit_inmem_pages
					    ->f2fs_do_write_data_page
					        ->f2fs_outplace_write_data
					            ->do_write_page
					                ->f2fs_submit_page_write
					                    ->inc_page_count(sbi, F2FS_WB_CP_DATA )
					->mutex_unlock(&fi->inmem_lock)
    ->spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
    ->clear_inode_flag(inode, FI_ATOMIC_FILE)
    ->spin_unlock(&sbi->inode_lock[ATOMIC_FILE])
					f2fs_write_end_io
					->dec_page_count(sbi, F2FS_WB_DATA );

We can fix the problem by putting the action of clearing the FI_ATOMIC_FILE
mark into the inmem_lock lock. This operation can ensure that no one will
submit the inmem pages before the FI_ATOMIC_FILE mark is cleared, so that
there will be no atomic writes waiting for writeback.

Fixes: 57864ae ("f2fs: limit # of inmemory pages")
Signed-off-by: Yi Zhuang <zhuangyi1@huawei.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit ee3707a ]

If the loop in nfs_readdir_xdr_to_array() runs more than once, subsequent
READDIR RPCs may wrongly carry a zero cookie verifier and non-zero cookie.
Make sure subsequent calls to READDIR carry the cookie verifier returned
by the first call.

Signed-off-by: Nagendra S Tomar <natomar@microsoft.com>
Fixes: b593c09 ("NFS: Improve handling of directory verifiers")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Upstream commit 13884ff ]

If we're doing uncached readdir(), then the readdir cookie could be
different from the one cached in the nfs_inode. We should therefore
ensure that we save that one in the struct nfs_open_dir_context.

Fixes: 35df59d ("NFS: Reduce number of RPC calls when doing uncached readdir")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tmlind and others added 27 commits May 19, 2021 10:56
commit 25de4ce upstream.

There is a timer wrap issue on dra7 for the ARM architected timer.
In a typical clock configuration the timer fails to wrap after 388 days.

To work around the issue, we need to use timer-ti-dm percpu timers instead.

Let's configure dmtimer3 and 4 as percpu timers by default, and warn about
the issue if the dtb is not configured properly.

Let's do this as a single patch so it can be backported to v5.8 and later
kernels easily. Note that this patch depends on earlier timer-ti-dm
systimer posted mode fixes, and a preparatory clockevent patch
"clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue".

For more information, please see the errata for "AM572x Sitara Processors
Silicon Revisions 1.1, 2.0":

https://www.ti.com/lit/er/sprz429m/sprz429m.pdf

The concept is based on earlier reference patches done by Tero Kristo and
Keerthy.

Cc: Keerthy <j-keerthy@ti.com>
Cc: Tero Kristo <kristo@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210323074326.28302-3-tony@atomide.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 374157f upstream.

"usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply"
introduced a regression for req_out_volt and req_op_curr calculation.

req_out_volt should consider the newly calculated max voltage instead
of previously accepted max voltage by the port partner. Likewise,
req_op_curr should consider the newly calculated max current instead
of previously accepted max current by the port partner.

Fixes: e3a0720 ("usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20210415050121.1928298-1-badhri@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit b410418 upstream.

syzbot can trigger the WARN() in init_uevent_argv() which isn't the
nicest as the code does properly recover and handle the error.  So
change the WARN() call to pr_warn() and provide some more information on
what the buffer size that was needed.

Link: https://lore.kernel.org/r/20201107082206.GA19079@kroah.com
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: linux-kernel@vger.kernel.org
Reported-by: syzbot+92340f7b2b4789907fdb@syzkaller.appspotmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20210405094852.1348499-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit ea99521 upstream.

Our code analyzer reported a double free bug.

In gen8_preallocate_top_level_pdp, pde and pde->pt.base are allocated
via alloc_pd(vm) with one reference. If pin_pt_dma() failed, pde->pt.base
is freed by i915_gem_object_put() with a reference dropped. Then free_pd
calls free_px() defined in intel_ppgtt.c, which calls i915_gem_object_put()
to put pde->pt.base again.

As pde->pt.base is protected by refcount, so the second put will not free
pde->pt.base actually. But, maybe it is better to remove the first put?

Fixes: 82adf90 ("drm/i915/gt: Shrink i915_page_directory's slab bucket")
Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210426124340.4238-1-lyl2019@mail.ustc.edu.cn
(cherry picked from commit ac69496)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit d9aa657 upstream.

Link status is different from display connected status in the case
of something like an Apple dongle where the type-c plug can be
connected, and therefore the link is connected, but no sink is
connected until an HDMI cable is plugged into the dongle.
The sink_count of DPCD of dongle will increase to 1 once an HDMI
cable is plugged into the dongle so that display connected status
will become true. This checking also apply at pm_resume.

Changes in v4:
-- none

Fixes: 94e58e2 ("drm/msm/dp: reset dp controller only at boot up and pm_resume")
Reported-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Tested-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
Fixes: 8ede2ec ("drm/msm/dp: Add DP compliance tests on Snapdragon Chipsets")
Link: https://lore.kernel.org/r/1619048258-8717-2-git-send-email-khsieh@codeaurora.org
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 04d0199 upstream.

We've defined C0DRB3/C1DRB3 as 16 bit registers, so access them
as such.

Fixes: 1c8242c ("drm/i915: Use unchecked writes for setting up the fences")
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210421153401.13847-3-ville.syrjala@linux.intel.com
(cherry picked from commit f765a5b)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit a915fe5 upstream.

__i915_active_call annotation is required on the retire callback to ensure
correct function alignment.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: a21ce8a ("drm/i915/overlay: Switch to using i915_active tracking")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210429083530.849546-1-tvrtko.ursulin@linux.intel.com
(cherry picked from commit d8e44e4)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 402be8a upstream.

The retire logic uses the 2 lower bits of the pointer to the retire
function to store flags. However, the auto_retire function is not
guaranteed to be aligned to a multiple of 4, which causes crashes as
we jump to the wrong address, for example like this:

2021-04-24T18:03:53.804300Z WARNING kernel: [  516.876901] invalid opcode: 0000 [Freescale#1] PREEMPT SMP NOPTI
2021-04-24T18:03:53.804310Z WARNING kernel: [  516.876906] CPU: 7 PID: 146 Comm: kworker/u16:6 Tainted: G     U            5.4.105-13595-g3cd84167b2df Freescale#1
2021-04-24T18:03:53.804311Z WARNING kernel: [  516.876907] Hardware name: Google Volteer2/Volteer2, BIOS Google_Volteer2.13672.76.0 02/22/2021
2021-04-24T18:03:53.804312Z WARNING kernel: [  516.876911] Workqueue: events_unbound active_work
2021-04-24T18:03:53.804313Z WARNING kernel: [  516.876914] RIP: 0010:auto_retire+0x1/0x20
2021-04-24T18:03:53.804314Z WARNING kernel: [  516.876916] Code: e8 01 f2 ff ff eb 02 31 db 48 89 d8 5b 5d c3 0f 1f 44 00 00 55 48 89 e5 f0 ff 87 c8 00 00 00 0f 88 ab 47 4a 00 31 c0 5d c3 0f <1f> 44 00 00 55 48 89 e5 f0 ff 8f c8 00 00 00 0f 88 9a 47 4a 00 74
2021-04-24T18:03:53.804319Z WARNING kernel: [  516.876918] RSP: 0018:ffff9b4d809fbe38 EFLAGS: 00010286
2021-04-24T18:03:53.804320Z WARNING kernel: [  516.876919] RAX: 0000000000000007 RBX: ffff927915079600 RCX: 0000000000000007
2021-04-24T18:03:53.804320Z WARNING kernel: [  516.876921] RDX: ffff9b4d809fbe40 RSI: 0000000000000286 RDI: ffff927915079600
2021-04-24T18:03:53.804321Z WARNING kernel: [  516.876922] RBP: ffff9b4d809fbe68 R08: 8080808080808080 R09: fefefefefefefeff
2021-04-24T18:03:53.804321Z WARNING kernel: [  516.876924] R10: 0000000000000010 R11: ffffffff92e44bd8 R12: ffff9279150796a0
2021-04-24T18:03:53.804322Z WARNING kernel: [  516.876925] R13: ffff92791c368180 R14: ffff927915079640 R15: 000000001c867605
2021-04-24T18:03:53.804323Z WARNING kernel: [  516.876926] FS:  0000000000000000(0000) GS:ffff92791ffc0000(0000) knlGS:0000000000000000
2021-04-24T18:03:53.804323Z WARNING kernel: [  516.876928] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
2021-04-24T18:03:53.804324Z WARNING kernel: [  516.876929] CR2: 0000239514955000 CR3: 00000007f82da001 CR4: 0000000000760ee0
2021-04-24T18:03:53.804325Z WARNING kernel: [  516.876930] PKRU: 55555554
2021-04-24T18:03:53.804325Z WARNING kernel: [  516.876931] Call Trace:
2021-04-24T18:03:53.804326Z WARNING kernel: [  516.876935]  __active_retire+0x77/0xcf
2021-04-24T18:03:53.804326Z WARNING kernel: [  516.876939]  process_one_work+0x1da/0x394
2021-04-24T18:03:53.804327Z WARNING kernel: [  516.876941]  worker_thread+0x216/0x375
2021-04-24T18:03:53.804327Z WARNING kernel: [  516.876944]  kthread+0x147/0x156
2021-04-24T18:03:53.804335Z WARNING kernel: [  516.876946]  ? pr_cont_work+0x58/0x58
2021-04-24T18:03:53.804335Z WARNING kernel: [  516.876948]  ? kthread_blkcg+0x2e/0x2e
2021-04-24T18:03:53.804336Z WARNING kernel: [  516.876950]  ret_from_fork+0x1f/0x40
2021-04-24T18:03:53.804336Z WARNING kernel: [  516.876952] Modules linked in: cdc_mbim cdc_ncm cdc_wdm xt_cgroup rfcomm cmac algif_hash algif_skcipher af_alg xt_MASQUERADE uinput snd_soc_rt5682_sdw snd_soc_rt5682 snd_soc_max98373_sdw snd_soc_max98373 snd_soc_rl6231 regmap_sdw snd_soc_sof_sdw snd_soc_hdac_hdmi snd_soc_dmic snd_hda_codec_hdmi snd_sof_pci snd_sof_intel_hda_common intel_ipu6_psys snd_sof_xtensa_dsp soundwire_intel soundwire_generic_allocation soundwire_cadence snd_sof_intel_hda snd_sof snd_soc_hdac_hda snd_soc_acpi_intel_match snd_soc_acpi snd_hda_ext_core soundwire_bus snd_hda_intel snd_intel_dspcfg snd_hda_codec snd_hwdep snd_hda_core intel_ipu6_isys videobuf2_dma_contig videobuf2_v4l2 videobuf2_common videobuf2_memops mei_hdcp intel_ipu6 ov2740 ov8856 at24 sx9310 dw9768 v4l2_fwnode cros_ec_typec intel_pmc_mux roles acpi_als typec fuse iio_trig_sysfs cros_ec_light_prox cros_ec_lid_angle cros_ec_sensors cros_ec_sensors_core industrialio_triggered_buffer cros_ec_sensors_ring kfifo_buf industrialio cros_ec_sensorhub
2021-04-24T18:03:53.804337Z WARNING kernel: [  516.876972]  cdc_ether usbnet iwlmvm lzo_rle lzo_compress iwl7000_mac80211 iwlwifi zram cfg80211 r8152 mii btusb btrtl btintel btbcm bluetooth ecdh_generic ecc joydev
2021-04-24T18:03:53.804337Z EMERG kernel: [  516.879169] gsmi: Log Shutdown Reason 0x03

This change fixes this by aligning the function.

Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
Fixes: 229007e ("drm/i915: Wrap i915_active in a simple kreffed struct")
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210429031021.1218091-1-marcheu@chromium.org
(cherry picked from commit ca419f4)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 34138a5 upstream.

This clock must be always enabled to allow access to any registers in
fsys1 CMU. Until proper solution based on runtime PM is applied
(similar to what was done for Exynos5433), mark that clock as critical
so it won't be disabled.

It was observed on Samsung Galaxy S6 device (based on Exynos7420), where
UFS module is probed before pmic used to power that device.
In this case defer probe was happening and that clock was disabled by
UFS driver, causing whole boot to hang on next CMU access.

Fixes: 753195a ("clk: samsung: exynos7: Correct CMU_FSYS1 clocks names")
Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/linux-clk/20201024154346.9589-1-pawel.mikolaj.chmiel@gmail.com
[s.nawrocki: Added comment in the code]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 022b02b upstream.

Add the power domains names to the power domain struct so we
have meaningful name for every power domain. This also removes the
following debugfs error message.

  [    2.242068] debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!
  [    2.249949] debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!
  [    2.257784] debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!
  ...

Fixes: 59b644b ("soc: mediatek: Add MediaTek SCPSYS power domains")
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20210225175000.824661-1-enric.balletbo@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit e57b811 upstream.

Add the power domains names for the mt8183 SoC. This removes the debugfs
errors like the following:

  debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!

Fixes: eb9fa76 ("soc: mediatek: pm-domains: Add support for mt8183")
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20210225175000.824661-2-enric.balletbo@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 3edc01b upstream.

Add the power domains names for the mt8192 SoC.

Fixes: a49d5e7 ("soc: mediatek: pm-domains: Add support for mt8192")
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20210225175000.824661-3-enric.balletbo@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit c2357dd upstream.

When building with CONFIG_OF not set, the following clang
build warning is seen:

>> drivers/staging/media/rkvdec/rkvdec.c:967:34: warning: unused variable 'of_rkvdec_match' [-Wunused-const-variable]

Fix the warning by removing the unnecessary of_match_ptr().

Reported-by: kernel test robot <lkp@intel.com>
Fixes: cd33c83 ("media: rkvdec: Add the rkvdec driver")
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 63ce8e3 upstream.

There are some omissions in the previous patch about replacing
I2C_MAX_FAST_MODE__FREQ with I2C_MAX_FAST_MODE_PLUS_FREQ and
need to fix it.

Fixes: b44658e("i2c: mediatek: Send i2c master code at more than 1MHz")
Signed-off-by: Qii Wang <qii.wang@mediatek.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 7935bb5 upstream.

The "resets" property is not present on R-Car Gen1 SoCs.
Supporting it would require migrating from renesas,cpg-clocks to
renesas,cpg-mssr.

Fixes: 905fc6b ("dt-bindings: rcar-vin: Convert bindings to json-schema")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/217c8197efaee7d803b22d433abb0ea8e33b84c6.1619700314.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
…a779a0

commit 9468e7b upstream.

When adding support for V3U (r8a779a0) it was incorrectly recorded it
supports four nodes, while in fact it supports five. The fifth node is
named TSC0 and breaks the existing naming schema starting at 1. Work
around this by separately defining the reg property for V3U and others.

Restore the maximum number of nodes to three for other compatibles as
it was before erroneously increasing it for V3U.

Fixes: d7fdfb6 ("dt-bindings: thermal: rcar-gen3-thermal: Add r8a779a0 support")
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210310110716.3297544-1-niklas.soderlund+renesas@ragnatech.se
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit e86ff34 upstream.

The serial console is located on the Falcon CPU board.  Hence move
serial console configuration from the main Falcon DTS file to the DTS
file that describes the CPU board.

Fixes: 63070d7 ("arm64: dts: renesas: Add Renesas Falcon boards support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20210316154705.2433528-2-geert+renesas@glider.be
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
… qcom,qmp-phy.yaml

commit 94c3460 upstream.

The commit 724fabf ("dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy
information") has support for DP part of USB3+DP combo PHYs. However
this change is not backwards compatible, placing additional requirements
onto qcom,sc7180-qmp-usb3-phy and qcom,sdm845-qmp-usb3-phy device nodes
(to include separate DP part, etc). However the aforementioned nodes do
not inclue DP part, they strictly follow the schema defined in the
qcom,qmp-phy.yaml file. Move those compatibles, leaving
qcom,qmp-usb3-dp-phy.yaml to describe only real "combo" USB3+DP device nodes.

Fixes: 724fabf ("dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information")
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Sandeep Maheswaram <sanm@codeaurora.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210331151614.3810197-2-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit a7277a7 upstream.

The compatible strings "mediatek,*" appears two times, remove one of them.

Fixes: e69f5dc ("dt-bindings: serial: Convert 8250 to json-schema")
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210422090857.583-1-thunder.leizhen@huawei.com
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 62b3b36 upstream.

scripts/checkpatch.pl -f drivers/pci/controller/pcie-rcar-host.c:

    WARNING: DT compatible string "renesas,pcie-r8a7779" appears un-documented -- check ./Documentation/devicetree/bindings/
    torvalds#853: FILE: drivers/pci/controller/pcie-rcar-host.c:853:
    +	{ .compatible = "renesas,pcie-r8a7779",

Re-add the compatible value for R-Car H1, which was lost during the
json-schema conversion.  Make the "resets" property optional on R-Car
H1, as it is not present yet on R-Car Gen1 SoCs.

Fixes: 0d69ce3 ("dt-bindings: PCI: rcar-pci-host: Convert bindings to json-schema")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/fb0bb969cd0e5872ab5eac70e070242c0d8a5b81.1619700202.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 312723a upstream.

Since debugfs_allow is only set at boot time during __init, make it
read-only after being set.

Fixes: a24c6f7 ("debugfs: Add access restriction option")
Cc: Peter Enderborg <peter.enderborg@sony.com>
Reviewed-by: Peter Enderborg <peter.enderborg@sony.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20210405213959.3079432-1-keescook@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit fcdf3c3 upstream.

Using no_printk() for jbd_debug() revealed two warnings:

fs/jbd2/recovery.c: In function 'fc_do_one_pass':
fs/jbd2/recovery.c:256:30: error: format '%d' expects a matching 'int' argument [-Werror=format=]
  256 |                 jbd_debug(3, "Processing fast commit blk with seq %d");
      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/ext4/fast_commit.c: In function 'ext4_fc_replay_add_range':
fs/ext4/fast_commit.c:1732:30: error: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Werror=format=]
 1732 |                 jbd_debug(1, "Converting from %d to %d %lld",

The first one was added incorrectly, and was also missing a few newlines
in debug output, and the second one happened when the type of an
argument changed.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: d556435 ("jbd2: avoid -Wempty-body warnings")
Fixes: 6db0746 ("ext4: use BIT() macro for BH_** state bits")
Fixes: 5b849b5 ("jbd2: fast commit recovery path")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210409201211.1866633-1-arnd@kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit 53fe2a3 upstream.

Do not call nvme_configure_apst when the controller is not live, given
that nvme_configure_apst will fail due the lack of an admin queue when
the controller is being torn down and nvme_set_latency_tolerance is
called from dev_pm_qos_hide_latency_tolerance.

Fixes: 510a405("nvme: fix memory leak for power latency tolerance")
Reported-by: Peng Liu <liupeng17@lenovo.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
commit a4856e1 upstream.

commit 66c705d ("SoC: rsnd: add interrupt support for SSI BUSIF
buffer") adds __rsnd_ssi_interrupt() checks for BUSIF status,
but is using "break" at for loop.
This means it is not checking all status. Let's check all BUSIF status.

Fixes: commit 66c705d ("SoC: rsnd: add interrupt support for SSI BUSIF buffer")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874kgh1jsw.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
…HDEV=n

commit 68f5c12 upstream.

When CONFIG_NET_SWITCHDEV is disabled, the shim for switchdev_port_attr_set
inside br_mc_disabled_update returns -EOPNOTSUPP. This is not caught,
and propagated to the caller of br_multicast_add_port, preventing ports
from joining the bridge.

Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Fixes: ae1ea84 ("net: bridge: propagate error code and extack from br_mc_disabled_update")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Shuah Khan <skhan@linuxfoundation.org>
Tested-by: Fox Chen <foxhlchen@gmail.com>
Tested-by: Jason Self <jason@bluehome.net>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Rudi Heitbaum <rudi@heitbaum.com>
Link: https://lore.kernel.org/r/20210517140302.508966430@linuxfoundation.org
Tested-by: Rudi Heitbaum <rudi@heitbaum.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Shuah Khan <skhan@linuxfoundation.org>
Tested-by: Justin M. Forbes <jforbes@fedoraproject.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Link: https://lore.kernel.org/r/20210518135831.445321364@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This is the 5.12.5 stable release

Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
@otavio otavio merged commit 73cfd05 into Freescale:5.12.x+fslc May 19, 2021
zandrey added a commit to zandrey/meta-freescale that referenced this pull request May 25, 2021
Kernel repository has been upgraded to v5.12.5 from stable korg.

Following upstream commits are included in this version:
----
761ea31e416a Linux 5.12.5
7a7739b266d4 net: bridge: fix error in br_multicast_add_port when CONFIG_NET_SWITCHDEV=n
ef43e4db6e87 ASoC: rsnd: check all BUSIF status when error
6e3a85b8aa01 nvme: do not try to reconfigure APST when the controller is not live
6d4db5778533 ext4: fix debug format string warning
1ba874161ac3 debugfs: Make debugfs_allow RO after init
d9df1dce5090 dt-bindings: PCI: rcar-pci-host: Document missing R-Car H1 support
eb9488079f06 dt-bindings: serial: 8250: Remove duplicated compatible strings
561fc5bb53dd dt-bindings: phy: qcom,qmp-usb3-dp-phy: move usb3 compatibles back to qcom,qmp-phy.yaml
60ee44221fe9 arm64: dts: renesas: falcon: Move console config to CPU board DTS
045228c6d17e dt-bindings: thermal: rcar-gen3-thermal: Support five TSC nodes on r8a779a0
26f3b85a9ee1 dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1
5bf7dfa40ae4 i2c: mediatek: Fix send master code at more than 1MHz
c36f6f6b4ddd media: rkvdec: Remove of_match_ptr()
eb68304c8771 soc: mediatek: pm-domains: Add a power domain names for mt8192
6858b67769a8 soc: mediatek: pm-domains: Add a power domain names for mt8183
0a84ada8aa8a soc: mediatek: pm-domains: Add a meaningful power domain name
14ed485c3180 clk: exynos7: Mark aclk_fsys1_200 as critical
f7520970d535 drm/i915: Fix crash in auto_retire
7d88c1e740ea drm/i915/overlay: Fix active retire callback alignment
f3ea4506674c drm/i915: Read C0DRB3/C1DRB3 as 16 bits again
628cf5277a35 drm/msm/dp: check sink_count before update is_connected status
ab2f71a42164 drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp
6f7ffe336696 kobject_uevent: remove warning in init_uevent_argv()
26c704bb6eed usb: typec: tcpm: Fix error while calculating PPS out values
a8aeb722aeac clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940
be50eafb7ddf clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue
be5839c7e607 MIPS: Avoid handcoded DIVU in `__div64_32' altogether
26fc611259fe MIPS: Avoid DIVU in `__div64_32' is result would be zero
7bb9f4711005 MIPS: Reinstate platform `__div64_32' handler
856dc266fcf7 mm: fix struct page layout on 32-bit systems
e3ea1895df71 KVM: VMX: Disable preemption when probing user return MSRs
7c9ebc3e4c94 KVM: VMX: Do not advertise RDPID if ENABLE_RDTSCP control is unsupported
bd0e8455b85b KVM: nVMX: Always make an attempt to map eVMCS after migration
ac51e3ac7657 KVM: x86: Add support for RDPID without RDTSCP
c3d8d9e97607 KVM: x86: Move RDPID emulation intercept to its own enum
a6af4f9ebe20 KVM: x86: Emulate RDPID only if RDTSCP is supported
3e6b3632cd4e xen/gntdev: fix gntdev_mmap() error exit path
6f1b9e8767ae alarmtimer: Check RTC features instead of ops
79c9011443ad cdc-wdm: untangle a circular dependency between callback and softint
d310d89c7921 iio: tsl2583: Fix division by a zero lux_val
2a40e13d6a71 iio: gyro: mpu3050: Fix reported temperature value
ab6c935ba3a0 iio: core: fix ioctl handlers removal
6c0197c59f97 xhci: Add reset resume quirk for AMD xhci controller.
f137f0379893 xhci: Do not use GFP_KERNEL in (potentially) atomic context
45157f15b2f7 xhci: Fix giving back cancelled URBs even if halted endpoint can't reset
39291053c49e xhci-pci: Allow host runtime PM as default for Intel Alder Lake xHCI
a46de12cc754 usb: typec: ucsi: Put fwnode in any case during ->probe()
5e9c6f58b01e usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4
99b4df1251d2 usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP
3a37f7581b7d usb: dwc3: gadget: Return success always for kick transfer in ep queue
c30863ab08e1 usb: dwc3: gadget: Enable suspend events
bd03dadb1a1f usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe()
e41a3402d106 usb: core: hub: fix race condition about TRSMRCY of resume
b2714ec7e6fd usb: dwc2: Fix gadget DMA unmap direction
1f418274cfc0 usb: xhci: Increase timeout for HC halt
9e64fc974c16 usb: dwc3: pci: Enable usb2-gadget-lpm-disable for Intel Merrifield
9a053a48decc usb: dwc3: omap: improve extcon initialization
5e9e6d114b53 blk-mq: Swap two calls in blk_mq_exit_queue()
0b3c8641cc49 blk-mq: plug request for shared sbitmap
ba5dce1ef996 powerpc/64s: Make NMI record implicitly soft-masked code as irqs disabled
54b78ba7e96e nbd: Fix NULL pointer in flush_workqueue
ead8ea54ecc4 sched/fair: Fix clearing of has_idle_cores flag in select_idle_cpu()
376e35eca187 f2fs: compress: fix to assign cc.cluster_idx correctly
936158b15e26 f2fs: compress: fix race condition of overwrite vs truncate
9739055a5d02 f2fs: compress: fix to free compress page correctly
5bdb34466ad8 nvmet-rdma: Fix NULL deref when SEND is completed with error
03fce793a991 nvmet: fix inline bio check for passthru
3df867719031 nvmet: fix inline bio check for bdev-ns
2ef3c76540c4 kyber: fix out of bounds access when preempted
a7e17a8d421a ACPI: scan: Fix a memory leak in an error handling path
7225188aa169 hwmon: (ltc2992) Put fwnode in error case during ->probe()
8758cf98e944 usb: musb: Fix an error message
4d82702a9235 usb: typec: tcpm: Fix wrong handling for Not_Supported in VDM AMS
b2a817c66980 hwmon: (occ) Fix poll rate limiting
c4f5af40c9ce usb: fotg210-hcd: Fix an error message
f66cf2c9e4c7 iio: core: return ENODEV if ioctl is unknown
faf84061548a iio: hid-sensors: select IIO_TRIGGERED_BUFFER under HID_SENSOR_IIO_TRIGGER
37b2153a79be iio: proximity: pulsedlight: Fix rumtime PM imbalance on error
e317435d3efa iio: light: gp2ap002: Fix rumtime PM imbalance on error
b4b8e9601d7e usb: dwc3: gadget: Free gadget structure only after freeing endpoints
7bc747f42917 perf tools: Fix dynamic libbpf link
0accab4d2e7a xen/unpopulated-alloc: fix error return code in fill_list()
db822599b21e dax: Wake up all waiters after invalidating dax entry
fa38341f7813 dax: Add a wakeup mode parameter to put_unlocked_entry()
27514d7b526a dax: Add an enum for specifying dax wakup mode
bfe31390c048 KVM: SVM: Move GHCB unmapping to fix RCU warning
80fae432eb8d KVM: x86: Prevent deadlock against tk_core.seq
171895f5b596 KVM: x86: Cancel pvclock_gtod_work on module removal
41d92e63158a drm/msm/dp: initialize audio_comp when audio starts
081f7f934970 KVM: LAPIC: Accurately guarantee busy wait for timer to expire when using hv_timer
ac7055e56367 drm/msm: fix LLC not being enabled for mmu500 targets
0b4d0ae9ffd8 kvm: exit halt polling on need_resched() as well
266a9da628ae drm/i915/dp: Use slow and wide link training for everything
afef1a33dd5a drm/i915: Avoid div-by-zero on gen2
013950b55e53 drm/amd/display: Initialize attribute for hdcp_srm sysfs file
15372dd6de6d drm/radeon/dpm: Disable sclk switching on Oland when two 4K 60Hz monitors are connected
78536c791ff8 btrfs: zoned: sanity check zone type
c6b9a5a82044 btrfs: initialize return variable in cleanup_free_space_cache_v1
70264829d969 btrfs: fix race leading to unpersisted data and metadata on fsync
757e85966740 btrfs: zoned: fix silent data loss after failure splitting ordered extent
96157707c042 btrfs: fix deadlock when cloning inline extents and using qgroups
0449f835a686 arm64: Fix race condition on PG_dcache_clean in __sync_icache_dcache()
74314ea12197 arm64: mte: initialize RGSR_EL1.SEED in __cpu_setup
8942128ca6a3 x86, sched: Fix the AMD CPPC maximum performance value on certain AMD Ryzen generations
86d9a6b8c799 blk-iocost: fix weight updates of inner active iocgs
b582847eae10 mm/hugetlb: fix cow where page writtable in child
62917eecde04 mm/hugetlb: fix F_SEAL_FUTURE_WRITE
89951f677300 kasan: fix unit tests with CONFIG_UBSAN_LOCAL_BOUNDS enabled
2d59a0ed8b26 userfaultfd: release page in error path to avoid BUG_ON
9ce43b4f3c13 squashfs: fix divide error in calculate_skip()
97314e45aa12 hfsplus: prevent corruption in shrinking truncate
5bc00fdda1e9 powerpc/64s: Fix crashes when toggling entry flush barrier
ba16e1f89dc2 powerpc/64s: Fix crashes when toggling stf barrier
ecd6bdc103e3 sh: Remove unused variable
e3a8166fa6e2 ARC: mm: Use max_high_pfn as a HIGHMEM zone border
059e7eeb1f39 ARC: mm: PAE: use 40-bit physical page mask
47fcfe49330d ARC: entry: fix off-by-one error in syscall number validation
d7a9d125c3c5 mptcp: fix splat when closing unaccepted socket
ca1fff557831 i40e: Remove LLDP frame filters
bd4febf1386c i40e: Fix PHY type identifiers for 2.5G and 5G adapters
4591ae84b283 i40e: fix the restart auto-negotiation after FEC modified
1fd5d262e744 i40e: Fix use-after-free in i40e_client_subtask()
ad453d44cf23 i40e: fix broken XDP support
a388d10961ff netfilter: nftables: avoid overflows in nft_hash_buckets()
56587c4df27a kernel/resource: make walk_mem_res() find all busy IORESOURCE_MEM resources
dc3b515a96bf kernel/resource: make walk_system_ram_res() find all busy IORESOURCE_SYSTEM_RAM resources
8bb4152dfd5f kernel: kexec_file: fix error return code of kexec_calculate_store_digests()
68428bbdc5f0 fs/proc/generic.c: fix incorrect pde_is_permanent check
e72b2405436c net: ipa: fix inter-EE IRQ register definitions
c6b7a6323308 sched/fair: Fix unfairness caused by missing load decay
42ee47c7e356 sched: Fix out-of-bound access in uclamp
a6bf154e0ae8 can: m_can: m_can_tx_work_queue(): fix tx_skb race condition
e1e10a390fd9 can: mcp251x: fix resume from sleep before interface was brought up
eb40b2f51447 can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() in error path
15f8f96ec7fc can: mcp251xfd: mcp251xfd_probe(): fix an error pointer dereference in probe
dd3bebf515f3 netfilter: nftables: Fix a memleak from userdata error path in new objects
2bf8be1ebc94 netfilter: nfnetlink_osf: Fix a missing skb_header_pointer() NULL check
0687acc371eb smc: disallow TCP_ULP in smc_setsockopt()
45a1a92d0a00 net: fix nla_strcmp to handle more then one trailing null character
2af12426dff8 ethtool: fix missing NLM_F_MULTI flag when dumping
7ad70fa66135 kfence: await for allocation using wait_event
36c6110fd85b mm/gup: check for isolation errors
8ee15052ce9e mm/gup: return an error on migration failure
97e5135ddcaa mm/gup: check every subpage of a compound page during isolation
d2348b6e465a ksm: fix potential missing rmap_item for stable_node
f1183744e8d0 mm/migrate.c: fix potential indeterminate pte entry in migrate_vma_insert_page()
ed98b887d31c mm/hugeltb: handle the error case in hugetlb_fix_reserve_counts()
22349c15b5a8 khugepaged: fix wrong result value for trace_mm_collapse_huge_page_isolate()
d8d52005f57b arm64: entry: always set GIC_PRIO_PSR_I_SET during entry
b520ea4ea613 arm64: entry: factor irq triage logic into macros
b1652314ac62 drm/radeon: Avoid power table parsing memory leaks
33b3d1dc73ce drm/radeon: Fix off-by-one power_state index heap overwrite
beea32fb00c3 net: stmmac: Clear receive all(RA) bit when promiscuous mode is off
3a8a866e9372 powerpc/powernv/memtrace: Fix dcache flushing
271976d0ebf8 xsk: Fix for xp_aligned_validate_desc() when len == chunk_size
21e926b7c9de netfilter: xt_SECMARK: add new revision to fix structure layout
0492084fa4c6 sctp: fix a SCTP_MIB_CURRESTAB leak in sctp_sf_do_dupcook_b
d90529392aaf ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
7c968f9ca134 PCI: brcmstb: Use reset/rearm instead of deassert/assert
fe55c9d259c4 ata: ahci_brcm: Fix use of BCM7216 reset controller
b345ba612d4d block/rnbd-clt: Check the return value of the function rtrs_clt_query
05a023f98e0d block/rnbd-clt: Change queue_depth type in rnbd_clt_session to size_t
117151b0d560 libbpf: Fix signed overflow in ringbuf_process_ring
36e63f39d796 sunrpc: Fix misplaced barrier in call_decode
8eda58d1e939 RISC-V: Fix error code returned by riscv_hartid_to_cpuid()
0bfd913c2121 sctp: do asoc update earlier in sctp_sf_do_dupcook_a
e4e9d03b9841 net: hns3: disable phy loopback setting in hclge_mac_start_phy
8dd424cd4a56 net: hns3: use netif_tx_disable to stop the transmit queue
449a9789f735 net: hns3: fix for vxlan gpe tx checksum bug
57464cecdf77 arm64: stacktrace: restore terminal records
f3309b93c066 net: hns3: add check for HNS3_NIC_STATE_INITED in hns3_reset_notify_up_enet()
a81a61e3843a net: hns3: initialize the message content in hclge_get_link_mode()
4c2b7a0e6dab net: hns3: fix incorrect configuration for igu_egu_hw_err
b5fdbaf6d327 rtc: ds1307: Fix wday settings for rx8130
5b86538ebcce scsi: ufs: core: Narrow down fast path in system suspend path
7d129abdd95f scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend
31a585964e33 scsi: ufs: core: Do not put UFS power into LPM if link is broken
50c6b018a0fa scsi: qla2xxx: Prevent PRLI in target mode
0a219432127d ceph: fix inode leak on getattr error in __fh_to_dentry
569bb35eb594 swiotlb: Fix the type of index
38ccbba86770 riscv: Select HAVE_DYNAMIC_FTRACE when -fpatchable-function-entry is available
e9cfa24c28f4 xprtrdma: rpcrdma_mr_pop() already does list_del_init()
19b5fa9489b5 xprtrdma: Fix cwnd update ordering
9ec43636c735 xprtrdma: Avoid Receive Queue wrapping
726d2d5e0844 pwm: atmel: Fix duty cycle calculation in .get_state()
c664aaec9aee SUNRPC: Fix null pointer dereference in svc_rqst_free()
3bfd15afcbbb SUNRPC: fix ternary sign expansion bug in tracing
e7a75d332d39 dmaengine: idxd: fix cdev setup and free device lifetime issues
1c28fd5f94d8 dmaengine: idxd: fix group conf_dev lifetime
35ea8721d9e6 dmaengine: idxd: fix engine conf_dev lifetime
b09ad63775f5 dmaengine: idxd: fix wq conf_dev 'struct device' lifetime
a13e4cf29da6 dmaengine: idxd: fix idxd conf_dev 'struct device' lifetime
b89ae48e3b88 dmaengine: idxd: use ida for device instance enumeration
eb5fb986f904 dmaengine: idxd: removal of pcim managed mmio mapping
ee87b468ce05 dmaengine: idxd: cleanup pci interrupt vector allocation management
7982ff0d7449 dmaengine: idxd: fix dma device lifetime
7bc402f843e7 dmaengine: idxd: Fix potential null dereference on pointer status
5a373286e281 rtc: fsl-ftm-alarm: add MODULE_TABLE()
15f103a1ca30 nfsd: ensure new clients break delegations
b8ba461b81a5 NFSv4.x: Don't return NFS4ERR_NOMATCHING_LAYOUT if we're unmounting
0e97ce337994 thermal/drivers/tsens: Fix missing put_device error
9765abb2f89d NFSv42: Copy offload should update the file size when appropriate
abc164b84f0e SUNRPC: Handle major timeout in xprt_adjust_timeout()
947355dd9a69 SUNRPC: Remove trace_xprt_transmit_queued
835b2f8c4e68 SUNRPC: Move fault injection call sites
c63e7c5d94e9 NFSv4.2 fix handling of sr_eof in SEEK's reply
754efbbdaf4e pNFS/flexfiles: fix incorrect size check in decode_nfs_fh()
9b29c75db48d remoteproc: pru: Fix and cleanup firmware interrupt mapping logic
2ecce3d08fb2 remoteproc: pru: Fix wrong success return value for fw events
7da84d16394d remoteproc: pru: Fixup interrupt-parent logic for fw events
8aaf14b0b05b PCI: endpoint: Fix missing destroy_workqueue()
14a952ccf173 NFS: Deal correctly with attribute generation counter overflow
81fc0f863a64 NFSv4.2: Always flush out writes in nfs42_proc_fallocate()
ff29c67b809c NFS: Fix attribute bitmask in _nfs42_proc_fallocate()
425d311e5115 NFS: nfs4_bitmask_adjust() must not change the server global bitmasks
de68b23bedae rpmsg: qcom_glink_native: fix error return code of qcom_glink_rx_data()
058b7d4f013e f2fs: fix to avoid accessing invalid fio in f2fs_allocate_data_block()
2f8dda840046 NFS: Only change the cookie verifier if the directory page cache is empty
7d2597210e79 NFS: Fix handling of cookie verifier in uncached_readdir()
213a094da6c9 nfs: Subsequent READDIR calls should carry non-zero cookieverifier
37d20a735e60 f2fs: Fix a hungtask problem in atomic write
83e206454358 f2fs: fix to restrict mount condition on readonly block device
70dbc3283c3a fs: 9p: fix v9fs_file_open writeback fid error check
88a46398bf05 f2fs: fix to cover __allocate_new_section() with curseg_lock
211372b25715 f2fs: fix to avoid touching checkpointed data in get_victim()
0169d4f0bee4 PCI: endpoint: Fix NULL pointer dereference for ->get_features()
5ede51f41b3a f2fs: fix to update last i_size if fallocate partially succeeds
16e712005049 f2fs: fix to align to section for fallocate() on pinned file
dabe299425b1 ARM: 9064/1: hw_breakpoint: Do not directly check the event's overflow_handler hook
e91ab2363168 PCI: Release OF node in pci_scan_device()'s error path
a81e0a234320 PCI: brcmstb: Fix error return code in brcm_pcie_probe()
ad6461f16464 PCI: iproc: Fix return value of iproc_msi_irq_domain_alloc()
ef27ec3805c0 remoteproc: qcom_q6v5_mss: Validate p_filesz in ELF loader
d06ad5425e98 rtc: tps65910: include linux/property.h
155c1706ed0d f2fs: fix a redundant call to f2fs_balance_fs if an error occurs
822054e5026c f2fs: fix panic during f2fs_resize_fs()
339bf4baa5eb f2fs: fix to allow migrating fully valid segment
a04d3f9877cb PCI/RCEC: Fix RCiEP device to RCEC association
16276fb241c0 thermal: thermal_of: Fix error return code of thermal_of_populate_bind_params()
746fa58120aa leds: lgm: fix gpiolib dependency
22052b84eea7 ASoC: rt286: Make RT286_SET_GPIO_* readable and writable
9ac5c943c399 watchdog: fix barriers when printing backtraces from all CPUs
c083d669dcc7 watchdog/softlockup: remove logic that tried to prevent repeated reports
071802a3a9d9 watchdog/softlockup: report the overall time of softlockups
04573e92b1d0 watchdog: explicitly update timestamp when reporting softlockup
15cfe627b05a watchdog: rename __touch_watchdog() to a better descriptive name
fc8f347e1217 ia64: module: fix symbolizer crash on fdescr
60e7dd22ba86 bnxt_en: Add PCI IDs for Hyper-V VF devices.
2c1cfecc94d0 kbuild: generate Module.symvers only when vmlinux exists
d3f0131b86a9 selftests: mlxsw: Fix mausezahn invocation in ERSPAN scale test
cbcf354333ea selftests: mlxsw: Increase the tolerance of backlog buildup
d363d3609311 net: ethernet: mtk_eth_soc: fix RX VLAN offload
6e541e8d52ab iavf: remove duplicate free resources calls
3b04966e0858 powerpc/iommu: Annotate nested lock for lockdep
51bf956d3c50 qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
08f92310c387 wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join
2b05548a8440 wl3501_cs: Fix out-of-bounds warnings in wl3501_send_pkt
259cdcc2822c crypto: ccp: Free SEV device if SEV init fails
0a8072134972 mt76: mt7615: fix entering driver-own state on mt7663
b824c8101886 drm/amdgpu: Add mem sync flag for IB allocated by SA
d80cd2008045 drm/amd/display: add handling for hdcp2 rx id list validation
be3fd94c21df drm/amd/display: fixed divide by zero kernel crash during dsc enablement
e39ff623cdec powerpc/pseries: Stop calling printk in rtas_stop_self()
0737b426244c samples/bpf: Fix broken tracex1 due to kprobe argument change
274e30f3f85b net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule
47a0bb49f2ee ethtool: ioctl: Fix out-of-bounds warning in store_link_ksettings_for_user()
33fe1e54657d ASoC: rt286: Generalize support for ALC3263 codec
f7fcd7b55605 mac80211: properly drop the connection in case of invalid CSA IE
21f1d27b06b9 wilc1000: Bring MAC address setting in line with typical Linux behavior
629d855c0f2f powerpc/smp: Set numa node before updating mask
44880149f825 powerpc/xive: Use the "ibm, chip-id" property only under PowerNV
a4fae79e1c4e flow_dissector: Fix out-of-bounds warning in __skb_flow_bpf_to_target()
e123fdd294a1 sctp: Fix out-of-bounds warning in sctp_process_asconf_param()
6d978f701bcf i2c: i801: Add support for Intel Alder Lake PCH-M
78fc41e6216f ALSA: hda/hdmi: fix race in handling acomp ELD notification at resume
c79b6ef5f947 ASoC: Intel: sof_sdw: add quirk for new ADL-P Rvp
59a9814c8440 ALSA: hda/realtek: Add quirk for Lenovo Ideapad S740
3c96f542bf75 kconfig: nconf: stop endless search loops
b09c2f732500 selftests: Set CC to clang in lib.mk if LLVM is set
dd74af4f37be drm/amd/display: Force vsync flip when reconfiguring MPCC
0bf066735bab iommu/amd: Remove performance counter pre-initialization test
40b97d88acbe Revert "iommu/amd: Fix performance counter initialization"
a9863a282f98 net: bridge: propagate error code and extack from br_mc_disabled_update
dc49a6391b28 ASoC: rsnd: call rsnd_ssi_master_clk_start() from rsnd_ssi_init()
b9ffa48e3d19 powerpc/mm: Add cond_resched() while removing hpte mappings
92dbe230fbef iwlwifi: trans/pcie: defer transport initialisation
60b9f967ad03 iwlwifi: queue: avoid memory leak in reset flow
d441b3a309ec iwlwifi: pcie: make cfg vs. trans_cfg more robust
e9423d1a37e0 cuse: prevent clone
2b50e2c77e3d virtiofs: fix userns
1b965c56029d fuse: invalidate attrs when page writeback completes
f3f672f88f14 i2c: imx: Fix PM reference leak in i2c_imx_reg_slave()
297ff6866bc6 mt76: mt7915: add wifi subsystem reset
ea81ee2ad2c9 mt76: mt7921: fix key set/delete issue
e79f04f2ccf8 mt76: mt7915: fix txpower init for TSSI off chips
be31395351ac mt76: mt7915: fix key set/delete issue
4f6458377e0e mt76: mt7915: always check return value from mt7915_mcu_alloc_wtbl_req
7df5286e9612 mt76: connac: always check return value from mt76_connac_mcu_alloc_wtbl_req
8d0834eab64c mt76: mt76x0: disable GTK offloading
c11122299694 mt76: mt7615: support loading EEPROM for MT7613BE
72b1993a5424 mt76: mt7615: fix key set/delete issues
14a5f69f474b rtw88: 8822c: add LC calibration for RTL8822C
bb55990c07ef pinctrl: samsung: use 'int' for register masks in Exynos
d320da6e4bee net: fec: use mac-managed PHY PM
e782c60aa10c net: phy: make PHY PM ops a no-op if MAC driver manages PHY PM
30e55f55bb71 ASoC: soc-compress: lock pcm_mutex to resolve lockdep error
a8933606c15e mac80211: clear the beacon's CRC after channel switch
9b1b2a59be23 mac80211: Set priority and queue mapping for injected frames
98138aa2e625 IB/hfi1: Correct oversized ring allocation
bcbdb4834974 coresight: Do not scan for graph if none is present
a3241f9019df MIPS: Loongson64: Use _CACHE_UNCACHED instead of _CACHE_UNCACHED_ACCELERATED
1a3b3a7674b1 Bluetooth: Do not set cur_adv_instance in adv param MGMT request
ee411020903a i2c: Add I2C_AQ_NO_REP_START adapter quirk
1fe18e625a45 selftests: mptcp: launch mptcp_connect with timeout
f1fef5c97a7e ASoC: rt5670: Add a quirk for the Dell Venue 10 Pro 5055
f5caa9943d45 Bluetooth: btusb: Enable quirk boolean flag for Mediatek Chip.
ccd9f0417c12 ice: handle increasing Tx or Rx ring sizes
18094f2b842e ASoC: Intel: bytcr_rt5640: Add quirk for the Chuwi Hi8 tablet
e6c10a27ddf9 iommu/arm-smmu-v3: Add a check to avoid invalid iotlb sync
a5ebdf08b44b can: dev: can_free_echo_skb(): don't crash the kernel if can_priv::echo_skb is accessed out of bounds
3e7996f1e6ef ip6_vti: proper dev_{hold|put} in ndo_[un]init methods
5ffb52837d25 net: hns3: add handling for xmit skb with recursive fraglist
4cd9a1b396fd net: hns3: remediate a potential overflow risk of bd_num_list
f3443d376ade powerpc/32: Statically initialise first emergency context
392a01682cbb ALSA: hda/hdmi: fix max DP-MST dev_num for Intel TGL+ platforms
86e410651194 selftests/powerpc: Fix L1D flushing tests for Power10
f2e8da285341 Bluetooth: check for zapped sk before connecting
759b3fb78309 net: bridge: when suppression is enabled exclude RARP packets
840ba6800301 net/sched: cls_flower: use ntohs for struct flow_dissector_key_ports
91f14c60aff8 Bluetooth: initialize skb_queue_head at l2cap_chan_create()
50ef75bbe733 Bluetooth: Set CONF_NOT_COMPLETE as l2cap_chan default
24cb3ff55895 ALSA: bebob: enable to deliver MIDI messages for multiple ports
bf95eb72efbe ALSA: rme9652: don't disable if not enabled
95e11e73128a ALSA: hdspm: don't disable if not enabled
df94915a89bf ALSA: hdsp: don't disable if not enabled
5f82c7be706d i2c: bail out early when RDWR parameters are wrong
016c0942c13b Bluetooth: Fix incorrect status handling in LE PHY UPDATE event
186007c91793 ASoC: rsnd: core: Check convert rate in rsnd_hw_params
c2da6ff22b4e net: stmmac: Set FIFO sizes for ipq806x
bbbb5a2cee25 net/mlx5e: Use net_prefetchw instead of prefetchw in MPWQE TX datapath
a7a3cc3245c7 ASoC: Intel: bytcr_rt5640: Enable jack-detect support on Asus T100TAF
e7610fc2dda7 tipc: convert dest node's address to network order
3fe241d36b3c fs: dlm: add shutdown hook
926fd4e47bdb fs: dlm: flush swork on shutdown
c1bb3ef861b6 fs: dlm: check on minimum msglen size
ce9e8126adc0 fs: dlm: change allocation limits
1b400d1b19d6 fs: dlm: add check if dlm is currently running
2929c46f0e0e fs: dlm: add errno handling to check callback
664523603440 fs: dlm: fix mark setting deadlock
ee2202dc67bc fs: dlm: fix debugfs dump
ecfbec245e91 ALSA: usb-audio: Add Pioneer DJM-850 to quirks-table
122a4838d022 ath11k: fix thermal temperature read
90ada0c77449 kvm: Cap halt polling at kvm->max_halt_poll_ns
94fdc966c7d9 cpufreq: intel_pstate: Use HWP if enabled by platform firmware
8c6d2e0ee501 PM: runtime: Fix unpaired parent child_count for force_resume
2cff742523ab ACPI: PM: Add ACPI ID of Alder Lake Fan
d25c24102b17 KVM/VMX: Invoke NMI non-IST entry instead of IST entry
fd722a57fe0b KVM: SVM: Make sure GHCB is mapped before updating
188770ddad9b btrfs: fix unmountable seed device after fstrim
36a6f5f0a7bb tpm, tpm_tis: Reserve locality in tpm_tis_resume()
7dd1d6a54004 tpm, tpm_tis: Extend locality handling to TPM2 in tpm_tis_gen_interrupt()
a85e9d1fae78 tpm: fix error return code in tpm2_get_cc_attrs_tbl()
3e24fbd37e72 KEYS: trusted: Fix memory leak on object td
----

Link: https://lore.kernel.org/r/20210517140302.508966430@linuxfoundation.org
Link: https://lore.kernel.org/r/20210518135831.445321364@linuxfoundation.org
Link: Freescale/linux-fslc#346

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
otavio pushed a commit to Freescale/meta-freescale that referenced this pull request May 25, 2021
Kernel repository has been upgraded to v5.12.5 from stable korg.

Following upstream commits are included in this version:
----
761ea31e416a Linux 5.12.5
7a7739b266d4 net: bridge: fix error in br_multicast_add_port when CONFIG_NET_SWITCHDEV=n
ef43e4db6e87 ASoC: rsnd: check all BUSIF status when error
6e3a85b8aa01 nvme: do not try to reconfigure APST when the controller is not live
6d4db5778533 ext4: fix debug format string warning
1ba874161ac3 debugfs: Make debugfs_allow RO after init
d9df1dce5090 dt-bindings: PCI: rcar-pci-host: Document missing R-Car H1 support
eb9488079f06 dt-bindings: serial: 8250: Remove duplicated compatible strings
561fc5bb53dd dt-bindings: phy: qcom,qmp-usb3-dp-phy: move usb3 compatibles back to qcom,qmp-phy.yaml
60ee44221fe9 arm64: dts: renesas: falcon: Move console config to CPU board DTS
045228c6d17e dt-bindings: thermal: rcar-gen3-thermal: Support five TSC nodes on r8a779a0
26f3b85a9ee1 dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1
5bf7dfa40ae4 i2c: mediatek: Fix send master code at more than 1MHz
c36f6f6b4ddd media: rkvdec: Remove of_match_ptr()
eb68304c8771 soc: mediatek: pm-domains: Add a power domain names for mt8192
6858b67769a8 soc: mediatek: pm-domains: Add a power domain names for mt8183
0a84ada8aa8a soc: mediatek: pm-domains: Add a meaningful power domain name
14ed485c3180 clk: exynos7: Mark aclk_fsys1_200 as critical
f7520970d535 drm/i915: Fix crash in auto_retire
7d88c1e740ea drm/i915/overlay: Fix active retire callback alignment
f3ea4506674c drm/i915: Read C0DRB3/C1DRB3 as 16 bits again
628cf5277a35 drm/msm/dp: check sink_count before update is_connected status
ab2f71a42164 drm/i915/gt: Fix a double free in gen8_preallocate_top_level_pdp
6f7ffe336696 kobject_uevent: remove warning in init_uevent_argv()
26c704bb6eed usb: typec: tcpm: Fix error while calculating PPS out values
a8aeb722aeac clocksource/drivers/timer-ti-dm: Handle dra7 timer wrap errata i940
be50eafb7ddf clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue
be5839c7e607 MIPS: Avoid handcoded DIVU in `__div64_32' altogether
26fc611259fe MIPS: Avoid DIVU in `__div64_32' is result would be zero
7bb9f4711005 MIPS: Reinstate platform `__div64_32' handler
856dc266fcf7 mm: fix struct page layout on 32-bit systems
e3ea1895df71 KVM: VMX: Disable preemption when probing user return MSRs
7c9ebc3e4c94 KVM: VMX: Do not advertise RDPID if ENABLE_RDTSCP control is unsupported
bd0e8455b85b KVM: nVMX: Always make an attempt to map eVMCS after migration
ac51e3ac7657 KVM: x86: Add support for RDPID without RDTSCP
c3d8d9e97607 KVM: x86: Move RDPID emulation intercept to its own enum
a6af4f9ebe20 KVM: x86: Emulate RDPID only if RDTSCP is supported
3e6b3632cd4e xen/gntdev: fix gntdev_mmap() error exit path
6f1b9e8767ae alarmtimer: Check RTC features instead of ops
79c9011443ad cdc-wdm: untangle a circular dependency between callback and softint
d310d89c7921 iio: tsl2583: Fix division by a zero lux_val
2a40e13d6a71 iio: gyro: mpu3050: Fix reported temperature value
ab6c935ba3a0 iio: core: fix ioctl handlers removal
6c0197c59f97 xhci: Add reset resume quirk for AMD xhci controller.
f137f0379893 xhci: Do not use GFP_KERNEL in (potentially) atomic context
45157f15b2f7 xhci: Fix giving back cancelled URBs even if halted endpoint can't reset
39291053c49e xhci-pci: Allow host runtime PM as default for Intel Alder Lake xHCI
a46de12cc754 usb: typec: ucsi: Put fwnode in any case during ->probe()
5e9c6f58b01e usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4
99b4df1251d2 usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP
3a37f7581b7d usb: dwc3: gadget: Return success always for kick transfer in ep queue
c30863ab08e1 usb: dwc3: gadget: Enable suspend events
bd03dadb1a1f usb: dwc3: imx8mp: fix error return code in dwc3_imx8mp_probe()
e41a3402d106 usb: core: hub: fix race condition about TRSMRCY of resume
b2714ec7e6fd usb: dwc2: Fix gadget DMA unmap direction
1f418274cfc0 usb: xhci: Increase timeout for HC halt
9e64fc974c16 usb: dwc3: pci: Enable usb2-gadget-lpm-disable for Intel Merrifield
9a053a48decc usb: dwc3: omap: improve extcon initialization
5e9e6d114b53 blk-mq: Swap two calls in blk_mq_exit_queue()
0b3c8641cc49 blk-mq: plug request for shared sbitmap
ba5dce1ef996 powerpc/64s: Make NMI record implicitly soft-masked code as irqs disabled
54b78ba7e96e nbd: Fix NULL pointer in flush_workqueue
ead8ea54ecc4 sched/fair: Fix clearing of has_idle_cores flag in select_idle_cpu()
376e35eca187 f2fs: compress: fix to assign cc.cluster_idx correctly
936158b15e26 f2fs: compress: fix race condition of overwrite vs truncate
9739055a5d02 f2fs: compress: fix to free compress page correctly
5bdb34466ad8 nvmet-rdma: Fix NULL deref when SEND is completed with error
03fce793a991 nvmet: fix inline bio check for passthru
3df867719031 nvmet: fix inline bio check for bdev-ns
2ef3c76540c4 kyber: fix out of bounds access when preempted
a7e17a8d421a ACPI: scan: Fix a memory leak in an error handling path
7225188aa169 hwmon: (ltc2992) Put fwnode in error case during ->probe()
8758cf98e944 usb: musb: Fix an error message
4d82702a9235 usb: typec: tcpm: Fix wrong handling for Not_Supported in VDM AMS
b2a817c66980 hwmon: (occ) Fix poll rate limiting
c4f5af40c9ce usb: fotg210-hcd: Fix an error message
f66cf2c9e4c7 iio: core: return ENODEV if ioctl is unknown
faf84061548a iio: hid-sensors: select IIO_TRIGGERED_BUFFER under HID_SENSOR_IIO_TRIGGER
37b2153a79be iio: proximity: pulsedlight: Fix rumtime PM imbalance on error
e317435d3efa iio: light: gp2ap002: Fix rumtime PM imbalance on error
b4b8e9601d7e usb: dwc3: gadget: Free gadget structure only after freeing endpoints
7bc747f42917 perf tools: Fix dynamic libbpf link
0accab4d2e7a xen/unpopulated-alloc: fix error return code in fill_list()
db822599b21e dax: Wake up all waiters after invalidating dax entry
fa38341f7813 dax: Add a wakeup mode parameter to put_unlocked_entry()
27514d7b526a dax: Add an enum for specifying dax wakup mode
bfe31390c048 KVM: SVM: Move GHCB unmapping to fix RCU warning
80fae432eb8d KVM: x86: Prevent deadlock against tk_core.seq
171895f5b596 KVM: x86: Cancel pvclock_gtod_work on module removal
41d92e63158a drm/msm/dp: initialize audio_comp when audio starts
081f7f934970 KVM: LAPIC: Accurately guarantee busy wait for timer to expire when using hv_timer
ac7055e56367 drm/msm: fix LLC not being enabled for mmu500 targets
0b4d0ae9ffd8 kvm: exit halt polling on need_resched() as well
266a9da628ae drm/i915/dp: Use slow and wide link training for everything
afef1a33dd5a drm/i915: Avoid div-by-zero on gen2
013950b55e53 drm/amd/display: Initialize attribute for hdcp_srm sysfs file
15372dd6de6d drm/radeon/dpm: Disable sclk switching on Oland when two 4K 60Hz monitors are connected
78536c791ff8 btrfs: zoned: sanity check zone type
c6b9a5a82044 btrfs: initialize return variable in cleanup_free_space_cache_v1
70264829d969 btrfs: fix race leading to unpersisted data and metadata on fsync
757e85966740 btrfs: zoned: fix silent data loss after failure splitting ordered extent
96157707c042 btrfs: fix deadlock when cloning inline extents and using qgroups
0449f835a686 arm64: Fix race condition on PG_dcache_clean in __sync_icache_dcache()
74314ea12197 arm64: mte: initialize RGSR_EL1.SEED in __cpu_setup
8942128ca6a3 x86, sched: Fix the AMD CPPC maximum performance value on certain AMD Ryzen generations
86d9a6b8c799 blk-iocost: fix weight updates of inner active iocgs
b582847eae10 mm/hugetlb: fix cow where page writtable in child
62917eecde04 mm/hugetlb: fix F_SEAL_FUTURE_WRITE
89951f677300 kasan: fix unit tests with CONFIG_UBSAN_LOCAL_BOUNDS enabled
2d59a0ed8b26 userfaultfd: release page in error path to avoid BUG_ON
9ce43b4f3c13 squashfs: fix divide error in calculate_skip()
97314e45aa12 hfsplus: prevent corruption in shrinking truncate
5bc00fdda1e9 powerpc/64s: Fix crashes when toggling entry flush barrier
ba16e1f89dc2 powerpc/64s: Fix crashes when toggling stf barrier
ecd6bdc103e3 sh: Remove unused variable
e3a8166fa6e2 ARC: mm: Use max_high_pfn as a HIGHMEM zone border
059e7eeb1f39 ARC: mm: PAE: use 40-bit physical page mask
47fcfe49330d ARC: entry: fix off-by-one error in syscall number validation
d7a9d125c3c5 mptcp: fix splat when closing unaccepted socket
ca1fff557831 i40e: Remove LLDP frame filters
bd4febf1386c i40e: Fix PHY type identifiers for 2.5G and 5G adapters
4591ae84b283 i40e: fix the restart auto-negotiation after FEC modified
1fd5d262e744 i40e: Fix use-after-free in i40e_client_subtask()
ad453d44cf23 i40e: fix broken XDP support
a388d10961ff netfilter: nftables: avoid overflows in nft_hash_buckets()
56587c4df27a kernel/resource: make walk_mem_res() find all busy IORESOURCE_MEM resources
dc3b515a96bf kernel/resource: make walk_system_ram_res() find all busy IORESOURCE_SYSTEM_RAM resources
8bb4152dfd5f kernel: kexec_file: fix error return code of kexec_calculate_store_digests()
68428bbdc5f0 fs/proc/generic.c: fix incorrect pde_is_permanent check
e72b2405436c net: ipa: fix inter-EE IRQ register definitions
c6b7a6323308 sched/fair: Fix unfairness caused by missing load decay
42ee47c7e356 sched: Fix out-of-bound access in uclamp
a6bf154e0ae8 can: m_can: m_can_tx_work_queue(): fix tx_skb race condition
e1e10a390fd9 can: mcp251x: fix resume from sleep before interface was brought up
eb40b2f51447 can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() in error path
15f8f96ec7fc can: mcp251xfd: mcp251xfd_probe(): fix an error pointer dereference in probe
dd3bebf515f3 netfilter: nftables: Fix a memleak from userdata error path in new objects
2bf8be1ebc94 netfilter: nfnetlink_osf: Fix a missing skb_header_pointer() NULL check
0687acc371eb smc: disallow TCP_ULP in smc_setsockopt()
45a1a92d0a00 net: fix nla_strcmp to handle more then one trailing null character
2af12426dff8 ethtool: fix missing NLM_F_MULTI flag when dumping
7ad70fa66135 kfence: await for allocation using wait_event
36c6110fd85b mm/gup: check for isolation errors
8ee15052ce9e mm/gup: return an error on migration failure
97e5135ddcaa mm/gup: check every subpage of a compound page during isolation
d2348b6e465a ksm: fix potential missing rmap_item for stable_node
f1183744e8d0 mm/migrate.c: fix potential indeterminate pte entry in migrate_vma_insert_page()
ed98b887d31c mm/hugeltb: handle the error case in hugetlb_fix_reserve_counts()
22349c15b5a8 khugepaged: fix wrong result value for trace_mm_collapse_huge_page_isolate()
d8d52005f57b arm64: entry: always set GIC_PRIO_PSR_I_SET during entry
b520ea4ea613 arm64: entry: factor irq triage logic into macros
b1652314ac62 drm/radeon: Avoid power table parsing memory leaks
33b3d1dc73ce drm/radeon: Fix off-by-one power_state index heap overwrite
beea32fb00c3 net: stmmac: Clear receive all(RA) bit when promiscuous mode is off
3a8a866e9372 powerpc/powernv/memtrace: Fix dcache flushing
271976d0ebf8 xsk: Fix for xp_aligned_validate_desc() when len == chunk_size
21e926b7c9de netfilter: xt_SECMARK: add new revision to fix structure layout
0492084fa4c6 sctp: fix a SCTP_MIB_CURRESTAB leak in sctp_sf_do_dupcook_b
d90529392aaf ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
7c968f9ca134 PCI: brcmstb: Use reset/rearm instead of deassert/assert
fe55c9d259c4 ata: ahci_brcm: Fix use of BCM7216 reset controller
b345ba612d4d block/rnbd-clt: Check the return value of the function rtrs_clt_query
05a023f98e0d block/rnbd-clt: Change queue_depth type in rnbd_clt_session to size_t
117151b0d560 libbpf: Fix signed overflow in ringbuf_process_ring
36e63f39d796 sunrpc: Fix misplaced barrier in call_decode
8eda58d1e939 RISC-V: Fix error code returned by riscv_hartid_to_cpuid()
0bfd913c2121 sctp: do asoc update earlier in sctp_sf_do_dupcook_a
e4e9d03b9841 net: hns3: disable phy loopback setting in hclge_mac_start_phy
8dd424cd4a56 net: hns3: use netif_tx_disable to stop the transmit queue
449a9789f735 net: hns3: fix for vxlan gpe tx checksum bug
57464cecdf77 arm64: stacktrace: restore terminal records
f3309b93c066 net: hns3: add check for HNS3_NIC_STATE_INITED in hns3_reset_notify_up_enet()
a81a61e3843a net: hns3: initialize the message content in hclge_get_link_mode()
4c2b7a0e6dab net: hns3: fix incorrect configuration for igu_egu_hw_err
b5fdbaf6d327 rtc: ds1307: Fix wday settings for rx8130
5b86538ebcce scsi: ufs: core: Narrow down fast path in system suspend path
7d129abdd95f scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend
31a585964e33 scsi: ufs: core: Do not put UFS power into LPM if link is broken
50c6b018a0fa scsi: qla2xxx: Prevent PRLI in target mode
0a219432127d ceph: fix inode leak on getattr error in __fh_to_dentry
569bb35eb594 swiotlb: Fix the type of index
38ccbba86770 riscv: Select HAVE_DYNAMIC_FTRACE when -fpatchable-function-entry is available
e9cfa24c28f4 xprtrdma: rpcrdma_mr_pop() already does list_del_init()
19b5fa9489b5 xprtrdma: Fix cwnd update ordering
9ec43636c735 xprtrdma: Avoid Receive Queue wrapping
726d2d5e0844 pwm: atmel: Fix duty cycle calculation in .get_state()
c664aaec9aee SUNRPC: Fix null pointer dereference in svc_rqst_free()
3bfd15afcbbb SUNRPC: fix ternary sign expansion bug in tracing
e7a75d332d39 dmaengine: idxd: fix cdev setup and free device lifetime issues
1c28fd5f94d8 dmaengine: idxd: fix group conf_dev lifetime
35ea8721d9e6 dmaengine: idxd: fix engine conf_dev lifetime
b09ad63775f5 dmaengine: idxd: fix wq conf_dev 'struct device' lifetime
a13e4cf29da6 dmaengine: idxd: fix idxd conf_dev 'struct device' lifetime
b89ae48e3b88 dmaengine: idxd: use ida for device instance enumeration
eb5fb986f904 dmaengine: idxd: removal of pcim managed mmio mapping
ee87b468ce05 dmaengine: idxd: cleanup pci interrupt vector allocation management
7982ff0d7449 dmaengine: idxd: fix dma device lifetime
7bc402f843e7 dmaengine: idxd: Fix potential null dereference on pointer status
5a373286e281 rtc: fsl-ftm-alarm: add MODULE_TABLE()
15f103a1ca30 nfsd: ensure new clients break delegations
b8ba461b81a5 NFSv4.x: Don't return NFS4ERR_NOMATCHING_LAYOUT if we're unmounting
0e97ce337994 thermal/drivers/tsens: Fix missing put_device error
9765abb2f89d NFSv42: Copy offload should update the file size when appropriate
abc164b84f0e SUNRPC: Handle major timeout in xprt_adjust_timeout()
947355dd9a69 SUNRPC: Remove trace_xprt_transmit_queued
835b2f8c4e68 SUNRPC: Move fault injection call sites
c63e7c5d94e9 NFSv4.2 fix handling of sr_eof in SEEK's reply
754efbbdaf4e pNFS/flexfiles: fix incorrect size check in decode_nfs_fh()
9b29c75db48d remoteproc: pru: Fix and cleanup firmware interrupt mapping logic
2ecce3d08fb2 remoteproc: pru: Fix wrong success return value for fw events
7da84d16394d remoteproc: pru: Fixup interrupt-parent logic for fw events
8aaf14b0b05b PCI: endpoint: Fix missing destroy_workqueue()
14a952ccf173 NFS: Deal correctly with attribute generation counter overflow
81fc0f863a64 NFSv4.2: Always flush out writes in nfs42_proc_fallocate()
ff29c67b809c NFS: Fix attribute bitmask in _nfs42_proc_fallocate()
425d311e5115 NFS: nfs4_bitmask_adjust() must not change the server global bitmasks
de68b23bedae rpmsg: qcom_glink_native: fix error return code of qcom_glink_rx_data()
058b7d4f013e f2fs: fix to avoid accessing invalid fio in f2fs_allocate_data_block()
2f8dda840046 NFS: Only change the cookie verifier if the directory page cache is empty
7d2597210e79 NFS: Fix handling of cookie verifier in uncached_readdir()
213a094da6c9 nfs: Subsequent READDIR calls should carry non-zero cookieverifier
37d20a735e60 f2fs: Fix a hungtask problem in atomic write
83e206454358 f2fs: fix to restrict mount condition on readonly block device
70dbc3283c3a fs: 9p: fix v9fs_file_open writeback fid error check
88a46398bf05 f2fs: fix to cover __allocate_new_section() with curseg_lock
211372b25715 f2fs: fix to avoid touching checkpointed data in get_victim()
0169d4f0bee4 PCI: endpoint: Fix NULL pointer dereference for ->get_features()
5ede51f41b3a f2fs: fix to update last i_size if fallocate partially succeeds
16e712005049 f2fs: fix to align to section for fallocate() on pinned file
dabe299425b1 ARM: 9064/1: hw_breakpoint: Do not directly check the event's overflow_handler hook
e91ab2363168 PCI: Release OF node in pci_scan_device()'s error path
a81e0a234320 PCI: brcmstb: Fix error return code in brcm_pcie_probe()
ad6461f16464 PCI: iproc: Fix return value of iproc_msi_irq_domain_alloc()
ef27ec3805c0 remoteproc: qcom_q6v5_mss: Validate p_filesz in ELF loader
d06ad5425e98 rtc: tps65910: include linux/property.h
155c1706ed0d f2fs: fix a redundant call to f2fs_balance_fs if an error occurs
822054e5026c f2fs: fix panic during f2fs_resize_fs()
339bf4baa5eb f2fs: fix to allow migrating fully valid segment
a04d3f9877cb PCI/RCEC: Fix RCiEP device to RCEC association
16276fb241c0 thermal: thermal_of: Fix error return code of thermal_of_populate_bind_params()
746fa58120aa leds: lgm: fix gpiolib dependency
22052b84eea7 ASoC: rt286: Make RT286_SET_GPIO_* readable and writable
9ac5c943c399 watchdog: fix barriers when printing backtraces from all CPUs
c083d669dcc7 watchdog/softlockup: remove logic that tried to prevent repeated reports
071802a3a9d9 watchdog/softlockup: report the overall time of softlockups
04573e92b1d0 watchdog: explicitly update timestamp when reporting softlockup
15cfe627b05a watchdog: rename __touch_watchdog() to a better descriptive name
fc8f347e1217 ia64: module: fix symbolizer crash on fdescr
60e7dd22ba86 bnxt_en: Add PCI IDs for Hyper-V VF devices.
2c1cfecc94d0 kbuild: generate Module.symvers only when vmlinux exists
d3f0131b86a9 selftests: mlxsw: Fix mausezahn invocation in ERSPAN scale test
cbcf354333ea selftests: mlxsw: Increase the tolerance of backlog buildup
d363d3609311 net: ethernet: mtk_eth_soc: fix RX VLAN offload
6e541e8d52ab iavf: remove duplicate free resources calls
3b04966e0858 powerpc/iommu: Annotate nested lock for lockdep
51bf956d3c50 qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth
08f92310c387 wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join
2b05548a8440 wl3501_cs: Fix out-of-bounds warnings in wl3501_send_pkt
259cdcc2822c crypto: ccp: Free SEV device if SEV init fails
0a8072134972 mt76: mt7615: fix entering driver-own state on mt7663
b824c8101886 drm/amdgpu: Add mem sync flag for IB allocated by SA
d80cd2008045 drm/amd/display: add handling for hdcp2 rx id list validation
be3fd94c21df drm/amd/display: fixed divide by zero kernel crash during dsc enablement
e39ff623cdec powerpc/pseries: Stop calling printk in rtas_stop_self()
0737b426244c samples/bpf: Fix broken tracex1 due to kprobe argument change
274e30f3f85b net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule
47a0bb49f2ee ethtool: ioctl: Fix out-of-bounds warning in store_link_ksettings_for_user()
33fe1e54657d ASoC: rt286: Generalize support for ALC3263 codec
f7fcd7b55605 mac80211: properly drop the connection in case of invalid CSA IE
21f1d27b06b9 wilc1000: Bring MAC address setting in line with typical Linux behavior
629d855c0f2f powerpc/smp: Set numa node before updating mask
44880149f825 powerpc/xive: Use the "ibm, chip-id" property only under PowerNV
a4fae79e1c4e flow_dissector: Fix out-of-bounds warning in __skb_flow_bpf_to_target()
e123fdd294a1 sctp: Fix out-of-bounds warning in sctp_process_asconf_param()
6d978f701bcf i2c: i801: Add support for Intel Alder Lake PCH-M
78fc41e6216f ALSA: hda/hdmi: fix race in handling acomp ELD notification at resume
c79b6ef5f947 ASoC: Intel: sof_sdw: add quirk for new ADL-P Rvp
59a9814c8440 ALSA: hda/realtek: Add quirk for Lenovo Ideapad S740
3c96f542bf75 kconfig: nconf: stop endless search loops
b09c2f732500 selftests: Set CC to clang in lib.mk if LLVM is set
dd74af4f37be drm/amd/display: Force vsync flip when reconfiguring MPCC
0bf066735bab iommu/amd: Remove performance counter pre-initialization test
40b97d88acbe Revert "iommu/amd: Fix performance counter initialization"
a9863a282f98 net: bridge: propagate error code and extack from br_mc_disabled_update
dc49a6391b28 ASoC: rsnd: call rsnd_ssi_master_clk_start() from rsnd_ssi_init()
b9ffa48e3d19 powerpc/mm: Add cond_resched() while removing hpte mappings
92dbe230fbef iwlwifi: trans/pcie: defer transport initialisation
60b9f967ad03 iwlwifi: queue: avoid memory leak in reset flow
d441b3a309ec iwlwifi: pcie: make cfg vs. trans_cfg more robust
e9423d1a37e0 cuse: prevent clone
2b50e2c77e3d virtiofs: fix userns
1b965c56029d fuse: invalidate attrs when page writeback completes
f3f672f88f14 i2c: imx: Fix PM reference leak in i2c_imx_reg_slave()
297ff6866bc6 mt76: mt7915: add wifi subsystem reset
ea81ee2ad2c9 mt76: mt7921: fix key set/delete issue
e79f04f2ccf8 mt76: mt7915: fix txpower init for TSSI off chips
be31395351ac mt76: mt7915: fix key set/delete issue
4f6458377e0e mt76: mt7915: always check return value from mt7915_mcu_alloc_wtbl_req
7df5286e9612 mt76: connac: always check return value from mt76_connac_mcu_alloc_wtbl_req
8d0834eab64c mt76: mt76x0: disable GTK offloading
c11122299694 mt76: mt7615: support loading EEPROM for MT7613BE
72b1993a5424 mt76: mt7615: fix key set/delete issues
14a5f69f474b rtw88: 8822c: add LC calibration for RTL8822C
bb55990c07ef pinctrl: samsung: use 'int' for register masks in Exynos
d320da6e4bee net: fec: use mac-managed PHY PM
e782c60aa10c net: phy: make PHY PM ops a no-op if MAC driver manages PHY PM
30e55f55bb71 ASoC: soc-compress: lock pcm_mutex to resolve lockdep error
a8933606c15e mac80211: clear the beacon's CRC after channel switch
9b1b2a59be23 mac80211: Set priority and queue mapping for injected frames
98138aa2e625 IB/hfi1: Correct oversized ring allocation
bcbdb4834974 coresight: Do not scan for graph if none is present
a3241f9019df MIPS: Loongson64: Use _CACHE_UNCACHED instead of _CACHE_UNCACHED_ACCELERATED
1a3b3a7674b1 Bluetooth: Do not set cur_adv_instance in adv param MGMT request
ee411020903a i2c: Add I2C_AQ_NO_REP_START adapter quirk
1fe18e625a45 selftests: mptcp: launch mptcp_connect with timeout
f1fef5c97a7e ASoC: rt5670: Add a quirk for the Dell Venue 10 Pro 5055
f5caa9943d45 Bluetooth: btusb: Enable quirk boolean flag for Mediatek Chip.
ccd9f0417c12 ice: handle increasing Tx or Rx ring sizes
18094f2b842e ASoC: Intel: bytcr_rt5640: Add quirk for the Chuwi Hi8 tablet
e6c10a27ddf9 iommu/arm-smmu-v3: Add a check to avoid invalid iotlb sync
a5ebdf08b44b can: dev: can_free_echo_skb(): don't crash the kernel if can_priv::echo_skb is accessed out of bounds
3e7996f1e6ef ip6_vti: proper dev_{hold|put} in ndo_[un]init methods
5ffb52837d25 net: hns3: add handling for xmit skb with recursive fraglist
4cd9a1b396fd net: hns3: remediate a potential overflow risk of bd_num_list
f3443d376ade powerpc/32: Statically initialise first emergency context
392a01682cbb ALSA: hda/hdmi: fix max DP-MST dev_num for Intel TGL+ platforms
86e410651194 selftests/powerpc: Fix L1D flushing tests for Power10
f2e8da285341 Bluetooth: check for zapped sk before connecting
759b3fb78309 net: bridge: when suppression is enabled exclude RARP packets
840ba6800301 net/sched: cls_flower: use ntohs for struct flow_dissector_key_ports
91f14c60aff8 Bluetooth: initialize skb_queue_head at l2cap_chan_create()
50ef75bbe733 Bluetooth: Set CONF_NOT_COMPLETE as l2cap_chan default
24cb3ff55895 ALSA: bebob: enable to deliver MIDI messages for multiple ports
bf95eb72efbe ALSA: rme9652: don't disable if not enabled
95e11e73128a ALSA: hdspm: don't disable if not enabled
df94915a89bf ALSA: hdsp: don't disable if not enabled
5f82c7be706d i2c: bail out early when RDWR parameters are wrong
016c0942c13b Bluetooth: Fix incorrect status handling in LE PHY UPDATE event
186007c91793 ASoC: rsnd: core: Check convert rate in rsnd_hw_params
c2da6ff22b4e net: stmmac: Set FIFO sizes for ipq806x
bbbb5a2cee25 net/mlx5e: Use net_prefetchw instead of prefetchw in MPWQE TX datapath
a7a3cc3245c7 ASoC: Intel: bytcr_rt5640: Enable jack-detect support on Asus T100TAF
e7610fc2dda7 tipc: convert dest node's address to network order
3fe241d36b3c fs: dlm: add shutdown hook
926fd4e47bdb fs: dlm: flush swork on shutdown
c1bb3ef861b6 fs: dlm: check on minimum msglen size
ce9e8126adc0 fs: dlm: change allocation limits
1b400d1b19d6 fs: dlm: add check if dlm is currently running
2929c46f0e0e fs: dlm: add errno handling to check callback
664523603440 fs: dlm: fix mark setting deadlock
ee2202dc67bc fs: dlm: fix debugfs dump
ecfbec245e91 ALSA: usb-audio: Add Pioneer DJM-850 to quirks-table
122a4838d022 ath11k: fix thermal temperature read
90ada0c77449 kvm: Cap halt polling at kvm->max_halt_poll_ns
94fdc966c7d9 cpufreq: intel_pstate: Use HWP if enabled by platform firmware
8c6d2e0ee501 PM: runtime: Fix unpaired parent child_count for force_resume
2cff742523ab ACPI: PM: Add ACPI ID of Alder Lake Fan
d25c24102b17 KVM/VMX: Invoke NMI non-IST entry instead of IST entry
fd722a57fe0b KVM: SVM: Make sure GHCB is mapped before updating
188770ddad9b btrfs: fix unmountable seed device after fstrim
36a6f5f0a7bb tpm, tpm_tis: Reserve locality in tpm_tis_resume()
7dd1d6a54004 tpm, tpm_tis: Extend locality handling to TPM2 in tpm_tis_gen_interrupt()
a85e9d1fae78 tpm: fix error return code in tpm2_get_cc_attrs_tbl()
3e24fbd37e72 KEYS: trusted: Fix memory leak on object td
----

Link: https://lore.kernel.org/r/20210517140302.508966430@linuxfoundation.org
Link: https://lore.kernel.org/r/20210518135831.445321364@linuxfoundation.org
Link: Freescale/linux-fslc#346

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.