continue;
}
- fputs(words ? "<<<---" : "<<<<<<<\n", out);
+ fputs(words ? "<<<---" : "<<<<<<< found\n", out);
for (cm = m; cm->in_conflict; cm++) {
if (cm->type == Conflict)
found_conflict = 1;
printrange(out, a, cm->a+st1, cm->al-st1);
st1 = 0;
}
- fputs(words ? "|||" : "|||||||\n", out);
+ fputs(words ? "|||" : "||||||| expected\n", out);
st1 = st;
for (cm = m; cm->in_conflict; cm++) {
if (cm->in_conflict == 1 && cm != m) {
* but full conflict display was requested.
* So now print out the wiggled result as well.
*/
- fputs(words ? "&&&" : "&&&&&&&\n", out);
+ fputs(words ? "&&&" : "&&&&&&& resolution\n", out);
st1 = st;
for (cm = m; cm->in_conflict; cm++) {
int last = 0;
st1 = 0;
}
}
- fputs(words ? "--->>>" : ">>>>>>>\n", out);
+ fputs(words ? "--->>>" : ">>>>>>> replacement\n", out);
m = cm;
if (m->in_conflict == 1 && m[1].in_conflict == 0) {
/* End of a conflict, no conflict follows */
-<<<<<<<
-|||||||
+<<<<<<< found
+||||||| expected
#define IDMAP_STATUS_LOOKUPFAIL IDMAP_STATUS_FAIL
/* XXX get (include) from bits/utmp.h */
#define IDMAP_NAMESZ 128
->>>>>>>
+>>>>>>> replacement
{
struct super_operations *op = inode->i_sb->s_op;
-<<<<<<<
+<<<<<<< found
hlist_del_init(&inode->i_hash);
-|||||||
+||||||| expected
list_del_init(&inode->i_hash);
=======
->>>>>>>
+>>>>>>> replacement
list_del_init(&inode->i_list);
inode->i_state|=I_FREEING;
inodes_stat.nr_inodes--;
{
struct super_operations *op = inode->i_sb->s_op;
-<<<<<<<
+<<<<<<< found
hlist_del_init(&inode->i_hash);
-|||||||
+||||||| expected
list_del_init(&inode->i_hash);
=======
->>>>>>>
+>>>>>>> replacement
list_del_init(&inode->i_list);
inode->i_state|=I_FREEING;
inodes_stat.nr_inodes--;
{
struct super_operations *op = inode->i_sb->s_op;
-<<<<<<<
+<<<<<<< found
hlist_del_init(&inode->i_hash);
-|||||||
+||||||| expected
list_del_init(&inode->i_hash);
=======
->>>>>>>
+>>>>>>> replacement
list_del_init(&inode->i_list);
inode->i_state|=I_FREEING;
inodes_stat.nr_inodes--;
return (void __iomem *) (unsigned long) (port + PIO_OFFSET);
}
-<<<<<<<
+<<<<<<< found
void ioport_unmap(void __iomem *addr)
{
/* Nothing to do */
}
-|||||||
+||||||| expected
#ifdef CONFIG_PCI
/**
* pci_iomap - create a virtual mapping cookie for a PCI BAR
* @maxlen: max length of the memory to map
*
* Using this function you will get a __iomem address to your device BAR.
->>>>>>>
+>>>>>>> replacement
EXPORT_SYMBOL(ioport_map);
EXPORT_SYMBOL(ioport_unmap);
#endif /* CONFIG_HAS_IOPORT */
#ifdef CONFIG_PCI
/* Hide the details if this is a MMIO or PIO address space and just do what
-<<<<<<<
- * you expect in the correct way. */|||||||
+<<<<<<< found
+ * you expect in the correct way. */||||||| expected
* you expect from them in the correct way.
*
* @maxlen specifies the maximum length to map. If you want to get access to
return ioremap(start, len);
return ioremap_nocache(start, len);
}
->>>>>>>
+>>>>>>> replacement
/**
* pci_iomap - create a virtual mapping cookie for a PCI BAR
}
goto done_unlock;
-<<<<<<<
+<<<<<<< found
err = autostart_array((kdev_t)arg);
if (err) {
printk(KERN_WARNING "md: autostart %s failed!\n",
partition_name((kdev_t)arg));
-|||||||
+||||||| expected
err = autostart_array(val_to_kdev(arg));
if (err) {
printk(KERN_WARNING "md: autostart %s failed!\n",
partition_name(val_to_kdev(arg)));
=======
->>>>>>>
+>>>>>>> replacement
default:;
}
while (sem_getcount(&mddev->recovery_sem) != 1)
schedule();
-<<<<<<<
+<<<<<<< found
del_mddev_mapping(mddev, MKDEV(MD_MAJOR, mdidx(mddev)));
-|||||||
+||||||| expected
del_mddev_mapping(mddev, mk_kdev(MD_MAJOR, mdidx(mddev)));
=======
mddev_map[mdidx(mddev)] = NULL;
->>>>>>>
+>>>>>>> replacement
md_list_del(&mddev->all_mddevs);
kfree(mddev);
MOD_DEC_USE_COUNT;
MD_EXPORT_SYMBOL(md_print_devices);
MD_EXPORT_SYMBOL(find_rdev_nr);
MD_EXPORT_SYMBOL(md_interrupt_thread);
-<<<<<<<
+<<<<<<< found
MD_EXPORT_SYMBOL(mddev_map);
-|||||||
+||||||| expected
EXPORT_SYMBOL(mddev_map);
=======
->>>>>>>
+>>>>>>> replacement
MODULE_LICENSE("GPL");
while (sem_getcount(&mddev->recovery_sem) != 1)
schedule();
-<<<<<<<
+<<<<<<< found
del_mddev_mapping(mddev, MKDEV(MD_MAJOR, mdidx(mddev)));
-|||||||
+||||||| expected
del_mddev_mapping(mddev, mk_kdev(MD_MAJOR, mdidx(mddev)));
=======
mddev_map[mdidx(mddev)] = NULL;
->>>>>>>
+>>>>>>> replacement
md_list_del(&mddev->all_mddevs);
kfree(mddev);
MOD_DEC_USE_COUNT;
MD_EXPORT_SYMBOL(md_print_devices);
MD_EXPORT_SYMBOL(find_rdev_nr);
MD_EXPORT_SYMBOL(md_interrupt_thread);
-<<<<<<<
+<<<<<<< found
MD_EXPORT_SYMBOL(mddev_map);
-|||||||
+||||||| expected
EXPORT_SYMBOL(mddev_map);
=======
->>>>>>>
+>>>>>>> replacement
MODULE_LICENSE("GPL");
* Deactivate a spare disk:
*/
case DISKOP_SPARE_INACTIVE:
-<<<<<<<
+<<<<<<< found
if (conf->start_future > 0) {
MD_BUG();
err = -EBUSY;
break;
}
-|||||||
+||||||| expected
close_sync(conf);
=======
->>>>>>>
+>>>>>>> replacement
sdisk = conf->mirrors + spare_disk;
sdisk->operational = 0;
sdisk->write_only = 0;
* property)
*/
case DISKOP_SPARE_ACTIVE:
-<<<<<<<
+<<<<<<< found
if (conf->start_future > 0) {
MD_BUG();
err = -EBUSY;
break;
}
-|||||||
+||||||| expected
close_sync(conf);
=======
->>>>>>>
+>>>>>>> replacement
sdisk = conf->mirrors + spare_disk;
fdisk = conf->mirrors + failed_disk;
}
abort:
md_spin_unlock_irq(&conf->device_lock);
-<<<<<<<
+<<<<<<< found
if (state == DISKOP_SPARE_ACTIVE || state == DISKOP_SPARE_INACTIVE)
/* should move to "END_REBUILD" when such exists */
raid1_shrink_buffers(conf);
print_raid1_conf(conf);
-|||||||
+||||||| expected
if (state == DISKOP_SPARE_ACTIVE || state == DISKOP_SPARE_INACTIVE) {
mempool_destroy(conf->r1buf_pool);
conf->r1buf_pool = NULL;
=======
print_conf(conf);
->>>>>>>
+>>>>>>> replacement
return err;
}
#undef IO_ERROR
#undef REDIRECT_SECTOR
-<<<<<<<
+<<<<<<< found
static void raid1syncd (void *data)
{
raid1_conf_t *conf = data;
-|||||||
+||||||| expected
static void raid1syncd(void *data)
{
conf_t *conf = data;
=======
->>>>>>>
+>>>>>>> replacement
/*
* perform a "sync" on one "block"
return (bsize >> 9);
nomem:
-<<<<<<<
+<<<<<<< found
raid1_shrink_buffers(conf);
return -ENOMEM;
}
static void end_sync_read(struct buffer_head *bh, int uptodate)
-|||||||
+||||||| expected
if (!sector_nr)
if (init_resync(conf))
return -ENOMEM;
/*
* If there is non-resync activity waiting for us then
* put in a delay to throttle resync.
->>>>>>>
+>>>>>>> replacement
{
struct raid1_bh * r1_bh = (struct raid1_bh *)(bh->b_private);
md_error (r1_bh->mddev, bh->b_dev);
if (atomic_dec_and_test(&r1_bh->remaining)) {
mddev_t *mddev = r1_bh->mddev;
-<<<<<<<
+<<<<<<< found
unsigned long sect = bh->b_blocknr;
int size = bh->b_size;
raid1_free_buf(r1_bh);
sync_request_done(sect, mddev_to_conf(mddev));
md_done_sync(mddev,size>>9, uptodate);
-|||||||
+||||||| expected
r1_bio->sector = sector_nr;
r1_bio->cmd = SPECIAL;
r1_bio->sector = sector_nr;
r1_bio->cmd = SPECIAL;
->>>>>>>
+>>>>>>> replacement
}
}
}
}
-<<<<<<<
+<<<<<<< found
if (!start_recovery && !(sb->state & (1 << MD_SB_CLEAN)) &&
(conf->working_disks > 1)) {
const char * name = "raid1syncd";
conf->resync_thread = md_register_thread(raid1syncd, conf,name);
-|||||||
+||||||| expected
if (!start_recovery && !(sb->state & (1 << MD_SB_CLEAN)) &&
(conf->working_disks > 1)) {
const char * name = "raid1syncd";
conf->resync_thread = md_register_thread(raid1syncd, conf, name);
=======
->>>>>>>
+>>>>>>> replacement
/*
* Regenerate the "device is in sync with the raid set" bit for
#undef NONE_OPERATIONAL
#undef ARRAY_IS_ACTIVE
-<<<<<<<
+<<<<<<< found
static int raid1_stop_resync (mddev_t *mddev)
{
raid1_conf_t *conf = mddev_to_conf(mddev);
static int raid1_restart_resync (mddev_t *mddev)
{
raid1_conf_t *conf = mddev_to_conf(mddev);
-|||||||
+||||||| expected
static int stop_resync(mddev_t *mddev)
{
conf_t *conf = mddev_to_conf(mddev);
{
conf_t *conf = mddev_to_conf(mddev);
=======
->>>>>>>
+>>>>>>> replacement
static int raid1_stop (mddev_t *mddev)
{
raid1_conf_t *conf = mddev_to_conf(mddev);
status: raid1_status,
error_handler: raid1_error,
diskop: raid1_diskop,
-<<<<<<<
+<<<<<<< found
stop_resync: raid1_stop_resync,
restart_resync: raid1_restart_resync,
-|||||||
+||||||| expected
stop_resync: stop_resync,
restart_resync: restart_resync,
=======
->>>>>>>
+>>>>>>> replacement
sync_request: raid1_sync_request
};
int i, targets = 0, disks;
struct bitmap *bitmap;
unsigned long flags;
-<<<<<<<
-|||||||
+<<<<<<< found
+||||||| expected
struct bio_list bl;
struct page **behind_pages = NULL;
=======
struct bio_list bl;
int bl_count;
struct page **behind_pages = NULL;
->>>>>>>
+>>>>>>> replacement
const int rw = bio_data_dir(bio);
const unsigned long do_sync = (bio->bi_rw & REQ_SYNC);
const unsigned long do_flush_fua = (bio->bi_rw & (REQ_FLUSH | REQ_FUA));
bvec->bv_page = r1_bio->behind_pages[j];
if (test_bit(WriteMostly, &conf->mirrors[i].rdev->flags))
atomic_inc(&r1_bio->behind_remaining);
-<<<<<<<
+<<<<<<< found
}
-|||||||
+||||||| expected
bio_list_add(&bl, mbio);
}
kfree(behind_pages); /* the behind pages are attached to the bios now */
}
kfree(behind_pages); /* the behind pages are attached to the bios now */
->>>>>>>
+>>>>>>> replacement
atomic_inc(&r1_bio->remaining);
-<<<<<<<
+<<<<<<< found
spin_lock_irqsave(&conf->device_lock, flags);
bio_list_add(&conf->pending_bio_list, mbio);
spin_unlock_irqrestore(&conf->device_lock, flags);
}
r1_bio_write_done(r1_bio);
-|||||||
+||||||| expected
spin_lock_irqsave(&conf->device_lock, flags);
bio_list_merge(&conf->pending_bio_list, &bl);
bio_list_init(&bl);
bio_list_init(&bl);
blk_plug_device(mddev->queue);
->>>>>>>
+>>>>>>> replacement
/* In case raid1d snuck in to freeze_array */
wake_up(&conf->wait_barrier);
init_waitqueue_head(&conf->wait_barrier);
bio_list_init(&conf->pending_bio_list);
-<<<<<<<
+<<<<<<< found
conf->last_used = -1;
for (i = 0; i < conf->raid_disks; i++) {
-|||||||
+||||||| expected
bio_list_init(&conf->flushing_bio_list);
bio_list_init(&conf->flushing_bio_list);
->>>>>>>
+>>>>>>> replacement
disk = conf->mirrors + i;
mbio->bi_rw = WRITE | do_sync | do_fua;
mbio->bi_private = r10_bio;
-<<<<<<<
+<<<<<<< found
atomic_inc(&r10_bio->remaining);
spin_lock_irqsave(&conf->device_lock, flags);
-|||||||
+||||||| expected
atomic_inc(&r10_bio->remaining);
cb = blk_check_plugged(raid10_unplug, mddev, sizeof(*plug));
else
plug = NULL;
spin_lock_irqsave(&conf->device_lock, flags);
->>>>>>>
-<<<<<<<
+>>>>>>> replacement
+<<<<<<< found
bio_list_add(&conf->pending_bio_list, mbio);
conf->pending_count++;
spin_unlock_irqrestore(&conf->device_lock, flags);
-|||||||
+||||||| expected
if (plug) {
bio_list_add(&plug->pending, mbio);
plug->pending_cnt++;
conf->pending_count++;
}
spin_unlock_irqrestore(&conf->device_lock, flags);
->>>>>>>
+>>>>>>> replacement
if (!mddev_check_plugged(mddev))
md_wakeup_thread(mddev->thread);
}
for (i=0; i<num; i++) {
struct page *page;
-<<<<<<<
+<<<<<<< found
if (!bh)
return 1;
memset(bh, 0, sizeof (struct buffer_head));
if ((page = alloc_page(priority)))
bh->b_data = page_address(page);
else {
-|||||||
+||||||| expected
if (!bh)
return 1;
memset(bh, 0, sizeof (struct buffer_head));
else {
=======
if (!(page = alloc_page(GFP_KERNEL))) {
->>>>>>>
+>>>>>>> replacement
return 1;
}
sh->dev[i].page = page;
test_bit(R5_LOCKED, &dev->flags));
BUG();
}
-<<<<<<<
+<<<<<<< found
clear_bit(BH_Uptodate, &sh->bh_cache[i]->b_state);
-|||||||
+||||||| expected
clear_buffer_uptodate(sh->bh_cache[i]);
=======
dev->flags = 0;
->>>>>>>
+>>>>>>> replacement
raid5_build_block(sh, i);
}
insert_hash(conf, sh);
#else
set_bit(R5_UPTODATE, &sh->dev[i].flags);
#endif
-<<<<<<<
+<<<<<<< found
} else {
md_error(conf->mddev, bh->b_dev);
clear_bit(BH_Uptodate, &bh->b_state);
-|||||||
+||||||| expected
} else {
md_error(conf->mddev, bh->b_bdev);
clear_buffer_uptodate(bh);
} else {
md_error(conf->mddev, bi->bi_bdev);
clear_bit(R5_UPTODATE, &sh->dev[i].flags);
->>>>>>>
+>>>>>>> replacement
}
#if 0
/* must restore b_page before unlocking buffer... */
clear_bit(BH_Uptodate, &bh->b_state);
}
#endif
-<<<<<<<
+<<<<<<< found
clear_bit(BH_Lock, &bh->b_state);
-|||||||
+||||||| expected
clear_buffer_locked(bh);
=======
clear_bit(R5_LOCKED, &sh->dev[i].flags);
->>>>>>>
+>>>>>>> replacement
set_bit(STRIPE_HANDLE, &sh->state);
release_stripe(sh);
}
spin_lock_irqsave(&conf->device_lock, flags);
if (!uptodate)
-<<<<<<<
+<<<<<<< found
md_error(conf->mddev, bh->b_dev);
clear_bit(BH_Lock, &bh->b_state);
-|||||||
+||||||| expected
md_error(conf->mddev, bh->b_bdev);
clear_buffer_locked(bh);
=======
md_error(conf->mddev, bi->bi_bdev);
clear_bit(R5_LOCKED, &sh->dev[i].flags);
->>>>>>>
+>>>>>>> replacement
set_bit(STRIPE_HANDLE, &sh->state);
__release_stripe(conf, sh);
spin_unlock_irqrestore(&conf->device_lock, flags);
dev->vec.bv_len = STRIPE_SIZE;
dev->vec.bv_offset = 0;
-<<<<<<<
+<<<<<<< found
bh->b_dev = conf->disks[i].dev;
-|||||||
+||||||| expected
bh->b_dev = conf->disks[i].dev;
/* FIXME - later we will need bdev here */
=======
dev->req.bi_bdev = conf->disks[i].bdev;
dev->req.bi_sector = sh->sector;
->>>>>>>
+>>>>>>> replacement
dev->req.bi_private = sh;
dev->flags = 0;
if (i != sh->pd_idx)
-<<<<<<<
+<<<<<<< found
bh->b_size = sh->size;
bh->b_list = BUF_LOCKED;
return bh;
-|||||||
+||||||| expected
bh->b_size = sh->size;
return bh;
=======
dev->sector = compute_blocknr(sh, i);
->>>>>>>
+>>>>>>> replacement
}
static int error (mddev_t *mddev, kdev_t dev)
check_xor();
}
if (count != 1)
-<<<<<<<
+<<<<<<< found
xor_block(count, bh_ptr);
set_bit(BH_Uptodate, &sh->bh_cache[dd_idx]->b_state);
-|||||||
+||||||| expected
xor_block(count, bh_ptr);
set_buffer_uptodate(sh->bh_cache[dd_idx]);
=======
xor_block(count, STRIPE_SIZE, ptr);
set_bit(R5_UPTODATE, &sh->dev[i].flags);
->>>>>>>
+>>>>>>> replacement
}
static void compute_parity(struct stripe_head *sh, int method)
sector_t sector = sh->dev[i].sector;
copy_data(1, chosen[i], sh->dev[i].page, sector);
-<<<<<<<
+<<<<<<< found
memcpy(bh->b_data,
bdata,sh->size);
bh_kunmap(chosen[i]);
set_bit(BH_Lock, &bh->b_state);
mark_buffer_uptodate(bh, 1);
-|||||||
+||||||| expected
memcpy(bh->b_data,
bdata,sh->size);
bh_kunmap(chosen[i]);
=======
set_bit(R5_LOCKED, &sh->dev[i].flags);
set_bit(R5_UPTODATE, &sh->dev[i].flags);
->>>>>>>
+>>>>>>> replacement
}
switch(method) {
xor_block(count, STRIPE_SIZE, ptr);
if (method != CHECK_PARITY) {
-<<<<<<<
+<<<<<<< found
mark_buffer_uptodate(sh->bh_cache[pd_idx], 1);
set_bit(BH_Lock, &sh->bh_cache[pd_idx]->b_state);
} else
mark_buffer_uptodate(sh->bh_cache[pd_idx], 0);
-|||||||
+||||||| expected
set_buffer_uptodate(sh->bh_cache[pd_idx]);
set_buffer_locked(sh->bh_cache[pd_idx]);
} else
set_bit(R5_LOCKED, &sh->dev[pd_idx].flags);
} else
clear_bit(R5_UPTODATE, &sh->dev[pd_idx].flags);
->>>>>>>
+>>>>>>> replacement
}
/*
compute_block(sh, i);
uptodate++;
} else if (conf->disks[i].operational) {
-<<<<<<<
+<<<<<<< found
set_bit(BH_Lock, &bh->b_state);
action[i] = READ+1;
-|||||||
+||||||| expected
set_buffer_locked(bh);
action[i] = READ+1;
=======
set_bit(R5_LOCKED, &dev->flags);
action[i] = READ+1;
#if 0
->>>>>>>
+>>>>>>> replacement
/* if I am just reading this block and we don't have
a failed drive, or any pending writes then sidestep the cache */
if (sh->bh_read[i] && !sh->bh_read[i]->b_reqnext &&
if (test_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
{
PRINTK("Read_old block %d for r-m-w\n", i);
-<<<<<<<
+<<<<<<< found
set_bit(BH_Lock, &bh->b_state);
-|||||||
+||||||| expected
set_buffer_locked(bh);
=======
set_bit(R5_LOCKED, &dev->flags);
->>>>>>>
+>>>>>>> replacement
action[i] = READ+1;
locked++;
} else {
if (test_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
{
PRINTK("Read_old block %d for Reconstruct\n", i);
-<<<<<<<
+<<<<<<< found
set_bit(BH_Lock, &bh->b_state);
-|||||||
+||||||| expected
set_buffer_locked(bh);
=======
set_bit(R5_LOCKED, &dev->flags);
->>>>>>>
+>>>>>>> replacement
action[i] = READ+1;
locked++;
} else {
}
if (uptodate != disks)
BUG();
-<<<<<<<
+<<<<<<< found
bh = sh->bh_cache[failed_num];
set_bit(BH_Lock, &bh->b_state);
-|||||||
+||||||| expected
bh = sh->bh_cache[failed_num];
set_buffer_locked(bh);
=======
dev = &sh->dev[failed_num];
set_bit(R5_LOCKED, &dev->flags);
->>>>>>>
+>>>>>>> replacement
action[failed_num] = WRITE+1;
locked++;
set_bit(STRIPE_INSYNC, &sh->state);
generic_make_request(bi);
} else {
PRINTK("skip op %d on disc %d for sector %ld\n", action[i]-1, i, sh->sector);
-<<<<<<<
+<<<<<<< found
clear_bit(BH_Lock, &bh->b_state);
-|||||||
+||||||| expected
clear_buffer_locked(bh);
=======
clear_bit(R5_LOCKED, &dev->flags);
->>>>>>>
+>>>>>>> replacement
set_bit(STRIPE_HANDLE, &sh->state);
}
}
handle_stripe(sh);
release_stripe(sh);
}
-<<<<<<<
+<<<<<<< found
} else
bh->b_end_io(bh, test_bit(BH_Uptodate, &bh->b_state));
-|||||||
+||||||| expected
} else
bh->b_end_io(bh, buffer_uptodate(bh));
=======
if (--bi->bi_phys_segments == 0)
bi->bi_end_io(bi);
spin_unlock_irq(&conf->device_lock);
->>>>>>>
+>>>>>>> replacement
return 0;
}
-<<<<<<<
+<<<<<<< found
/*
* Determine correct block size for this device.
*/
return correct_size;
}
-|||||||
+||||||| expected
=======
/* FIXME go_faster isn't used */
->>>>>>>
+>>>>>>> replacement
static int sync_request (mddev_t *mddev, sector_t sector_nr, int go_faster)
{
raid5_conf_t *conf = (raid5_conf_t *) mddev->private;
dev->vec.bv_len = STRIPE_SIZE;
dev->vec.bv_offset = 0;
-<<<<<<<
+<<<<<<< found
bh->b_dev = conf->disks[i].dev;
-|||||||
+||||||| expected
bh->b_dev = conf->disks[i].dev;
/* FIXME - later we will need bdev here */
=======
dev->req.bi_bdev = conf->disks[i].bdev;
dev->req.bi_sector = sh->sector;
->>>>>>>
+>>>>>>> replacement
dev->req.bi_private = sh;
dev->flags = 0;
if (i != sh->pd_idx)
-<<<<<<<
+<<<<<<< found
bh->b_size = sh->size;
bh->b_list = BUF_LOCKED;
return bh;
-|||||||
+||||||| expected
bh->b_size = sh->size;
return bh;
=======
dev->sector = compute_blocknr(sh, i);
->>>>>>>
+>>>>>>> replacement
}
clear_bit(BH_Uptodate, &sh->bh_cache[i]->b_state);
-<<<<<<<
-|||||||
+<<<<<<< found
+||||||| expected
clear_buffer_uptodate(sh->bh_cache[i]);
=======
dev->flags = 0;
->>>>>>>
+>>>>>>> replacement
-<<<<<<<
+<<<<<<< found
clear_bit(BH_Uptodate, &sh->bh_cache[i]->b_state);
-|||||||
+||||||| expected
clear_buffer_uptodate(sh->bh_cache[i]);
=======
dev->flags = 0;
->>>>>>>
+>>>>>>> replacement
sk->write_space = svc_write_space;
svsk->sk_reclen = 0;
-<<<<<<<
+<<<<<<< found
svsk->sk_tcplen = 0;
/* initialise setting must have enough space to
* receive and respond to one request.
* svc_tcp_recvfrom will re-adjust if necessary
-|||||||
+||||||| expected
svsk->sk_tcplen = 0;
/* initialise setting must have enough space to
/* initialise setting must have enough space to
* receive and respond to one request.
* svc_tcp_recvfrom will re-adjust if necessary
->>>>>>>
+>>>>>>> replacement
*/
svc_sock_setbufsize(svsk->sk_sock,
3 * svsk->sk_server->sv_bufsz,
-<<<<<<<
+<<<<<<< found
1
2
3
8
9
0
-|||||||
+||||||| expected
a
b
c
H
I
J
->>>>>>>
+>>>>>>> replacement
-<<<<<<<
+<<<<<<< found
1
2
3
8
9
0
-|||||||
+||||||| expected
a
b
c
H
I
J
->>>>>>>
+>>>>>>> replacement
-<<<<<<<
+<<<<<<< found
1
2
3
8
9
0
-|||||||
+||||||| expected
a
b
c
H
I
J
->>>>>>>
+>>>>>>> replacement
yes
-<<<<<<<
+<<<<<<< found
1
2
3
8
9
0
-|||||||
+||||||| expected
a
b
c
H
I
J
->>>>>>>
+>>>>>>> replacement
yes
this is a file
with the word
-<<<<<<<
+<<<<<<< found
two which is
-|||||||
+||||||| expected
to which is
=======
too which is
->>>>>>>
+>>>>>>> replacement
misspelt
this is a file
with the word
-<<<<<<<
+<<<<<<< found
two which is
-|||||||
+||||||| expected
to which is
=======
too which was
->>>>>>>
+>>>>>>> replacement
misspelt
this is a file
with the word
-<<<<<<<
+<<<<<<< found
two which is
-|||||||
+||||||| expected
to which is
=======
too which was
->>>>>>>
+>>>>>>> replacement
misspelt
version
of
the
-<<<<<<<
+<<<<<<< found
file.
-|||||||
+||||||| expected
file
=======
file that has changed
->>>>>>>
+>>>>>>> replacement
version
of
the
-<<<<<<<
+<<<<<<< found
file.
-|||||||
+||||||| expected
file
=======
file that has changed
->>>>>>>
+>>>>>>> replacement
-<<<<<<<
+<<<<<<< found
This is one line of the file
-|||||||
+||||||| expected
This is 1 line of the file
=======
This is 1 line of the document
-&&&&&&&
+&&&&&&& resolution
This is one line of the document
->>>>>>>
+>>>>>>> replacement
I think this is another line
Openning line
-<<<<<<<
+<<<<<<< found
content line with content
-|||||||
+||||||| expected
content line content
=======
middle line content
-&&&&&&&
+&&&&&&& resolution
middle line with content
->>>>>>>
+>>>>>>> replacement
closing line
that should not cause an extra wiggle
-<<<<<<<
+<<<<<<< found
Here is a line
-|||||||
+||||||| expected
Here was a line
=======
Here will be a line
->>>>>>>
+>>>>>>> replacement
There is nothing else.
-<<<<<<<
+<<<<<<< found
c
-|||||||
+||||||| expected
a
=======
b
->>>>>>>
+>>>>>>> replacement
git / wiggle.git / commitdiff