Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve.
Showing the changes to include/uapi (2 of 348 files). Show all
Unified · Split
| @@ -60,7 +60,7 @@ struct virtio_blk_config { · 59 unmodified lines | |||
| 60 | __u32 size_max; | 60 | __u32 size_max; |
| 61 | /* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */ | 61 | /* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */ |
| 62 | __u32 seg_max; | 62 | __u32 seg_max; |
| 63 | /* geometry the device (if VIRTIO_BLK_F_GEOMETRY) */ | 63 | /* geometry of the device (if VIRTIO_BLK_F_GEOMETRY) */ |
| 64 | struct virtio_blk_geometry { | 64 | struct virtio_blk_geometry { |
| 65 | __u16 cylinders; | 65 | __u16 cylinders; |
| 66 | __u8 heads; | 66 | __u8 heads; |
| @@ -119,7 +119,11 @@ struct virtio_blk_config { · 52 unmodified lines | |||
| 119 | #define VIRTIO_BLK_T_BARRIER 0x80000000 | 119 | #define VIRTIO_BLK_T_BARRIER 0x80000000 |
| 120 | #endif /* !VIRTIO_BLK_NO_LEGACY */ | 120 | #endif /* !VIRTIO_BLK_NO_LEGACY */ |
| 121 | 121 | ||
| 122 | /* This is the first element of the read scatter-gather list. */ | 122 | /* |
| 123 | * This comes first in the read scatter-gather list. | ||
| 124 | * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, | ||
| 125 | * this is the first element of the read scatter-gather list. | ||
| 126 | */ | ||
| 123 | struct virtio_blk_outhdr { | 127 | struct virtio_blk_outhdr { |
| 124 | /* VIRTIO_BLK_T* */ | 128 | /* VIRTIO_BLK_T* */ |
| 125 | __virtio32 type; | 129 | __virtio32 type; |
| @@ -29,8 +29,16 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include <linux/virtio_types.h> | 30 | #include <linux/virtio_types.h> |
| 31 | 31 | ||
| 32 | #define VIRTIO_SCSI_CDB_SIZE 32 | 32 | /* Default values of the CDB and sense data size configuration fields */ |
| 33 | #define VIRTIO_SCSI_SENSE_SIZE 96 | 33 | #define VIRTIO_SCSI_CDB_DEFAULT_SIZE 32 |
| 34 | #define VIRTIO_SCSI_SENSE_DEFAULT_SIZE 96 | ||
| 35 | |||
| 36 | #ifndef VIRTIO_SCSI_CDB_SIZE | ||
| 37 | #define VIRTIO_SCSI_CDB_SIZE VIRTIO_SCSI_CDB_DEFAULT_SIZE | ||
| 38 | #endif | ||
| 39 | #ifndef VIRTIO_SCSI_SENSE_SIZE | ||
| 40 | #define VIRTIO_SCSI_SENSE_SIZE VIRTIO_SCSI_SENSE_DEFAULT_SIZE | ||
| 41 | #endif | ||
| 34 | 42 | ||
| 35 | /* SCSI command request, followed by data-out */ | 43 | /* SCSI command request, followed by data-out */ |
| 36 | struct virtio_scsi_cmd_req { | 44 | struct virtio_scsi_cmd_req { |