Prev: linux-next: manual merge of the wireless tree with the net tree
Next: [GIT] SPARC
From: Jens Axboe on 20 Jul 2010 22:20
On 07/20/2010 02:42 PM, Jeremy Fitzhardinge wrote:
> From: Jeremy Fitzhardinge <jeremy.fitzhardinge(a)citrix.com>
>
> Hi Jens,
>
> This series has various updates to blkfront, including:
> - support for dynamic device resizing
> - bugfixes for device hotplug
> - various races and bugs fixed
>
> It can be pulled from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git upstream/blkfront

They don't apply cleanly to the for-2.6.36 branch, it fails at patch 2:

patching file drivers/block/xen-blkfront.c
Hunk #1 succeeded at 105 (offset 1 line).
Hunk #2 succeeded at 143 (offset 1 line).
Hunk #9 FAILED at 1080.
Hunk #10 succeeded at 1106 with fuzz 1 (offset 5 lines).
1 out of 10 hunks FAILED -- saving rejects to file drivers/block/xen-blkfront.c.rej

--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jeremy Fitzhardinge on 21 Jul 2010 01:10
On 07/20/2010 07:12 PM, Jens Axboe wrote:
> On 07/20/2010 02:42 PM, Jeremy Fitzhardinge wrote:
>
>> From: Jeremy Fitzhardinge <jeremy.fitzhardinge(a)citrix.com>
>>
>> Hi Jens,
>>
>> This series has various updates to blkfront, including:
>> - support for dynamic device resizing
>> - bugfixes for device hotplug
>> - various races and bugs fixed
>>
>> It can be pulled from:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git upstream/blkfront
>>
> They don't apply cleanly to the for-2.6.36 branch, it fails at patch 2:
>

OK, I'll check it out.

Thanks,
J

> patching file drivers/block/xen-blkfront.c
> Hunk #1 succeeded at 105 (offset 1 line).
> Hunk #2 succeeded at 143 (offset 1 line).
> Hunk #9 FAILED at 1080.
> Hunk #10 succeeded at 1106 with fuzz 1 (offset 5 lines).
> 1 out of 10 hunks FAILED -- saving rejects to file drivers/block/xen-blkfront.c.rej
>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jeremy Fitzhardinge on 28 Jul 2010 20:30
On 07/20/2010 07:12 PM, Jens Axboe wrote:
> On 07/20/2010 02:42 PM, Jeremy Fitzhardinge wrote:
>> From: Jeremy Fitzhardinge<jeremy.fitzhardinge(a)citrix.com>
>>
>> Hi Jens,
>>
>> This series has various updates to blkfront, including:
>> - support for dynamic device resizing
>> - bugfixes for device hotplug
>> - various races and bugs fixed
>>
>> It can be pulled from:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git upstream/blkfront
> They don't apply cleanly to the for-2.6.36 branch, it fails at patch 2:
>
> patching file drivers/block/xen-blkfront.c
> Hunk #1 succeeded at 105 (offset 1 line).
> Hunk #2 succeeded at 143 (offset 1 line).
> Hunk #9 FAILED at 1080.
> Hunk #10 succeeded at 1106 with fuzz 1 (offset 5 lines).
> 1 out of 10 hunks FAILED -- saving rejects to file drivers/block/xen-blkfront.c.rej

Could you pull again? I've merged it into your branch (we don't need
any BKL locking), and added a couple of changes to fix some barrier
issues up.

Thanks,
J

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jeremy Fitzhardinge on 2 Aug 2010 13:50
On 07/28/2010 05:26 PM, Jeremy Fitzhardinge wrote:
> On 07/20/2010 07:12 PM, Jens Axboe wrote:
>> On 07/20/2010 02:42 PM, Jeremy Fitzhardinge wrote:
>>> From: Jeremy Fitzhardinge<jeremy.fitzhardinge(a)citrix.com>
>>>
>>> Hi Jens,
>>>
>>> This series has various updates to blkfront, including:
>>> - support for dynamic device resizing
>>> - bugfixes for device hotplug
>>> - various races and bugs fixed
>>>
>>> It can be pulled from:
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git
>>> upstream/blkfront
>> They don't apply cleanly to the for-2.6.36 branch, it fails at patch 2:
>>
>> patching file drivers/block/xen-blkfront.c
>> Hunk #1 succeeded at 105 (offset 1 line).
>> Hunk #2 succeeded at 143 (offset 1 line).
>> Hunk #9 FAILED at 1080.
>> Hunk #10 succeeded at 1106 with fuzz 1 (offset 5 lines).
>> 1 out of 10 hunks FAILED -- saving rejects to file
>> drivers/block/xen-blkfront.c.rej
>
> Could you pull again? I've merged it into your branch (we don't need
> any BKL locking), and added a couple of changes to fix some barrier
> issues up.

Ping?

J

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: manual merge of the wireless tree with the net tree
Next: [GIT] SPARC