Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1528109 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-11-23 04:50 +0100 |
| Last post | 2016-11-23 11:20 +0100 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the kvms390 tree with the s390 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-23 04:50 +0100
Re: linux-next: manual merge of the kvms390 tree with the s390 tree Christian Borntraeger <borntraeger@de.ibm.com> - 2016-11-23 09:30 +0100
Re: linux-next: manual merge of the kvms390 tree with the s390 tree Heiko Carstens <heiko.carstens@de.ibm.com> - 2016-11-23 11:20 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-11-23 04:50 +0100 |
| Subject | linux-next: manual merge of the kvms390 tree with the s390 tree |
| Message-ID | <sGwJj-7UI-3@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
arch/s390/include/asm/facilities_src.h
between commit:
d1f7e8f85b51 ("s390: squash facilities_src.h into gen_facilities.c")
from the s390 tree and commits:
09ff894457e9 ("KVM: s390: gaccess: add ESOP2 handling")
88abf0b54f51 ("KVM: s390: instruction-execution-protection support")
from the kvms390 tree.
I fixed it up (I deleted the file and then added the following merge fix
patch) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 23 Nov 2016 14:41:34 +1100
Subject: [PATCH] KVM: s390: merge fix for squashing of facilities_src.h into
gen_facilities.c
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/tools/gen_facilities.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
index 8cc53b1e6d03..0cf802de52a1 100644
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_facilities.c
@@ -80,6 +80,8 @@ static struct facility_def facility_defs[] = {
76, /* msa extension 3 */
77, /* msa extension 4 */
78, /* enhanced-DAT 2 */
+ 130, /* instruction-execution-protection */
+ 131, /* enhanced-SOP 2 and side-effect */
-1 /* END */
}
},
--
2.10.2
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Christian Borntraeger <borntraeger@de.ibm.com> |
|---|---|
| Date | 2016-11-23 09:30 +0100 |
| Message-ID | <sGB6h-2rD-7@gated-at.bofh.it> |
| In reply to | #1528109 |
On 11/23/2016 04:45 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> arch/s390/include/asm/facilities_src.h
>
> between commit:
>
> d1f7e8f85b51 ("s390: squash facilities_src.h into gen_facilities.c")
>
> from the s390 tree and commits:
>
> 09ff894457e9 ("KVM: s390: gaccess: add ESOP2 handling")
> 88abf0b54f51 ("KVM: s390: instruction-execution-protection support")
>
> from the kvms390 tree.
>
> I fixed it up (I deleted the file and then added the following merge fix
> patch) and can carry the fix as necessary. This is now fixed as far as
> linux-next is concerned, but any non trivial conflicts should be mentioned
> to your upstream maintainer when your tree is submitted for merging.
> You may also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.
Thanks, looks fine.
Hmmm, Martin, Heiko, KVM is going to touch that file from time to time.
Can we either have
a: a topic branch for this tool (like I did for the 4.9 merge window)
with just the patches for this tool. This topic branch can then be merged
into kvm/next and s390/features.
b: split out the kvm defines into arch/s390/tools/kvm_facilities.h
b would like something like this (cut/paste so whitespace damaged)
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 23 Nov 2016 09:18:42 +0100
Subject: [PATCH 1/1] s390:gen_facilites: Move kvm facilities into a separate
file
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
MAINTAINERS | 1 +
arch/s390/tools/gen_facilities.c | 25 +------------------------
arch/s390/tools/kvm_facilities.c | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+), 24 deletions(-)
create mode 100644 arch/s390/tools/kvm_facilities.c
diff --git a/MAINTAINERS b/MAINTAINERS
index ad9b965..941d555 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6928,6 +6928,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
S: Supported
F: Documentation/s390/kvm.txt
F: arch/s390/include/asm/kvm*
+F: arch/s390/tools/kvm_facilities.c
F: arch/s390/kvm/
KERNEL VIRTUAL MACHINE (KVM) FOR ARM
diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
index 8cc53b1..af91c69 100644
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_facilities.c
@@ -59,30 +59,7 @@ static struct facility_def facility_defs[] = {
-1 /* END */
}
},
- {
- .name = "FACILITIES_KVM",
- .bits = (int[]){
- 0, /* N3 instructions */
- 1, /* z/Arch mode installed */
- 2, /* z/Arch mode active */
- 3, /* DAT-enhancement */
- 4, /* idte segment table */
- 5, /* idte region table */
- 6, /* ASN-and-LX reuse */
- 7, /* stfle */
- 8, /* enhanced-DAT 1 */
- 9, /* sense-running-status */
- 10, /* conditional sske */
- 13, /* ipte-range */
- 14, /* nonquiescing key-setting */
- 73, /* transactional execution */
- 75, /* access-exception-fetch/store indication */
- 76, /* msa extension 3 */
- 77, /* msa extension 4 */
- 78, /* enhanced-DAT 2 */
- -1 /* END */
- }
- },
+ #include "kvm_facilities.c"
};
static void print_facility_list(struct facility_def *def)
diff --git a/arch/s390/tools/kvm_facilities.c b/arch/s390/tools/kvm_facilities.c
new file mode 100644
index 0000000..f6bb1ae
--- /dev/null
+++ b/arch/s390/tools/kvm_facilities.c
@@ -0,0 +1,26 @@
+/* To be included by arch/s390/tools/gen_facilities.c */
+ {
+ .name = "FACILITIES_KVM",
+ .bits = (int[]){
+ 0, /* N3 instructions */
+ 1, /* z/Arch mode installed */
+ 2, /* z/Arch mode active */
+ 3, /* DAT-enhancement */
+ 4, /* idte segment table */
+ 5, /* idte region table */
+ 6, /* ASN-and-LX reuse */
+ 7, /* stfle */
+ 8, /* enhanced-DAT 1 */
+ 9, /* sense-running-status */
+ 10, /* conditional sske */
+ 13, /* ipte-range */
+ 14, /* nonquiescing key-setting */
+ 73, /* transactional execution */
+ 75, /* access-exception-fetch/store indication */
+ 76, /* msa extension 3 */
+ 77, /* msa extension 4 */
+ 78, /* enhanced-DAT 2 */
+ -1 /* END */
+ }
+ },
+
--
2.5.5
[toc] | [prev] | [next] | [standalone]
| From | Heiko Carstens <heiko.carstens@de.ibm.com> |
|---|---|
| Date | 2016-11-23 11:20 +0100 |
| Message-ID | <sGCOK-3Ax-9@gated-at.bofh.it> |
| In reply to | #1528185 |
On Wed, Nov 23, 2016 at 09:24:17AM +0100, Christian Borntraeger wrote:
> On 11/23/2016 04:45 AM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the kvms390 tree got a conflict in:
> >
> > arch/s390/include/asm/facilities_src.h
> >
> > between commit:
> >
> > d1f7e8f85b51 ("s390: squash facilities_src.h into gen_facilities.c")
> >
> > from the s390 tree and commits:
> >
> > 09ff894457e9 ("KVM: s390: gaccess: add ESOP2 handling")
> > 88abf0b54f51 ("KVM: s390: instruction-execution-protection support")
> >
> > from the kvms390 tree.
> >
> > I fixed it up (I deleted the file and then added the following merge fix
> > patch) and can carry the fix as necessary. This is now fixed as far as
> > linux-next is concerned, but any non trivial conflicts should be mentioned
> > to your upstream maintainer when your tree is submitted for merging.
> > You may also want to consider cooperating with the maintainer of the
> > conflicting tree to minimise any particularly complex conflicts.
>
> Thanks, looks fine.
>
> Hmmm, Martin, Heiko, KVM is going to touch that file from time to time.
> Can we either have
> a: a topic branch for this tool (like I did for the 4.9 merge window)
> with just the patches for this tool. This topic branch can then be merged
> into kvm/next and s390/features.
That's up to Martin.
> b: split out the kvm defines into arch/s390/tools/kvm_facilities.h
> b would like something like this (cut/paste so whitespace damaged)
>
> From: Christian Borntraeger <borntraeger@de.ibm.com>
> Date: Wed, 23 Nov 2016 09:18:42 +0100
> Subject: [PATCH 1/1] s390:gen_facilites: Move kvm facilities into a separate
> file
>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> MAINTAINERS | 1 +
> arch/s390/tools/gen_facilities.c | 25 +------------------------
> arch/s390/tools/kvm_facilities.c | 26 ++++++++++++++++++++++++++
> 3 files changed, 28 insertions(+), 24 deletions(-)
> create mode 100644 arch/s390/tools/kvm_facilities.c
No, please don't split this file again. Only kvm will ever touch the kvm
facilities, so we won't any conflicts here.
This time it's only because the file moved, otherwise there wouldn't be any
problem at all.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web