03fe2debbb
Fun set of conflict resolutions here...
For the mac80211 stuff, these were fortunately just parallel
adds. Trivially resolved.
In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the
function phy_disable_interrupts() earlier in the file, whilst in
'net-next' the phy_error() call from this function was removed.
In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the
'rt_table_id' member of rtable collided with a bug fix in 'net' that
added a new struct member "rt_mtu_locked" which needs to be copied
over here.
The mlxsw driver conflict consisted of net-next separating
the span code and definitions into separate files, whilst
a 'net' bug fix made some changes to that moved code.
The mlx5 infiniband conflict resolution was quite non-trivial,
the RDMA tree's merge commit was used as a guide here, and
here are their notes:
====================
Due to bug fixes found by the syzkaller bot and taken into the for-rc
branch after development for the 4.17 merge window had already started
being taken into the for-next branch, there were fairly non-trivial
merge issues that would need to be resolved between the for-rc branch
and the for-next branch. This merge resolves those conflicts and
provides a unified base upon which ongoing development for 4.17 can
be based.
Conflicts:
drivers/infiniband/hw/mlx5/main.c - Commit
|
||
|---|---|---|
| .. | ||
| aacraid | ||
| aic7xxx | ||
| aic94xx | ||
| arcmsr | ||
| arm | ||
| be2iscsi | ||
| bfa | ||
| bnx2fc | ||
| bnx2i | ||
| csiostor | ||
| cxgbi | ||
| cxlflash | ||
| device_handler | ||
| dpt | ||
| esas2r | ||
| fcoe | ||
| fnic | ||
| hisi_sas | ||
| ibmvscsi | ||
| ibmvscsi_tgt | ||
| isci | ||
| libfc | ||
| libsas | ||
| lpfc | ||
| megaraid | ||
| mpt3sas | ||
| mvsas | ||
| osd | ||
| pcmcia | ||
| pm8001 | ||
| qedf | ||
| qedi | ||
| qla2xxx | ||
| qla4xxx | ||
| smartpqi | ||
| snic | ||
| sym53c8xx_2 | ||
| ufs | ||
| .gitignore | ||
| 3w-9xxx.c | ||
| 3w-9xxx.h | ||
| 3w-sas.c | ||
| 3w-sas.h | ||
| 3w-xxxx.c | ||
| 3w-xxxx.h | ||
| 53c700.c | ||
| 53c700.h | ||
| 53c700.scr | ||
| 53c700_d.h_shipped | ||
| BusLogic.c | ||
| BusLogic.h | ||
| FlashPoint.c | ||
| Kconfig | ||
| Makefile | ||
| NCR53c406a.c | ||
| NCR5380.c | ||
| NCR5380.h | ||
| NCR_D700.c | ||
| NCR_D700.h | ||
| NCR_Q720.c | ||
| NCR_Q720.h | ||
| a100u2w.c | ||
| a100u2w.h | ||
| a2091.c | ||
| a2091.h | ||
| a3000.c | ||
| a3000.h | ||
| a4000t.c | ||
| advansys.c | ||
| aha152x.c | ||
| aha152x.h | ||
| aha1542.c | ||
| aha1542.h | ||
| aha1740.c | ||
| aha1740.h | ||
| am53c974.c | ||
| atari_scsi.c | ||
| atp870u.c | ||
| atp870u.h | ||
| bvme6000_scsi.c | ||
| ch.c | ||
| constants.c | ||
| dc395x.c | ||
| dc395x.h | ||
| dmx3191d.c | ||
| dpt_i2o.c | ||
| dpti.h | ||
| eata.c | ||
| eata_generic.h | ||
| eata_pio.c | ||
| eata_pio.h | ||
| esp_scsi.c | ||
| esp_scsi.h | ||
| fdomain.c | ||
| fdomain.h | ||
| g_NCR5380.c | ||
| gdth.c | ||
| gdth.h | ||
| gdth_ioctl.h | ||
| gdth_proc.c | ||
| gdth_proc.h | ||
| gvp11.c | ||
| gvp11.h | ||
| hosts.c | ||
| hpsa.c | ||
| hpsa.h | ||
| hpsa_cmd.h | ||
| hptiop.c | ||
| hptiop.h | ||
| imm.c | ||
| imm.h | ||
| initio.c | ||
| initio.h | ||
| ipr.c | ||
| ipr.h | ||
| ips.c | ||
| ips.h | ||
| iscsi_boot_sysfs.c | ||
| iscsi_tcp.c | ||
| iscsi_tcp.h | ||
| jazz_esp.c | ||
| lasi700.c | ||
| libiscsi.c | ||
| libiscsi_tcp.c | ||
| mac53c94.c | ||
| mac53c94.h | ||
| mac_esp.c | ||
| mac_scsi.c | ||
| megaraid.c | ||
| megaraid.h | ||
| mesh.c | ||
| mesh.h | ||
| mvme16x_scsi.c | ||
| mvme147.c | ||
| mvme147.h | ||
| mvumi.c | ||
| mvumi.h | ||
| ncr53c8xx.c | ||
| ncr53c8xx.h | ||
| nsp32.c | ||
| nsp32.h | ||
| nsp32_debug.c | ||
| nsp32_io.h | ||
| osst.c | ||
| osst.h | ||
| osst_detect.h | ||
| osst_options.h | ||
| pmcraid.c | ||
| pmcraid.h | ||
| ppa.c | ||
| ppa.h | ||
| ps3rom.c | ||
| qla1280.c | ||
| qla1280.h | ||
| qlogicfas.c | ||
| qlogicfas408.c | ||
| qlogicfas408.h | ||
| qlogicpti.c | ||
| qlogicpti.h | ||
| raid_class.c | ||
| script_asm.pl | ||
| scsi.c | ||
| scsi.h | ||
| scsi_common.c | ||
| scsi_debug.c | ||
| scsi_debugfs.c | ||
| scsi_debugfs.h | ||
| scsi_devinfo.c | ||
| scsi_dh.c | ||
| scsi_error.c | ||
| scsi_ioctl.c | ||
| scsi_lib.c | ||
| scsi_lib_dma.c | ||
| scsi_logging.c | ||
| scsi_logging.h | ||
| scsi_module.c | ||
| scsi_netlink.c | ||
| scsi_pm.c | ||
| scsi_priv.h | ||
| scsi_proc.c | ||
| scsi_sas_internal.h | ||
| scsi_scan.c | ||
| scsi_sysctl.c | ||
| scsi_sysfs.c | ||
| scsi_trace.c | ||
| scsi_transport_api.h | ||
| scsi_transport_fc.c | ||
| scsi_transport_iscsi.c | ||
| scsi_transport_sas.c | ||
| scsi_transport_spi.c | ||
| scsi_transport_srp.c | ||
| scsi_typedefs.h | ||
| scsicam.c | ||
| sd.c | ||
| sd.h | ||
| sd_dif.c | ||
| sd_zbc.c | ||
| sense_codes.h | ||
| ses.c | ||
| sg.c | ||
| sgiwd93.c | ||
| sim710.c | ||
| sni_53c710.c | ||
| sr.c | ||
| sr.h | ||
| sr_ioctl.c | ||
| sr_vendor.c | ||
| st.c | ||
| st.h | ||
| st_options.h | ||
| stex.c | ||
| storvsc_drv.c | ||
| sun3_scsi.c | ||
| sun3_scsi_vme.c | ||
| sun3x_esp.c | ||
| sun_esp.c | ||
| sym53c416.c | ||
| sym53c416.h | ||
| virtio_scsi.c | ||
| vmw_pvscsi.c | ||
| vmw_pvscsi.h | ||
| wd33c93.c | ||
| wd33c93.h | ||
| wd719x.c | ||
| wd719x.h | ||
| xen-scsifront.c | ||
| zalon.c | ||
| zorro7xx.c | ||