Re: linux-next: Tree for Apr 9

[Sedat Dilek <sedat.dilek@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1903 bytes --]

On Tue, Apr 9, 2013 at 5:11 PM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
> On Tue, Apr 9, 2013 at 4:32 PM, Sedat Dilek <sedat.dilek@gmail.com> wrote:
>> On Tue, Apr 9, 2013 at 4:23 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> Hi Sedat,
>>>
>>> On Tue, 9 Apr 2013 16:11:50 +0200 Sedat Dilek <sedat.dilek@gmail.com> wrote:
>>>>
>>>> [ CC Al Viro ]
>>>
>>> You forgot to do that ...
>>>
>>>> Is there a "magic" git-command to revert all commits coming from your
>>>> latest vfs-merge (commit c1c04d3667608a630ae0821995b465a523e83fb1)?
>>>>
>>>> 2013-04-09 11:36 Stephen Rothwell   │ M─┐ │ │ │ │ │ │         │ 20130405/vfs
>>>
>>> You would normally do "git revert -m 1 c1c04d366760". However, that does
>>> not revert cleanly in today's linux-next (due to more patches modifying
>>> the files involved).
>>>
>>
>> Just wanted to improve my git Know-How.
>>
>>>> After reverting all these commits I would like to pull-in latest
>>>> vfs.git#for-next.
>>>
>>> It would probably be easier to wait for tomorrow's linux-next.  Or just
>>> test Al's tree in its own.
>>
>> Doug reported problems on his way "reverting the current vfs stuff"
>> and Al's new tree was reported as OK.
>> A lot of merge-conflicts... that's what I see when trying to pull in
>> Al's tree in today's Linux-Next.
>> So, I better wait for tommorrow.
>>
>> Anyway, a warning in your CHANGELOG is very much appreciated on such
>> KNOWN ISSUES.
>>
>
> vfs-next does break in KVM, cannot say this is due to vfs-related
> changes or other stuff.
> Build-log attached.

[ CC AL Viro (forgot again) ]

With attached patch vfs-next is OK for me.
Also known issue (see [1]) :-).

- Sedat -

[1] https://lkml.org/lkml/2013/4/7/229

> - Sedat -
>
>> Regards,
>> - Sedat -
>>
>>> --
>>> Cheers,
>>> Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: 0001-vfs-Revert-kvm-changes-in-constify-a-bunch-of-struct.patch --]
[-- Type: application/octet-stream, Size: 1466 bytes --]

From b2c9e526d7f3adf6fdec5f655b122e7a5933f42d Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@gmail.com>
Date: Tue, 9 Apr 2013 17:36:21 +0200
Subject: [PATCH] vfs: Revert kvm changes in "constify a bunch of struct
 file_operations instances"

See commit 9df102be31af82bf1edfc88fc6b0a69464227b71 in vfs.git#for-next.

Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
 virt/kvm/kvm_main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 77bbbf1..adc68fe 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1854,7 +1854,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
 	return 0;
 }
 
-static const struct file_operations kvm_vcpu_fops = {
+static struct file_operations kvm_vcpu_fops = {
 	.release        = kvm_vcpu_release,
 	.unlocked_ioctl = kvm_vcpu_ioctl,
 #ifdef CONFIG_COMPAT
@@ -2375,7 +2375,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
 	return 0;
 }
 
-static const struct file_operations kvm_vm_fops = {
+static struct file_operations kvm_vm_fops = {
 	.release        = kvm_vm_release,
 	.unlocked_ioctl = kvm_vm_ioctl,
 #ifdef CONFIG_COMPAT
@@ -2473,7 +2473,7 @@ out:
 	return r;
 }
 
-static const struct file_operations kvm_chardev_ops = {
+static struct file_operations kvm_chardev_ops = {
 	.unlocked_ioctl = kvm_dev_ioctl,
 	.compat_ioctl   = kvm_dev_ioctl,
 	.llseek		= noop_llseek,
-- 
1.8.2