This is the start of the stable review cycle for the 4.14.328 release.
There are 65 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 Thu, 26 Oct 2023 08:32:31 +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.14.328-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.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.14.328-rc2
Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com>
Bluetooth: hci_event: Fix using memcmp when comparing keys
Kees Cook <keescook(a)chromium.org>
Bluetooth: hci_sock: Correctly bounds check and pad HCI_MON_NEW_INDEX name
Edward AD <twuufnxlz(a)gmail.com>
Bluetooth: hci_sock: fix slab oob read in create_monitor_event
Haibo Chen <haibo.chen(a)nxp.com>
gpio: vf610: set value before the direction to avoid a glitch
Niklas Schnelle <schnelle(a)linux.ibm.com>
s390/pci: fix iommu bitmap allocation
Peter Zijlstra <peterz(a)infradead.org>
perf: Disallow mis-matched inherited group reads
Puliang Lu <puliang.lu(a)fibocom.com>
USB: serial: option: add Fibocom to DELL custom modem FM101R-GL
Benoît Monin <benoit.monin(a)gmx.fr>
USB: serial: option: add entry for Sierra EM9191 with new firmware
Fabio Porcedda <fabio.porcedda(a)gmail.com>
USB: serial: option: add Telit LE910C4-WWX 0x1035 composition
Sunil V L <sunilvl(a)ventanamicro.com>
ACPI: irq: Fix incorrect return value in acpi_register_gsi()
Andy Shevchenko <andriy.shevchenko(a)linux.intel.com>
Revert "pinctrl: avoid unsafe code pattern in find_pinctrl()"
Avri Altman <avri.altman(a)wdc.com>
mmc: core: Capture correct oemid-bits for eMMC cards
Kees Cook <keescook(a)chromium.org>
sky2: Make sure there is at least one frag_addr available
Benjamin Berg <benjamin.berg(a)intel.com>
wifi: cfg80211: avoid leaking stack data into trace
Wen Gong <quic_wgong(a)quicinc.com>
wifi: mac80211: allow transmitting EAPOL frames with tainted key
Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com>
Bluetooth: hci_core: Fix build warnings
Ying Hsu <yinghsu(a)chromium.org>
Bluetooth: Avoid redundant authentication
Ma Ke <make_ruc2021(a)163.com>
HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event
Clément Léger <cleger(a)rivosinc.com>
tracing: relax trace_event_eval_update() execution with cond_resched()
Damien Le Moal <dlemoal(a)kernel.org>
ata: libata-eh: Fix compilation warning in ata_eh_link_report()
Chengfeng Ye <dg573847474(a)gmail.com>
gpio: timberdale: Fix potential deadlock on &tgpio->lock
Jeff Layton <jlayton(a)kernel.org>
overlayfs: set ctime when setting mtime and atime
Heiner Kallweit <hkallweit1(a)gmail.com>
i2c: mux: Avoid potential false error message in i2c_mux_add_adapter
Josef Bacik <josef(a)toxicpanda.com>
btrfs: initialize start_slot in btrfs_log_prealloc_extents
Tony Lindgren <tony(a)atomide.com>
ARM: dts: ti: omap: Fix noisy serial with overrun-throttle-ms for mapphone
Michal Schmidt <mschmidt(a)redhat.com>
i40e: prevent crash on probe if hw registers have invalid values
Dan Carpenter <dan.carpenter(a)linaro.org>
net: usb: smsc95xx: Fix an error code in smsc95xx_reset()
Josua Mayer <josua(a)solid-run.com>
net: rfkill: gpio: prevent value glitch during probe
Ma Ke <make_ruc2021(a)163.com>
net: ipv6: fix return value check in esp_remove_trailer
Ma Ke <make_ruc2021(a)163.com>
net: ipv4: fix return value check in esp_remove_trailer
Eric Dumazet <edumazet(a)google.com>
xfrm: fix a data-race in xfrm_gen_index()
Florian Westphal <fw(a)strlen.de>
netfilter: nft_payload: fix wrong mac header matching
Jim Mattson <jmattson(a)google.com>
KVM: x86: Mask LVTPC when handling a PMI
Johan Hovold <johan+linaro(a)kernel.org>
regmap: fix NULL deref on lookup
Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org>
nfc: nci: fix possible NULL pointer dereference in send_acknowledge()
Arnd Bergmann <arnd(a)arndb.de>
Bluetooth: avoid memcmp() out of bounds warning
Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com>
Bluetooth: hci_event: Fix coding style
Arkadiusz Bokowy <arkadiusz.bokowy(a)gmail.com>
Bluetooth: vhci: Fix race when opening vhci device
Ziyang Xuan <william.xuanziyang(a)huawei.com>
Bluetooth: Fix a refcnt underflow problem for hci_conn
Lee, Chun-Yi <jlee(a)suse.com>
Bluetooth: Reject connection with the device which has same BD_ADDR
Lee, Chun-Yi <jlee(a)suse.com>
Bluetooth: hci_event: Ignore NULL link key
Ricardo Cañuelo <ricardo.canuelo(a)collabora.com>
usb: hub: Guard against accesses to uninitialized BOS descriptors
Borislav Petkov (AMD) <bp(a)alien8.de>
x86/cpu: Fix AMD erratum #1485 on Zen4-based CPUs
Krishna Kurapati <quic_kriskura(a)quicinc.com>
usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call
Piyush Mehta <piyush.mehta(a)amd.com>
usb: gadget: udc-xilinx: replace memcpy with memcpy_toio
Dmitry Torokhov <dmitry.torokhov(a)gmail.com>
pinctrl: avoid unsafe code pattern in find_pinctrl()
Michal Koutný <mkoutny(a)suse.com>
cgroup: Remove duplicates in cgroup v1 tasks file
Matthias Berndt <matthias_berndt(a)gmx.de>
Input: xpad - add PXN V900 support
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
Input: powermate - fix use-after-free in powermate_config_complete
Xiubo Li <xiubli(a)redhat.com>
ceph: fix incorrect revoked caps assert in ceph_fill_file_size()
Jorge Sanjuan Garcia <jorge.sanjuangarcia(a)duagon.com>
mcb: remove is_added flag from mcb_device struct
Alexander Zangerl <az(a)breathe-safe.com>
iio: pressure: ms5611: ms5611_prom_is_valid false negative bug
Phil Elwell <phil(a)raspberrypi.com>
iio: pressure: bmp280: Fix NULL pointer exception
Xingxing Luo <xingxing.luo(a)unisoc.com>
usb: musb: Modify the "HWVers" register address
Xingxing Luo <xingxing.luo(a)unisoc.com>
usb: musb: Get the musb_qh poniter after musb_giveback
Javier Carrasco <javier.carrasco.cruz(a)gmail.com>
net: usb: dm9601: fix uninitialized variable use in dm9601_mdio_read
Wesley Cheng <quic_wcheng(a)quicinc.com>
usb: xhci: xhci-ring: Use sysdev for mapping bounce buffer
Waiman Long <longman(a)redhat.com>
workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask()
Jeremy Cline <jeremy(a)jcline.org>
nfc: nci: assert requested protocol is valid
Dan Carpenter <dan.carpenter(a)linaro.org>
ixgbe: fix crash with empty VF macvlan list
Konstantin Meskhidze <konstantin.meskhidze(a)huawei.com>
drm/vmwgfx: fix typo of sizeof argument
Dinghao Liu <dinghao.liu(a)zju.edu.cn>
ieee802154: ca8210: Fix a potential UAF in ca8210_probe
Martin Fuzzey <martin.fuzzey(a)flowbird.group>
drm: etvnaviv: fix bad backport leading to warning
Hans de Goede <hdegoede(a)redhat.com>
HID: logitech-hidpp: Fix kernel crash on receiver USB disconnect
Artem Chernyshev <artem.chernyshev(a)red-soft.ru>
RDMA/cxgb4: Check skb value for failure to allocate
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/omap4-droid4-xt894.dts | 1 +
arch/s390/pci/pci_dma.c | 16 +++++-
arch/x86/include/asm/msr-index.h | 4 ++
arch/x86/kernel/cpu/amd.c | 9 ++++
arch/x86/kvm/lapic.c | 8 ++-
drivers/acpi/irq.c | 7 ++-
drivers/ata/libata-eh.c | 2 +-
drivers/base/regmap/regmap.c | 2 +-
drivers/bluetooth/hci_vhci.c | 3 ++
drivers/gpio/gpio-timberdale.c | 5 +-
drivers/gpio/gpio-vf610.c | 4 +-
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +-
drivers/hid/hid-holtek-kbd.c | 4 ++
drivers/hid/hid-logitech-hidpp.c | 3 +-
drivers/i2c/i2c-mux.c | 2 +-
drivers/iio/pressure/bmp280-core.c | 2 +-
drivers/iio/pressure/ms5611_core.c | 2 +-
drivers/infiniband/hw/cxgb4/cm.c | 3 ++
drivers/input/joystick/xpad.c | 2 +
drivers/input/misc/powermate.c | 1 +
drivers/mcb/mcb-core.c | 10 ++--
drivers/mcb/mcb-parse.c | 2 -
drivers/mmc/core/mmc.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_common.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +-
drivers/net/ethernet/marvell/sky2.h | 2 +-
drivers/net/ieee802154/ca8210.c | 17 ++----
drivers/net/usb/dm9601.c | 7 ++-
drivers/net/usb/smsc95xx.c | 2 +-
drivers/usb/core/hub.c | 28 ++++++++--
drivers/usb/core/hub.h | 2 +-
drivers/usb/gadget/function/f_ncm.c | 26 +++++++---
drivers/usb/gadget/udc/udc-xilinx.c | 20 ++++---
drivers/usb/host/xhci-ring.c | 4 +-
drivers/usb/musb/musb_debugfs.c | 2 +-
drivers/usb/musb/musb_host.c | 9 +++-
drivers/usb/serial/option.c | 7 +++
fs/btrfs/tree-log.c | 2 +-
fs/ceph/inode.c | 4 +-
fs/overlayfs/copy_up.c | 2 +-
include/linux/mcb.h | 1 -
include/linux/perf_event.h | 1 +
include/net/bluetooth/hci_core.h | 2 +-
include/net/netns/xfrm.h | 1 +
kernel/cgroup/cgroup-v1.c | 5 +-
kernel/events/core.c | 39 +++++++++++---
kernel/trace/trace_events.c | 1 +
kernel/workqueue.c | 8 ++-
net/bluetooth/hci_conn.c | 72 ++++++++++++++++----------
net/bluetooth/hci_core.c | 8 +--
net/bluetooth/hci_event.c | 33 +++++++++---
net/bluetooth/hci_sock.c | 3 +-
net/ipv4/esp4.c | 4 +-
net/ipv6/esp6.c | 4 +-
net/mac80211/tx.c | 3 +-
net/netfilter/nft_payload.c | 2 +-
net/nfc/nci/core.c | 5 ++
net/nfc/nci/spi.c | 2 +
net/rfkill/rfkill-gpio.c | 4 +-
net/wireless/nl80211.c | 2 +-
net/xfrm/xfrm_policy.c | 6 +--
63 files changed, 310 insertions(+), 141 deletions(-)
The patch below does not apply to the 6.5-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable(a)vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.5.y
git checkout FETCH_HEAD
git cherry-pick -x cfd96726e61136e68a168813cedc4084f626208b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023102132-relay-underpay-845a@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From cfd96726e61136e68a168813cedc4084f626208b Mon Sep 17 00:00:00 2001
From: Miguel Ojeda <ojeda(a)kernel.org>
Date: Wed, 18 Oct 2023 17:55:27 +0200
Subject: [PATCH] rust: docs: fix logo replacement
The static files placement by `rustdoc` changed in Rust 1.67.0 [1],
but the custom code we have to replace the logo in the generated
HTML files did not get updated.
Thus update it to have the Linux logo again in the output.
Hopefully `rustdoc` will eventually support a custom logo from
a local file [2], so that we do not need to maintain this hack
on our side.
Link: https://github.com/rust-lang/rust/pull/101702 [1]
Link: https://github.com/rust-lang/rfcs/pull/3226 [2]
Fixes: 3ed03f4da06e ("rust: upgrade to Rust 1.68.2")
Cc: stable(a)vger.kernel.org
Tested-by: Benno Lossin <benno.lossin(a)proton.me>
Reviewed-by: Andreas Hindborg <a.hindborg(a)samsung.com>
Link: https://lore.kernel.org/r/20231018155527.1015059-1-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda(a)kernel.org>
diff --git a/rust/Makefile b/rust/Makefile
index 1e78c82a18a8..7dbf9abe0d01 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -93,15 +93,14 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $<
# and then retouch the generated files.
rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \
rustdoc-alloc rustdoc-kernel
- $(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)
- $(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)
+ $(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)/static.files/
+ $(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)/static.files/
$(Q)find $(rustdoc_output) -name '*.html' -type f -print0 | xargs -0 sed -Ei \
- -e 's:rust-logo\.svg:logo.svg:g' \
- -e 's:rust-logo\.png:logo.svg:g' \
- -e 's:favicon\.svg:logo.svg:g' \
- -e 's:<link rel="alternate icon" type="image/png" href="[./]*favicon-(16x16|32x32)\.png">::g'
- $(Q)echo '.logo-container > img { object-fit: contain; }' \
- >> $(rustdoc_output)/rustdoc.css
+ -e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \
+ -e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \
+ -e 's:<link rel="alternate icon" type="image/png" href="[/.]+/static\.files/favicon-(16x16|32x32)-[0-9a-f]+\.png">::g'
+ $(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \
+ echo ".logo-container > img { object-fit: contain; }" >> $$f; done
rustdoc-macros: private rustdoc_host = yes
rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \
Dear Sasha Levin,
I am the author of a patch series and I am writting you because I have
detected an issue with a patch series I have submitted in May'23.
I sent a series of 3 patches to the maintainer. When he approved them,
he sent an email to Greg, requesting him to include such
patch series in kernel 6.4.
You can check the email thread here:
https://lore.kernel.org/all/20230411083329.4506-1-jth@kernel.org/
For a reason I cannot understand, the AUTOSEL only chose 1 of 3 patches
of the series, so only 1 was backported to stable kernel versions.
[PATCH AUTOSEL 6.3 24/24] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 6.2 20/20] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 6.1 19/19] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 5.15 10/10] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 5.10 9/9] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 5.4 9/9] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 4.19 9/9] mcb-pci: Reallocate memory region to avoid
memory overlapping
[PATCH AUTOSEL 4.14 8/8] mcb-pci: Reallocate memory region to avoid
memory overlapping
In kernel 6.4 and above, the 3 patches were included.
Including only 1 patch is causing crashes in part of our devices.
Please, could you backport the remaining 2 patches to the stable
versions?
Thank you so much.
Best Regards,
Some Chromebooks do not populate the product family DMI value resulting
in firmware load failures.
Add another quirk detection entry that looks for "Google" in the BIOS
version. Theoretically, PRODUCT_FAMILY could be replaced with
BIOS_VERSION, but it is left as a quirk to be conservative.
Cc: stable(a)vger.kernel.org
Signed-off-by: Mark Hasemeyer <markhas(a)chromium.org>
---
sound/soc/sof/sof-pci-dev.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 1d706490588e..64b326e3ef85 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -145,6 +145,13 @@ static const struct dmi_system_id community_key_platforms[] = {
DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"),
}
},
+ {
+ .ident = "Google firmware",
+ .callback = chromebook_use_community_key,
+ .matches = {
+ DMI_MATCH(DMI_BIOS_VERSION, "Google"),
+ }
+ },
{},
};
--
2.42.0.655.g421f12c284-goog
ULONG_MAX is used by a few drivers to figure out the highest available
clock rate via clk_round_rate(clk, ULONG_MAX). Since abs() takes a
signed value as input, the current logic effectively calculates with
ULONG_MAX = -1, which results in the worst parent clock being chosen
instead of the best one.
For example on Rockchip RK3588 the eMMC driver tries to figure out
the highest available clock rate. There are three parent clocks
available resulting in the following rate diffs with the existing
logic:
GPLL: abs(18446744073709551615 - 1188000000) = 1188000001
CPLL: abs(18446744073709551615 - 1500000000) = 1500000001
XIN24M: abs(18446744073709551615 - 24000000) = 24000001
As a result the clock framework will promote a maximum supported
clock rate of 24 MHz, even though 1.5GHz are possible. With the
updated logic any casting between signed and unsigned is avoided
and the numbers look like this instead:
GPLL: 18446744073709551615 - 1188000000 = 18446744072521551615
CPLL: 18446744073709551615 - 1500000000 = 18446744072209551615
XIN24M: 18446744073709551615 - 24000000 = 18446744073685551615
As a result the parent with the highest acceptable rate is chosen
instead of the parent clock with the lowest one.
Cc: stable(a)vger.kernel.org
Fixes: 49502408007b ("mmc: sdhci-of-dwcmshc: properly determine max clock on Rockchip")
Signed-off-by: Sebastian Reichel <sebastian.reichel(a)collabora.com>
---
drivers/clk/clk-composite.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index edfa94641bbf..66759fe28fad 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -119,7 +119,10 @@ static int clk_composite_determine_rate(struct clk_hw *hw,
if (ret)
continue;
- rate_diff = abs(req->rate - tmp_req.rate);
+ if (req->rate >= tmp_req.rate)
+ rate_diff = req->rate - tmp_req.rate;
+ else
+ rate_diff = tmp_req.rate - req->rate;
if (!rate_diff || !req->best_parent_hw
|| best_rate_diff > rate_diff) {
--
2.39.2
The port count of the PX-257 Rev3 is actually 2, not 4.
Fixes: ef5a03a26c87 ("tty: 8250: Add support for Brainboxes PX cards.")
Cc: stable(a)vger.kernel.org
Signed-off-by: Cameron Williams <cang1(a)live.co.uk>
---
For stable: This patch is only applicable to 5.15 LTS and up, other LTS
kernels dont have PX card support.
v3 - v4:
Split patch v3 part 5 into multiple Fixes patches and an Additions patch.
Add Fixes: and Cc: tag.
v2 - v3:
Alter commit message a little to make the additions/fixes cleaner
Re-submit patch series using git send-email to make threading work.
v1 - v2:
This is a resubmission series for the patch series below. That series
was lots of changes sent to lots of maintainers, this series is just for
the tty/serial/8250 subsystem.
[1] https://lore.kernel.org/all/DU0PR02MB789950E64D808DB57E9D7312C4F8A@DU0PR02M…
[2] https://lore.kernel.org/all/DU0PR02MB7899DE53DFC900EFB50E53F2C4F8A@DU0PR02M…
[3] https://lore.kernel.org/all/DU0PR02MB7899033E7E81EAF3694BC20AC4F8A@DU0PR02M…
[4] https://lore.kernel.org/all/DU0PR02MB7899EABA8C3DCAC94DCC79D4C4F8A@DU0PR02M…
drivers/tty/serial/8250/8250_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index b0a632415d8e..59074a709254 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -5180,7 +5180,7 @@ static const struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_INTASHIELD, 0x4015,
PCI_ANY_ID, PCI_ANY_ID,
0, 0,
- pbn_oxsemi_4_15625000 },
+ pbn_oxsemi_2_15625000 },
/*
* Brainboxes PX-260/PX-701
*/
--
2.42.0
Add support for the Intashield IS-100 1 port serial card.
Cc: stable(a)vger.kernel.org
Signed-off-by: Cameron Williams <cang1(a)live.co.uk>
---
v3 - v4:
Add Cc: tag.
v2 - v3:
Re-submit patch series using git send-email to make threading work.
v1 - v2:
This is a resubmission series for the patch series below. That series
was lots of changes sent to lots of maintainers, this series is just for
the tty/serial/8250 subsystem.
[1] https://lore.kernel.org/all/DU0PR02MB789950E64D808DB57E9D7312C4F8A@DU0PR02M…
[2] https://lore.kernel.org/all/DU0PR02MB7899DE53DFC900EFB50E53F2C4F8A@DU0PR02M…
[3] https://lore.kernel.org/all/DU0PR02MB7899033E7E81EAF3694BC20AC4F8A@DU0PR02M…
[4] https://lore.kernel.org/all/DU0PR02MB7899EABA8C3DCAC94DCC79D4C4F8A@DU0PR02M…
drivers/tty/serial/8250/8250_pci.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 1c46b65789c9..b0a632415d8e 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -4913,6 +4913,12 @@ static const struct pci_device_id serial_pci_tbl[] = {
0, 0,
pbn_b1_bt_1_115200 },
+ /*
+ * IntaShield IS-100
+ */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0D60,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ pbn_b2_1_115200 },
/*
* IntaShield IS-200
*/
--
2.42.0