Conflicting commits, all resolutions pretty trivial: drivers/bus/mhi/pci_generic.c 5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU") 56f6f4c4eb2a ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean") drivers/nfc/s3fwrn5/firmware.c a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label") 46573e3ab08f ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") 801e541c79bb ("nfc: s3fwrn5: fix undefined parameter values in dev_err()") MAINTAINERS 7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver") 8a7b46fa7902 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")
Showing the changes to include/uapi (2 of 426 files). Show all
Unified · Split
| @@ -1,4 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | 1 | /* SPDX-License-Identifier: LGPL-2.1 WITH Linux-syscall-note */ |
| 2 | /* Copyright(c) 2019 Intel Corporation. All rights rsvd. */ | 2 | /* Copyright(c) 2019 Intel Corporation. All rights rsvd. */ |
| 3 | #ifndef _USR_IDXD_H_ | 3 | #ifndef _USR_IDXD_H_ |
| 4 | #define _USR_IDXD_H_ | 4 | #define _USR_IDXD_H_ |
| @@ -1,4 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ | 1 | /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2006 - 2021 Intel Corporation. All rights reserved. | 3 | * Copyright (c) 2006 - 2021 Intel Corporation. All rights reserved. |
| 4 | * Copyright (c) 2005 Topspin Communications. All rights reserved. | 4 | * Copyright (c) 2005 Topspin Communications. All rights reserved. |