diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-03 02:05:20 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-03 02:05:20 +0200 |
| commit | d28412a35a6395a260620b3a965d19e545f15831 (patch) | |
| tree | bd57dbee5acd5ba988507097969667f3c5879bdb /drivers/net | |
| parent | 3c192840663289bb66477226e60bc8f28731b695 (diff) | |
| parent | e02cb91d4644dfff593146f89e70d2008cc6ac16 (diff) | |
| download | linux-next-d28412a35a6395a260620b3a965d19e545f15831.tar.gz linux-next-d28412a35a6395a260620b3a965d19e545f15831.zip | |
Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git
# Conflicts:
# drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
# net/ceph/osd_client.c
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c.h | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e.h | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000.h | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/igbvf/netdev.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h index 63ba64dbb731..789884261403 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c.h +++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h @@ -29,7 +29,6 @@ #include <linux/mii.h> #include <linux/io.h> #include <linux/vmalloc.h> -#include <linux/pagemap.h> #include <linux/tcp.h> #include <linux/ethtool.h> #include <linux/if_vlan.h> diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h index 6b0066f47e9e..ec0ef225e826 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e.h +++ b/drivers/net/ethernet/atheros/atl1e/atl1e.h @@ -30,7 +30,6 @@ #include <linux/mii.h> #include <linux/io.h> #include <linux/vmalloc.h> -#include <linux/pagemap.h> #include <linux/tcp.h> #include <linux/ethtool.h> #include <linux/if_vlan.h> diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h index ea6ccf4b728b..0b2ae5c4d4c3 100644 --- a/drivers/net/ethernet/intel/e1000/e1000.h +++ b/drivers/net/ethernet/intel/e1000/e1000.h @@ -24,7 +24,6 @@ #include <linux/vmalloc.h> #include <linux/interrupt.h> #include <linux/string.h> -#include <linux/pagemap.h> #include <linux/dma-mapping.h> #include <linux/bitops.h> #include <asm/io.h> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 844f31ab37ad..a0142f656a1b 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -8,7 +8,6 @@ #include <linux/init.h> #include <linux/pci.h> #include <linux/vmalloc.h> -#include <linux/pagemap.h> #include <linux/delay.h> #include <linux/netdevice.h> #include <linux/interrupt.h> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index d4a897a8c82c..8b29f19a6dea 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -8,7 +8,6 @@ #include <linux/init.h> #include <linux/bitops.h> #include <linux/vmalloc.h> -#include <linux/pagemap.h> #include <linux/netdevice.h> #include <linux/ipv6.h> #include <linux/slab.h> diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index c686ee120a14..b187e5641202 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c @@ -12,7 +12,6 @@ #include <linux/mii.h> #include <linux/module.h> #include <linux/netdevice.h> -#include <linux/pagemap.h> #include <linux/pci.h> #include <linux/prefetch.h> #include <linux/sctp.h> |