From: Masahiro Yamada <masahiroy(a)kernel.org>
[ Upstream commit 9836720911cfec25d3fbdead1c438bf87e0f2841 ]
The deb-pkg builds for ARCH=arc fail.
$ export CROSS_COMPILE=<your-arc-compiler-prefix>
$ make -s ARCH=arc defconfig
$ make ARCH=arc bindeb-pkg
SORTTAB vmlinux
SYSMAP System.map
MODPOST Module.symvers
make KERNELRELEASE=5.10.0-rc4 ARCH=arc KBUILD_BUILD_VERSION=2 -f ./Makefile intdeb-pkg
sh ./scripts/package/builddeb
cp: cannot stat 'arch/arc/boot/bootpImage': No such file or directory
make[4]: *** [scripts/Makefile.package:87: intdeb-pkg] Error 1
make[3]: *** [Makefile:1527: intdeb-pkg] Error 2
make[2]: *** [debian/rules:13: binary-arch] Error 2
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
make[1]: *** [scripts/Makefile.package:83: bindeb-pkg] Error 2
make: *** [Makefile:1527: bindeb-pkg] Error 2
The reason is obvious; arch/arc/Makefile sets $(boot)/bootpImage as
the default image, but there is no rule to build it.
Remove the meaningless KBUILD_IMAGE assignment so it will fallback
to the default vmlinux. With this change, you can build the deb package.
I removed the 'bootpImage' target as well. At best, it provides
'make bootpImage' as an alias of 'make vmlinux', but I do not see
much sense in doing so.
Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org>
Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com>
Signed-off-by: Sasha Levin <sashal(a)kernel.org>
---
arch/arc/Makefile | 6 ------
1 file changed, 6 deletions(-)
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index f1c44cccf8d6c..5e5699acefef4 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -90,12 +90,6 @@ libs-y += arch/arc/lib/ $(LIBGCC)
boot := arch/arc/boot
-#default target for make without any arguments.
-KBUILD_IMAGE := $(boot)/bootpImage
-
-all: bootpImage
-bootpImage: vmlinux
-
boot_targets += uImage uImage.bin uImage.gz
$(boot_targets): vmlinux
--
2.27.0
From: Muhammed Fazal <mfazale(a)nvidia.com>
Ignore I2C_M_DMA_SAFE flag as it does not make a difference
for bpmp-i2c, but causes -EINVAL to be returned for valid
transactions.
Signed-off-by: Muhammed Fazal <mfazale(a)nvidia.com>
Cc: stable(a)vger.kernel.org # v4.19+
Signed-off-by: Mikko Perttunen <mperttunen(a)nvidia.com>
---
v2:
- Remove unnecessary check for if the bit is set
---
drivers/i2c/busses/i2c-tegra-bpmp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/i2c/busses/i2c-tegra-bpmp.c b/drivers/i2c/busses/i2c-tegra-bpmp.c
index ec7a7e917edd..aa6685cabde3 100644
--- a/drivers/i2c/busses/i2c-tegra-bpmp.c
+++ b/drivers/i2c/busses/i2c-tegra-bpmp.c
@@ -80,6 +80,8 @@ static int tegra_bpmp_xlate_flags(u16 flags, u16 *out)
flags &= ~I2C_M_RECV_LEN;
}
+ flags &= ~I2C_M_DMA_SAFE;
+
return (flags != 0) ? -EINVAL : 0;
}
--
2.30.0
If a new hugetlb page is allocated during fallocate it will not be
marked as active (set_page_huge_active) which will result in a later
isolate_huge_page failure when the page migration code would like to
move that page. Such a failure would be unexpected and wrong.
Only export set_page_huge_active, just leave clear_page_huge_active
as static. Because there are no external users.
Fixes: 70c3547e36f5 (hugetlbfs: add hugetlbfs_fallocate())
Signed-off-by: Muchun Song <songmuchun(a)bytedance.com>
Cc: stable(a)vger.kernel.org
---
fs/hugetlbfs/inode.c | 3 ++-
include/linux/hugetlb.h | 2 ++
mm/hugetlb.c | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index b5c109703daa..21c20fd5f9ee 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -735,9 +735,10 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,
mutex_unlock(&hugetlb_fault_mutex_table[hash]);
+ set_page_huge_active(page);
/*
* unlock_page because locked by add_to_page_cache()
- * page_put due to reference from alloc_huge_page()
+ * put_page() due to reference from alloc_huge_page()
*/
unlock_page(page);
put_page(page);
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index ebca2ef02212..b5807f23caf8 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -770,6 +770,8 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma,
}
#endif
+void set_page_huge_active(struct page *page);
+
#else /* CONFIG_HUGETLB_PAGE */
struct hstate {};
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1f3bf1710b66..4741d60f8955 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1348,7 +1348,7 @@ bool page_huge_active(struct page *page)
}
/* never called for tail page */
-static void set_page_huge_active(struct page *page)
+void set_page_huge_active(struct page *page)
{
VM_BUG_ON_PAGE(!PageHeadHuge(page), page);
SetPagePrivate(&page[1]);
--
2.11.0
This is the start of the stable review cycle for the 4.4.251 release.
There are 38 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed, 13 Jan 2021 13:00:19 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.251-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.4.251-rc1
Ying-Tsun Huang <ying-tsun.huang(a)amd.com>
x86/mtrr: Correct the range check before performing MTRR type lookups
Florian Westphal <fw(a)strlen.de>
netfilter: xt_RATEEST: reject non-null terminated string from userspace
Vasily Averin <vvs(a)virtuozzo.com>
netfilter: ipset: fix shift-out-of-bounds in htable_bits()
Bard Liao <yung-chuan.liao(a)linux.intel.com>
Revert "device property: Keep secondary firmware node secondary by type"
bo liu <bo.liu(a)senarytech.com>
ALSA: hda/conexant: add a new hda codec CX11970
Dan Williams <dan.j.williams(a)intel.com>
x86/mm: Fix leak of pmd ptlock
Johan Hovold <johan(a)kernel.org>
USB: serial: keyspan_pda: remove unused variable
Chandana Kishori Chiluveru <cchiluve(a)codeaurora.org>
usb: gadget: configfs: Preserve function ordering after bind failure
Sriharsha Allenki <sallenki(a)codeaurora.org>
usb: gadget: Fix spinlock lockup on usb_function_deactivate
Yang Yingliang <yangyingliang(a)huawei.com>
USB: gadget: legacy: fix return error code in acm_ms_bind()
Zqiang <qiang.zhang(a)windriver.com>
usb: gadget: function: printer: Fix a memory leak for interface descriptor
Jerome Brunet <jbrunet(a)baylibre.com>
usb: gadget: f_uac2: reset wMaxPacketSize
Arnd Bergmann <arnd(a)arndb.de>
usb: gadget: select CONFIG_CRC32
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
Johan Hovold <johan(a)kernel.org>
USB: usblp: fix DMA to stack
Johan Hovold <johan(a)kernel.org>
USB: yurex: fix control-URB timeout handling
Daniel Palmer <daniel(a)0x0f.com>
USB: serial: option: add LongSung M5710 module support
Johan Hovold <johan(a)kernel.org>
USB: serial: iuu_phoenix: fix DMA from stack
Thinh Nguyen <Thinh.Nguyen(a)synopsys.com>
usb: uas: Add PNY USB Portable SSD to unusual_uas
Michael Grzeschik <m.grzeschik(a)pengutronix.de>
USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
Yu Kuai <yukuai3(a)huawei.com>
usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
Sean Young <sean(a)mess.org>
USB: cdc-acm: blacklist another IR Droid device
taehyun.cho <taehyun.cho(a)samsung.com>
usb: gadget: enable super speed plus
Dexuan Cui <decui(a)microsoft.com>
video: hyperv_fb: Fix the mmap() regression for v5.4.y and older
Rasmus Villemoes <rasmus.villemoes(a)prevas.dk>
ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
Jeff Dike <jdike(a)akamai.com>
virtio_net: Fix recursive call to cpus_read_lock()
Randy Dunlap <rdunlap(a)infradead.org>
net: sched: prevent invalid Scell_log shift count
Yunjian Wang <wangyunjian(a)huawei.com>
vhost_net: fix ubuf refcount incorrectly when sendmsg fails
Roland Dreier <roland(a)kernel.org>
CDC-NCM: remove "connected" log message
Xie He <xie.he.0141(a)gmail.com>
net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
Yunjian Wang <wangyunjian(a)huawei.com>
net: hns: fix return value check in __lb_other_process()
Guillaume Nault <gnault(a)redhat.com>
ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
Petr Machata <me(a)pmachata.org>
net: dcb: Validate netlink message in DCB handler
Dan Carpenter <dan.carpenter(a)oracle.com>
atm: idt77252: call pci_disable_device() on error path
Linus Torvalds <torvalds(a)linux-foundation.org>
depmod: handle the case of /sbin/depmod without /sbin in PATH
Huang Shijie <sjhuang(a)iluvatar.ai>
lib/genalloc: fix the overflow when size is too big
Yunfeng Ye <yeyunfeng(a)huawei.com>
workqueue: Kick a worker based on the actual activation of delayed works
Dominique Martinet <asmadeus(a)codewreck.org>
kbuild: don't hardcode depmod path
-------------
Diffstat:
Makefile | 6 +--
arch/x86/kernel/cpu/mtrr/generic.c | 6 +--
arch/x86/mm/pgtable.c | 2 +
drivers/atm/idt77252.c | 2 +-
drivers/base/core.c | 2 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++
drivers/net/usb/cdc_ncm.c | 3 --
drivers/net/virtio_net.c | 12 +++--
drivers/net/wan/hdlc_ppp.c | 7 +++
drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++-
drivers/usb/class/cdc-acm.c | 4 ++
drivers/usb/class/usblp.c | 21 +++++++-
drivers/usb/gadget/Kconfig | 2 +
drivers/usb/gadget/composite.c | 10 +++-
drivers/usb/gadget/configfs.c | 8 +--
drivers/usb/gadget/function/f_printer.c | 1 +
drivers/usb/gadget/function/f_uac2.c | 69 +++++++++++++++++++-----
drivers/usb/gadget/legacy/acm_ms.c | 4 +-
drivers/usb/host/xhci.c | 24 ++++-----
drivers/usb/misc/yurex.c | 3 ++
drivers/usb/serial/iuu_phoenix.c | 20 +++++--
drivers/usb/serial/keyspan_pda.c | 2 -
drivers/usb/serial/option.c | 1 +
drivers/usb/storage/unusual_uas.h | 7 +++
drivers/vhost/net.c | 6 +--
drivers/video/fbdev/hyperv_fb.c | 6 +--
include/net/red.h | 4 +-
kernel/workqueue.c | 13 +++--
lib/genalloc.c | 25 ++++-----
net/dcb/dcbnl.c | 2 +
net/ipv4/fib_frontend.c | 2 +-
net/netfilter/ipset/ip_set_hash_gen.h | 20 ++-----
net/netfilter/xt_RATEEST.c | 3 ++
net/sched/sch_choke.c | 2 +-
net/sched/sch_gred.c | 2 +-
net/sched/sch_red.c | 2 +-
net/sched/sch_sfq.c | 2 +-
scripts/depmod.sh | 2 +
sound/pci/hda/patch_conexant.c | 1 +
sound/usb/midi.c | 4 ++
41 files changed, 221 insertions(+), 103 deletions(-)
This is the start of the stable review cycle for the 4.9.251 release.
There are 45 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed, 13 Jan 2021 13:00:19 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.251-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.9.251-rc1
Ying-Tsun Huang <ying-tsun.huang(a)amd.com>
x86/mtrr: Correct the range check before performing MTRR type lookups
Florian Westphal <fw(a)strlen.de>
netfilter: xt_RATEEST: reject non-null terminated string from userspace
Vasily Averin <vvs(a)virtuozzo.com>
netfilter: ipset: fix shift-out-of-bounds in htable_bits()
Bard Liao <yung-chuan.liao(a)linux.intel.com>
Revert "device property: Keep secondary firmware node secondary by type"
bo liu <bo.liu(a)senarytech.com>
ALSA: hda/conexant: add a new hda codec CX11970
Dan Williams <dan.j.williams(a)intel.com>
x86/mm: Fix leak of pmd ptlock
Johan Hovold <johan(a)kernel.org>
USB: serial: keyspan_pda: remove unused variable
Eddie Hung <eddie.hung(a)mediatek.com>
usb: gadget: configfs: Fix use-after-free issue with udc_name
Chandana Kishori Chiluveru <cchiluve(a)codeaurora.org>
usb: gadget: configfs: Preserve function ordering after bind failure
Sriharsha Allenki <sallenki(a)codeaurora.org>
usb: gadget: Fix spinlock lockup on usb_function_deactivate
Yang Yingliang <yangyingliang(a)huawei.com>
USB: gadget: legacy: fix return error code in acm_ms_bind()
Zqiang <qiang.zhang(a)windriver.com>
usb: gadget: function: printer: Fix a memory leak for interface descriptor
Jerome Brunet <jbrunet(a)baylibre.com>
usb: gadget: f_uac2: reset wMaxPacketSize
Arnd Bergmann <arnd(a)arndb.de>
usb: gadget: select CONFIG_CRC32
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Fix UBSAN warnings for MIDI jacks
Johan Hovold <johan(a)kernel.org>
USB: usblp: fix DMA to stack
Johan Hovold <johan(a)kernel.org>
USB: yurex: fix control-URB timeout handling
Daniel Palmer <daniel(a)0x0f.com>
USB: serial: option: add LongSung M5710 module support
Johan Hovold <johan(a)kernel.org>
USB: serial: iuu_phoenix: fix DMA from stack
Thinh Nguyen <Thinh.Nguyen(a)synopsys.com>
usb: uas: Add PNY USB Portable SSD to unusual_uas
Michael Grzeschik <m.grzeschik(a)pengutronix.de>
USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set
Yu Kuai <yukuai3(a)huawei.com>
usb: chipidea: ci_hdrc_imx: add missing put_device() call in usbmisc_get_init_data()
Sean Young <sean(a)mess.org>
USB: cdc-acm: blacklist another IR Droid device
taehyun.cho <taehyun.cho(a)samsung.com>
usb: gadget: enable super speed plus
Dexuan Cui <decui(a)microsoft.com>
video: hyperv_fb: Fix the mmap() regression for v5.4.y and older
Du Changbin <changbin.du(a)gmail.com>
scripts/gdb: fix lx-version string output
Leonard Crestez <leonard.crestez(a)nxp.com>
scripts/gdb: lx-dmesg: use explicit encoding=utf8 errors=replace
Leonard Crestez <leonard.crestez(a)nxp.com>
scripts/gdb: lx-dmesg: cast log_buf to void* for addr fetch
André Draszik <git(a)andred.net>
scripts/gdb: make lx-dmesg command work (reliably)
Jeff Dike <jdike(a)akamai.com>
virtio_net: Fix recursive call to cpus_read_lock()
Randy Dunlap <rdunlap(a)infradead.org>
net: sched: prevent invalid Scell_log shift count
Yunjian Wang <wangyunjian(a)huawei.com>
vhost_net: fix ubuf refcount incorrectly when sendmsg fails
Roland Dreier <roland(a)kernel.org>
CDC-NCM: remove "connected" log message
Xie He <xie.he.0141(a)gmail.com>
net: hdlc_ppp: Fix issues when mod_timer is called while timer is running
Yunjian Wang <wangyunjian(a)huawei.com>
net: hns: fix return value check in __lb_other_process()
Guillaume Nault <gnault(a)redhat.com>
ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst()
Dinghao Liu <dinghao.liu(a)zju.edu.cn>
net: ethernet: Fix memleak in ethoc_probe
John Wang <wangzhiqiang.bj(a)bytedance.com>
net/ncsi: Use real net-device for response handler
Petr Machata <me(a)pmachata.org>
net: dcb: Validate netlink message in DCB handler
Dan Carpenter <dan.carpenter(a)oracle.com>
atm: idt77252: call pci_disable_device() on error path
Rasmus Villemoes <rasmus.villemoes(a)prevas.dk>
ethernet: ucc_geth: fix use-after-free in ucc_geth_remove()
Linus Torvalds <torvalds(a)linux-foundation.org>
depmod: handle the case of /sbin/depmod without /sbin in PATH
Huang Shijie <sjhuang(a)iluvatar.ai>
lib/genalloc: fix the overflow when size is too big
Yunfeng Ye <yeyunfeng(a)huawei.com>
workqueue: Kick a worker based on the actual activation of delayed works
Dominique Martinet <asmadeus(a)codewreck.org>
kbuild: don't hardcode depmod path
-------------
Diffstat:
Makefile | 6 +--
arch/x86/kernel/cpu/mtrr/generic.c | 6 +--
arch/x86/mm/pgtable.c | 2 +
drivers/atm/idt77252.c | 2 +-
drivers/base/core.c | 2 +-
drivers/net/ethernet/ethoc.c | 3 +-
drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++
drivers/net/usb/cdc_ncm.c | 3 --
drivers/net/virtio_net.c | 12 +++--
drivers/net/wan/hdlc_ppp.c | 7 +++
drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++-
drivers/usb/class/cdc-acm.c | 4 ++
drivers/usb/class/usblp.c | 21 +++++++-
drivers/usb/gadget/Kconfig | 2 +
drivers/usb/gadget/composite.c | 10 +++-
drivers/usb/gadget/configfs.c | 19 ++++---
drivers/usb/gadget/function/f_printer.c | 1 +
drivers/usb/gadget/function/f_uac2.c | 69 +++++++++++++++++++-----
drivers/usb/gadget/legacy/acm_ms.c | 4 +-
drivers/usb/host/xhci.c | 24 ++++-----
drivers/usb/misc/yurex.c | 3 ++
drivers/usb/serial/iuu_phoenix.c | 20 +++++--
drivers/usb/serial/keyspan_pda.c | 2 -
drivers/usb/serial/option.c | 1 +
drivers/usb/storage/unusual_uas.h | 7 +++
drivers/vhost/net.c | 6 +--
drivers/video/fbdev/hyperv_fb.c | 6 +--
include/net/red.h | 4 +-
kernel/workqueue.c | 13 +++--
lib/genalloc.c | 25 ++++-----
net/dcb/dcbnl.c | 2 +
net/ipv4/fib_frontend.c | 2 +-
net/ncsi/ncsi-rsp.c | 2 +-
net/netfilter/ipset/ip_set_hash_gen.h | 20 ++-----
net/netfilter/xt_RATEEST.c | 3 ++
net/sched/sch_choke.c | 2 +-
net/sched/sch_gred.c | 2 +-
net/sched/sch_red.c | 2 +-
net/sched/sch_sfq.c | 2 +-
scripts/depmod.sh | 2 +
scripts/gdb/linux/dmesg.py | 22 +++++---
scripts/gdb/linux/proc.py | 2 +-
sound/pci/hda/patch_conexant.c | 1 +
sound/usb/midi.c | 4 ++
45 files changed, 249 insertions(+), 115 deletions(-)