Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel-alx-legacy/patches-4.9/0429-4.9.330-all-fixes.patch

    Contents of /trunk/kernel-alx-legacy/patches-4.9/0429-4.9.330-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3731 - (show annotations) (download)
    Mon Oct 24 14:08:41 2022 UTC (18 months, 1 week ago) by niro
    File size: 18331 byte(s) 
    -linux-4.9.330
    1 diff --git a/Makefile b/Makefile
    2 index 31cf32eb5fc9a..ad86576ed692e 100644
    3 --- a/Makefile
    4 +++ b/Makefile
    5 @@ -1,6 +1,6 @@
    6 VERSION = 4
    7 PATCHLEVEL = 9
    8 -SUBLEVEL = 329
    9 +SUBLEVEL = 330
    10 EXTRAVERSION =
    11 NAME = Roaring Lionus
    12
    13 diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
    14 index d1de57b86683c..e0835a743e418 100644
    15 --- a/arch/mips/lantiq/clk.c
    16 +++ b/arch/mips/lantiq/clk.c
    17 @@ -52,6 +52,7 @@ struct clk *clk_get_io(void)
    18 {
    19 return &cpu_clk_generic[2];
    20 }
    21 +EXPORT_SYMBOL_GPL(clk_get_io);
    22
    23 struct clk *clk_get_ppe(void)
    24 {
    25 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
    26 index 3248aa7a35b36..cb3e22f10d688 100644
    27 --- a/drivers/hv/vmbus_drv.c
    28 +++ b/drivers/hv/vmbus_drv.c
    29 @@ -1186,7 +1186,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
    30 bool fb_overlap_ok)
    31 {
    32 struct resource *iter, *shadow;
    33 - resource_size_t range_min, range_max, start;
    34 + resource_size_t range_min, range_max, start, end;
    35 const char *dev_n = dev_name(&device_obj->device);
    36 int retval;
    37
    38 @@ -1221,6 +1221,14 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj,
    39 range_max = iter->end;
    40 start = (range_min + align - 1) & ~(align - 1);
    41 for (; start + size - 1 <= range_max; start += align) {
    42 + end = start + size - 1;
    43 +
    44 + /* Skip the whole fb_mmio region if not fb_overlap_ok */
    45 + if (!fb_overlap_ok && fb_mmio &&
    46 + (((start >= fb_mmio->start) && (start <= fb_mmio->end)) ||
    47 + ((end >= fb_mmio->start) && (end <= fb_mmio->end))))
    48 + continue;
    49 +
    50 shadow = __request_region(iter, start, size, NULL,
    51 IORESOURCE_BUSY);
    52 if (!shadow)
    53 diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
    54 index e3dc59fffdb78..8472667ffe716 100644
    55 --- a/drivers/net/can/usb/gs_usb.c
    56 +++ b/drivers/net/can/usb/gs_usb.c
    57 @@ -687,6 +687,7 @@ static int gs_can_open(struct net_device *netdev)
    58 flags |= GS_CAN_MODE_TRIPLE_SAMPLE;
    59
    60 /* finally start device */
    61 + dev->can.state = CAN_STATE_ERROR_ACTIVE;
    62 dm->mode = cpu_to_le32(GS_CAN_MODE_START);
    63 dm->flags = cpu_to_le32(flags);
    64 rc = usb_control_msg(interface_to_usbdev(dev->iface),
    65 @@ -703,13 +704,12 @@ static int gs_can_open(struct net_device *netdev)
    66 if (rc < 0) {
    67 netdev_err(netdev, "Couldn't start device (err=%d)\n", rc);
    68 kfree(dm);
    69 + dev->can.state = CAN_STATE_STOPPED;
    70 return rc;
    71 }
    72
    73 kfree(dm);
    74
    75 - dev->can.state = CAN_STATE_ERROR_ACTIVE;
    76 -
    77 parent->active_channels++;
    78 if (!(dev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))
    79 netif_start_queue(netdev);
    80 diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
    81 index b38106a7cb5d8..b421a1d44783d 100644
    82 --- a/drivers/net/ethernet/sun/sunhme.c
    83 +++ b/drivers/net/ethernet/sun/sunhme.c
    84 @@ -2064,9 +2064,9 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
    85
    86 skb_reserve(copy_skb, 2);
    87 skb_put(copy_skb, len);
    88 - dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE);
    89 + dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len + 2, DMA_FROM_DEVICE);
    90 skb_copy_from_linear_data(skb, copy_skb->data, len);
    91 - dma_sync_single_for_device(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE);
    92 + dma_sync_single_for_device(hp->dma_dev, dma_addr, len + 2, DMA_FROM_DEVICE);
    93 /* Reuse original ring buffer. */
    94 hme_write_rxd(hp, this,
    95 (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
    96 diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
    97 index 6c0982a39486a..7668584c38433 100644
    98 --- a/drivers/net/ipvlan/ipvlan_core.c
    99 +++ b/drivers/net/ipvlan/ipvlan_core.c
    100 @@ -441,7 +441,6 @@ out:
    101
    102 static int ipvlan_process_outbound(struct sk_buff *skb)
    103 {
    104 - struct ethhdr *ethh = eth_hdr(skb);
    105 int ret = NET_XMIT_DROP;
    106
    107 /* The ipvlan is a pseudo-L2 device, so the packets that we receive
    108 @@ -451,6 +450,8 @@ static int ipvlan_process_outbound(struct sk_buff *skb)
    109 if (skb_mac_header_was_set(skb)) {
    110 /* In this mode we dont care about
    111 * multicast and broadcast traffic */
    112 + struct ethhdr *ethh = eth_hdr(skb);
    113 +
    114 if (is_multicast_ether_addr(ethh->h_dest)) {
    115 pr_debug_ratelimited(
    116 "Dropped {multi|broad}cast of type=[%x]\n",
    117 @@ -520,7 +521,7 @@ out:
    118 static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
    119 {
    120 const struct ipvl_dev *ipvlan = netdev_priv(dev);
    121 - struct ethhdr *eth = eth_hdr(skb);
    122 + struct ethhdr *eth = skb_eth_hdr(skb);
    123 struct ipvl_addr *addr;
    124 void *lyr3h;
    125 int addr_type;
    126 @@ -544,6 +545,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
    127 return dev_forward_skb(ipvlan->phy_dev, skb);
    128
    129 } else if (is_multicast_ether_addr(eth->h_dest)) {
    130 + skb_reset_mac_header(skb);
    131 ipvlan_skb_crossing_ns(skb, NULL);
    132 ipvlan_multicast_enqueue(ipvlan->port, skb);
    133 return NET_XMIT_SUCCESS;
    134 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
    135 index 001dea7aaba3d..657e12e0b5e2b 100644
    136 --- a/drivers/net/team/team.c
    137 +++ b/drivers/net/team/team.c
    138 @@ -1280,10 +1280,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
    139 }
    140 }
    141
    142 - netif_addr_lock_bh(dev);
    143 - dev_uc_sync_multiple(port_dev, dev);
    144 - dev_mc_sync_multiple(port_dev, dev);
    145 - netif_addr_unlock_bh(dev);
    146 + if (dev->flags & IFF_UP) {
    147 + netif_addr_lock_bh(dev);
    148 + dev_uc_sync_multiple(port_dev, dev);
    149 + dev_mc_sync_multiple(port_dev, dev);
    150 + netif_addr_unlock_bh(dev);
    151 + }
    152
    153 port->index = -1;
    154 list_add_tail_rcu(&port->list, &team->port_list);
    155 @@ -1354,8 +1356,10 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
    156 netdev_rx_handler_unregister(port_dev);
    157 team_port_disable_netpoll(port);
    158 vlan_vids_del_by_dev(port_dev, dev);
    159 - dev_uc_unsync(port_dev, dev);
    160 - dev_mc_unsync(port_dev, dev);
    161 + if (dev->flags & IFF_UP) {
    162 + dev_uc_unsync(port_dev, dev);
    163 + dev_mc_unsync(port_dev, dev);
    164 + }
    165 dev_close(port_dev);
    166 team_port_leave(team, port);
    167
    168 @@ -1703,6 +1707,14 @@ static int team_open(struct net_device *dev)
    169
    170 static int team_close(struct net_device *dev)
    171 {
    172 + struct team *team = netdev_priv(dev);
    173 + struct team_port *port;
    174 +
    175 + list_for_each_entry(port, &team->port_list, list) {
    176 + dev_uc_unsync(port->dev, dev);
    177 + dev_mc_unsync(port->dev, dev);
    178 + }
    179 +
    180 return 0;
    181 }
    182
    183 diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
    184 index 633762f8d7755..84a93ddcd57a2 100644
    185 --- a/drivers/parisc/ccio-dma.c
    186 +++ b/drivers/parisc/ccio-dma.c
    187 @@ -1569,6 +1569,7 @@ static int __init ccio_probe(struct parisc_device *dev)
    188 ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);
    189 ccio_ioc_init(ioc);
    190 if (ccio_init_resources(ioc)) {
    191 + iounmap(ioc->ioc_regs);
    192 kfree(ioc);
    193 return -ENOMEM;
    194 }
    195 diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
    196 index 2002684a68b3c..53eb32c65abb9 100644
    197 --- a/drivers/s390/block/dasd_alias.c
    198 +++ b/drivers/s390/block/dasd_alias.c
    199 @@ -674,12 +674,12 @@ int dasd_alias_remove_device(struct dasd_device *device)
    200 struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
    201 {
    202 struct dasd_eckd_private *alias_priv, *private = base_device->private;
    203 - struct alias_pav_group *group = private->pavgroup;
    204 struct alias_lcu *lcu = private->lcu;
    205 struct dasd_device *alias_device;
    206 + struct alias_pav_group *group;
    207 unsigned long flags;
    208
    209 - if (!group || !lcu)
    210 + if (!lcu)
    211 return NULL;
    212 if (lcu->pav == NO_PAV ||
    213 lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING))
    214 @@ -696,6 +696,11 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
    215 }
    216
    217 spin_lock_irqsave(&lcu->lock, flags);
    218 + group = private->pavgroup;
    219 + if (!group) {
    220 + spin_unlock_irqrestore(&lcu->lock, flags);
    221 + return NULL;
    222 + }
    223 alias_device = group->next;
    224 if (!alias_device) {
    225 if (list_empty(&group->aliaslist)) {
    226 diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
    227 index 731ac35acb312..1896e0d9a64b4 100644
    228 --- a/drivers/tty/serial/serial-tegra.c
    229 +++ b/drivers/tty/serial/serial-tegra.c
    230 @@ -409,7 +409,7 @@ static void tegra_uart_tx_dma_complete(void *args)
    231 count = tup->tx_bytes_requested - state.residue;
    232 async_tx_ack(tup->tx_dma_desc);
    233 spin_lock_irqsave(&tup->uport.lock, flags);
    234 - xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
    235 + uart_xmit_advance(&tup->uport, count);
    236 tup->tx_in_progress = 0;
    237 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
    238 uart_write_wakeup(&tup->uport);
    239 @@ -493,7 +493,6 @@ static unsigned int tegra_uart_tx_empty(struct uart_port *u)
    240 static void tegra_uart_stop_tx(struct uart_port *u)
    241 {
    242 struct tegra_uart_port *tup = to_tegra_uport(u);
    243 - struct circ_buf *xmit = &tup->uport.state->xmit;
    244 struct dma_tx_state state;
    245 unsigned int count;
    246
    247 @@ -504,7 +503,7 @@ static void tegra_uart_stop_tx(struct uart_port *u)
    248 dmaengine_tx_status(tup->tx_dma_chan, tup->tx_cookie, &state);
    249 count = tup->tx_bytes_requested - state.residue;
    250 async_tx_ack(tup->tx_dma_desc);
    251 - xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1);
    252 + uart_xmit_advance(&tup->uport, count);
    253 tup->tx_in_progress = 0;
    254 }
    255
    256 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
    257 index 611ff2c28f7a4..37867df5e901a 100644
    258 --- a/drivers/usb/core/hub.c
    259 +++ b/drivers/usb/core/hub.c
    260 @@ -5702,7 +5702,7 @@ re_enumerate_no_bos:
    261 *
    262 * Return: The same as for usb_reset_and_verify_device().
    263 * However, if a reset is already in progress (for instance, if a
    264 - * driver doesn't have pre_ or post_reset() callbacks, and while
    265 + * driver doesn't have pre_reset() or post_reset() callbacks, and while
    266 * being unbound or re-bound during the ongoing reset its disconnect()
    267 * or probe() routine tries to perform a second, nested reset), the
    268 * routine returns -EINPROGRESS.
    269 diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c
    270 index 184773b6b9e4f..2cca4b763d8dc 100644
    271 --- a/drivers/video/fbdev/pxa3xx-gcu.c
    272 +++ b/drivers/video/fbdev/pxa3xx-gcu.c
    273 @@ -391,7 +391,7 @@ pxa3xx_gcu_write(struct file *file, const char *buff,
    274 struct pxa3xx_gcu_batch *buffer;
    275 struct pxa3xx_gcu_priv *priv = to_pxa3xx_gcu_priv(file);
    276
    277 - int words = count / 4;
    278 + size_t words = count / 4;
    279
    280 /* Does not need to be atomic. There's a lock in user space,
    281 * but anyhow, this is just for statistics. */
    282 diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
    283 index de133eeebc8a4..c821d13c6d720 100644
    284 --- a/fs/cifs/transport.c
    285 +++ b/fs/cifs/transport.c
    286 @@ -140,8 +140,8 @@ smb_send_kvec(struct TCP_Server_Info *server, struct msghdr *smb_msg,
    287
    288 *sent = 0;
    289
    290 - smb_msg->msg_name = (struct sockaddr *) &server->dstaddr;
    291 - smb_msg->msg_namelen = sizeof(struct sockaddr);
    292 + smb_msg->msg_name = NULL;
    293 + smb_msg->msg_namelen = 0;
    294 smb_msg->msg_control = NULL;
    295 smb_msg->msg_controllen = 0;
    296 if (server->noblocksnd)
    297 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
    298 index 4966c6d24ad2c..17d7b86a6419d 100644
    299 --- a/fs/ext4/ialloc.c
    300 +++ b/fs/ext4/ialloc.c
    301 @@ -511,7 +511,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent,
    302 goto fallback;
    303 }
    304
    305 - max_dirs = ndirs / ngroups + inodes_per_group / 16;
    306 + max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
    307 min_inodes = avefreei - inodes_per_group*flex_size / 4;
    308 if (min_inodes < 1)
    309 min_inodes = 1;
    310 diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
    311 index cd95b5e395a30..08399a68566bd 100644
    312 --- a/include/linux/serial_core.h
    313 +++ b/include/linux/serial_core.h
    314 @@ -294,6 +294,23 @@ struct uart_state {
    315 /* number of characters left in xmit buffer before we ask for more */
    316 #define WAKEUP_CHARS 256
    317
    318 +/**
    319 + * uart_xmit_advance - Advance xmit buffer and account Tx'ed chars
    320 + * @up: uart_port structure describing the port
    321 + * @chars: number of characters sent
    322 + *
    323 + * This function advances the tail of circular xmit buffer by the number of
    324 + * @chars transmitted and handles accounting of transmitted bytes (into
    325 + * @up's icount.tx).
    326 + */
    327 +static inline void uart_xmit_advance(struct uart_port *up, unsigned int chars)
    328 +{
    329 + struct circ_buf *xmit = &up->state->xmit;
    330 +
    331 + xmit->tail = (xmit->tail + chars) & (UART_XMIT_SIZE - 1);
    332 + up->icount.tx += chars;
    333 +}
    334 +
    335 struct module;
    336 struct tty_driver;
    337
    338 diff --git a/mm/slub.c b/mm/slub.c
    339 index c07c5fa6adcd1..3291d3ef86b08 100644
    340 --- a/mm/slub.c
    341 +++ b/mm/slub.c
    342 @@ -5601,7 +5601,8 @@ static char *create_unique_id(struct kmem_cache *s)
    343 char *name = kmalloc(ID_STR_LENGTH, GFP_KERNEL);
    344 char *p = name;
    345
    346 - BUG_ON(!name);
    347 + if (!name)
    348 + return ERR_PTR(-ENOMEM);
    349
    350 *p++ = ':';
    351 /*
    352 @@ -5649,6 +5650,8 @@ static int sysfs_slab_add(struct kmem_cache *s)
    353 * for the symlinks.
    354 */
    355 name = create_unique_id(s);
    356 + if (IS_ERR(name))
    357 + return PTR_ERR(name);
    358 }
    359
    360 s->kobj.kset = cache_kset(s);
    361 diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
    362 index 701adcb9262eb..a73c362a0182b 100644
    363 --- a/net/mac80211/scan.c
    364 +++ b/net/mac80211/scan.c
    365 @@ -385,10 +385,6 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
    366 scan_req = rcu_dereference_protected(local->scan_req,
    367 lockdep_is_held(&local->mtx));
    368
    369 - if (scan_req != local->int_scan_req) {
    370 - local->scan_info.aborted = aborted;
    371 - cfg80211_scan_done(scan_req, &local->scan_info);
    372 - }
    373 RCU_INIT_POINTER(local->scan_req, NULL);
    374
    375 scan_sdata = rcu_dereference_protected(local->scan_sdata,
    376 @@ -398,6 +394,13 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
    377 local->scanning = 0;
    378 local->scan_chandef.chan = NULL;
    379
    380 + synchronize_rcu();
    381 +
    382 + if (scan_req != local->int_scan_req) {
    383 + local->scan_info.aborted = aborted;
    384 + cfg80211_scan_done(scan_req, &local->scan_info);
    385 + }
    386 +
    387 /* Set power back to normal operating levels. */
    388 ieee80211_hw_config(local, 0);
    389
    390 diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
    391 index c6a8bdc3a226d..5d630288f86c9 100644
    392 --- a/net/netfilter/nf_conntrack_irc.c
    393 +++ b/net/netfilter/nf_conntrack_irc.c
    394 @@ -150,15 +150,37 @@ static int help(struct sk_buff *skb, unsigned int protoff,
    395 data = ib_ptr;
    396 data_limit = ib_ptr + skb->len - dataoff;
    397
    398 - /* strlen("\1DCC SENT t AAAAAAAA P\1\n")=24
    399 - * 5+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=14 */
    400 - while (data < data_limit - (19 + MINMATCHLEN)) {
    401 - if (memcmp(data, "\1DCC ", 5)) {
    402 + /* Skip any whitespace */
    403 + while (data < data_limit - 10) {
    404 + if (*data == ' ' || *data == '\r' || *data == '\n')
    405 + data++;
    406 + else
    407 + break;
    408 + }
    409 +
    410 + /* strlen("PRIVMSG x ")=10 */
    411 + if (data < data_limit - 10) {
    412 + if (strncasecmp("PRIVMSG ", data, 8))
    413 + goto out;
    414 + data += 8;
    415 + }
    416 +
    417 + /* strlen(" :\1DCC SENT t AAAAAAAA P\1\n")=26
    418 + * 7+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=26
    419 + */
    420 + while (data < data_limit - (21 + MINMATCHLEN)) {
    421 + /* Find first " :", the start of message */
    422 + if (memcmp(data, " :", 2)) {
    423 data++;
    424 continue;
    425 }
    426 + data += 2;
    427 +
    428 + /* then check that place only for the DCC command */
    429 + if (memcmp(data, "\1DCC ", 5))
    430 + goto out;
    431 data += 5;
    432 - /* we have at least (19+MINMATCHLEN)-5 bytes valid data left */
    433 + /* we have at least (21+MINMATCHLEN)-(2+5) bytes valid data left */
    434
    435 iph = ip_hdr(skb);
    436 pr_debug("DCC found in master %pI4:%u %pI4:%u\n",
    437 @@ -174,7 +196,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
    438 pr_debug("DCC %s detected\n", dccprotos[i]);
    439
    440 /* we have at least
    441 - * (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid
    442 + * (21+MINMATCHLEN)-7-dccprotos[i].matchlen bytes valid
    443 * data left (== 14/13 bytes) */
    444 if (parse_dcc(data, data_limit, &dcc_ip,
    445 &dcc_port, &addr_beg_p, &addr_end_p)) {
    446 diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
    447 index 3a8dc39a9116b..7dc23df7b4e36 100644
    448 --- a/net/netfilter/nf_conntrack_sip.c
    449 +++ b/net/netfilter/nf_conntrack_sip.c
    450 @@ -471,7 +471,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,
    451 return ret;
    452 if (ret == 0)
    453 break;
    454 - dataoff += *matchoff;
    455 + dataoff = *matchoff;
    456 }
    457 *in_header = 0;
    458 }
    459 @@ -483,7 +483,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr,
    460 break;
    461 if (ret == 0)
    462 return ret;
    463 - dataoff += *matchoff;
    464 + dataoff = *matchoff;
    465 }
    466
    467 if (in_header)
    468 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
    469 index 74ce577de7dfe..ac49c9eb16546 100644
    470 --- a/sound/pci/hda/hda_intel.c
    471 +++ b/sound/pci/hda/hda_intel.c
    472 @@ -2316,6 +2316,8 @@ static const struct pci_device_id azx_ids[] = {
    473 /* 5 Series/3400 */
    474 { PCI_DEVICE(0x8086, 0x3b56),
    475 .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
    476 + { PCI_DEVICE(0x8086, 0x3b57),
    477 + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
    478 /* Poulsbo */
    479 { PCI_DEVICE(0x8086, 0x811b),
    480 .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
    481 diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
    482 index 8b240a55cb89f..d149cb00282cd 100644
    483 --- a/sound/pci/hda/patch_hdmi.c
    484 +++ b/sound/pci/hda/patch_hdmi.c
    485 @@ -3247,6 +3247,7 @@ static int patch_tegra_hdmi(struct hda_codec *codec)
    486 if (err)
    487 return err;
    488
    489 + codec->depop_delay = 10;
    490 codec->patch_ops.build_pcms = tegra_hdmi_build_pcms;
    491 spec = codec->spec;
    492 spec->chmap.ops.chmap_cea_alloc_validate_get_type =
    493 diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
    494 index e155783c601ab..0a7e1543ce8fe 100644
    495 --- a/tools/perf/util/symbol-elf.c
    496 +++ b/tools/perf/util/symbol-elf.c
    497 @@ -1694,8 +1694,8 @@ static int kcore_copy__compare_file(const char *from_dir, const char *to_dir,
    498 * unusual. One significant peculiarity is that the mapping (start -> pgoff)
    499 * is not the same for the kernel map and the modules map. That happens because
    500 * the data is copied adjacently whereas the original kcore has gaps. Finally,
    501 - * kallsyms and modules files are compared with their copies to check that
    502 - * modules have not been loaded or unloaded while the copies were taking place.
    503 + * kallsyms file is compared with its copy to check that modules have not been
    504 + * loaded or unloaded while the copies were taking place.
    505 *
    506 * Return: %0 on success, %-1 on failure.
    507 */
    508 @@ -1758,9 +1758,6 @@ int kcore_copy(const char *from_dir, const char *to_dir)
    509 kci.modules_map.len))
    510 goto out_extract_close;
    511
    512 - if (kcore_copy__compare_file(from_dir, to_dir, "modules"))
    513 - goto out_extract_close;
    514 -
    515 if (kcore_copy__compare_file(from_dir, to_dir, "kallsyms"))
    516 goto out_extract_close;
    517