The new route handling in ip_mc_finish_output() from 'net' overlapped with the new support for returning congestion notifications from BPF programs. In order to handle this I had to take the dev_loopback_xmit() calls out of the switch statement. The aquantia driver conflicts were simple overlapping changes.
Showing the changes to include/linux (2 of 101 files). Show all
Unified · Split
| @@ -103,6 +103,7 @@ void ishtp_put_device(struct ishtp_cl_device *cl_dev); · 102 unmodified lines | ||
| 103 | 103 | void ishtp_get_device(struct ishtp_cl_device *cl_dev); |
| 104 | 104 | void ishtp_set_drvdata(struct ishtp_cl_device *cl_device, void *data); |
| 105 | 105 | void *ishtp_get_drvdata(struct ishtp_cl_device *cl_device); |
| 106 | +struct ishtp_cl_device *ishtp_dev_to_cl_device(struct device *dev); | |
| 106 | 107 | int ishtp_register_event_cb(struct ishtp_cl_device *device, |
| 107 | 108 | void (*read_cb)(struct ishtp_cl_device *)); |
| 108 | 109 | struct ishtp_fw_client *ishtp_fw_cl_get_client(struct ishtp_device *dev, |
| @@ -373,6 +373,8 @@ struct flash_info; · 372 unmodified lines | ||
| 373 | 373 | * @flash_unlock: [FLASH-SPECIFIC] unlock a region of the SPI NOR |
| 374 | 374 | * @flash_is_locked: [FLASH-SPECIFIC] check if a region of the SPI NOR is |
| 375 | 375 | * @quad_enable: [FLASH-SPECIFIC] enables SPI NOR quad mode |
| 376 | + * @clear_sr_bp: [FLASH-SPECIFIC] clears the Block Protection Bits from | |
| 377 | + * the SPI NOR Status Register. | |
| 376 | 378 | * completely locked |
| 377 | 379 | * @priv: the private data |
| 378 | 380 | */ |
| @@ -410,6 +412,7 @@ struct spi_nor { · 31 unmodified lines | ||
| 410 | 412 | int (*flash_unlock)(struct spi_nor *nor, loff_t ofs, uint64_t len); |
| 411 | 413 | int (*flash_is_locked)(struct spi_nor *nor, loff_t ofs, uint64_t len); |
| 412 | 414 | int (*quad_enable)(struct spi_nor *nor); |
| 415 | + int (*clear_sr_bp)(struct spi_nor *nor); | |
| 413 | 416 | |
| 414 | 417 | void *priv; |
| 415 | 418 | }; |