We were going to take this for 4.6 too but with the moratorium ongoing we should wait until Monday. I'll try and remember.
On Fri, 2015-09-25 at 07:11 +0000, patch...@xen.org wrote: > commit 8d6ff9ef259e296e6aee32ad8840cc5081280e0d > Author: Mike Belopuhov <mike.belopu...@esdenera.com> > AuthorDate: Fri Sep 25 09:04:24 2015 +0200 > Commit: Jan Beulich <jbeul...@suse.com> > CommitDate: Fri Sep 25 09:04:24 2015 +0200 > > add missing license and copyright statements to public interface headers > > The copyright line indicates a person, a group of people and/or a company > granting rights stated in the license text and is a required part of the > license. > > The year of the copyright is chosen to be the same as when the license has > been applied to the file or when the file has been created in case there > was no license. It is possible to update or add additional years if major > changes have been done to the the file, but is generally not a > requirement. > > Signed-off-by: Mike Belopuhov <mike.belopu...@esdenera.com> > --- > xen/include/public/arch-x86/pmu.h | 22 ++++++++++++++++++++++ > xen/include/public/hvm/e820.h | 3 ++- > xen/include/public/hvm/hvm_info_table.h | 2 ++ > xen/include/public/hvm/hvm_op.h | 2 ++ > xen/include/public/hvm/hvm_xs_strings.h | 2 ++ > xen/include/public/hvm/params.h | 2 ++ > xen/include/public/io/protocols.h | 2 ++ > xen/include/public/physdev.h | 2 ++ > xen/include/public/pmu.h | 22 ++++++++++++++++++++++ > 9 files changed, 58 insertions(+), 1 deletions(-) > > diff --git a/xen/include/public/arch-x86/pmu.h > b/xen/include/public/arch-x86/pmu.h > index 1a53888..68ebf12 100644 > --- a/xen/include/public/arch-x86/pmu.h > +++ b/xen/include/public/arch-x86/pmu.h > @@ -1,3 +1,25 @@ > +/* > + * Permission is hereby granted, free of charge, to any person obtaining a > copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, > and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. > + */ > + > #ifndef __XEN_PUBLIC_ARCH_X86_PMU_H__ > #define __XEN_PUBLIC_ARCH_X86_PMU_H__ > > diff --git a/xen/include/public/hvm/e820.h b/xen/include/public/hvm/e820.h > index 5bdc227..6c58a37 100644 > --- a/xen/include/public/hvm/e820.h > +++ b/xen/include/public/hvm/e820.h > @@ -1,4 +1,3 @@ > - > /* > * Permission is hereby granted, free of charge, to any person obtaining a > copy > * of this software and associated documentation files (the "Software"), to > @@ -17,6 +16,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2006, Keir Fraser > */ > > #ifndef __XEN_PUBLIC_HVM_E820_H__ > diff --git a/xen/include/public/hvm/hvm_info_table.h > b/xen/include/public/hvm/hvm_info_table.h > index 36085fa..9e3f807 100644 > --- a/xen/include/public/hvm/hvm_info_table.h > +++ b/xen/include/public/hvm/hvm_info_table.h > @@ -20,6 +20,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2006, Keir Fraser > */ > > #ifndef __XEN_PUBLIC_HVM_HVM_INFO_TABLE_H__ > diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h > index 014546a..1606185 100644 > --- a/xen/include/public/hvm/hvm_op.h > +++ b/xen/include/public/hvm/hvm_op.h > @@ -16,6 +16,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2007, Keir Fraser > */ > > #ifndef __XEN_PUBLIC_HVM_HVM_OP_H__ > diff --git a/xen/include/public/hvm/hvm_xs_strings.h > b/xen/include/public/hvm/hvm_xs_strings.h > index 8aec935..146b0b0 100644 > --- a/xen/include/public/hvm/hvm_xs_strings.h > +++ b/xen/include/public/hvm/hvm_xs_strings.h > @@ -20,6 +20,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2013, Citrix Systems > */ > > #ifndef __XEN_PUBLIC_HVM_HVM_XS_STRINGS_H__ > diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h > index 147d9b8..356dfd3 100644 > --- a/xen/include/public/hvm/params.h > +++ b/xen/include/public/hvm/params.h > @@ -16,6 +16,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2007, Keir Fraser > */ > > #ifndef __XEN_PUBLIC_HVM_PARAMS_H__ > diff --git a/xen/include/public/io/protocols.h > b/xen/include/public/io/protocols.h > index 80b196b..40a9b30 100644 > --- a/xen/include/public/io/protocols.h > +++ b/xen/include/public/io/protocols.h > @@ -18,6 +18,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2008, Keir Fraser > */ > > #ifndef __XEN_PROTOCOLS_H__ > diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h > index c9be6de..0e54635 100644 > --- a/xen/include/public/physdev.h > +++ b/xen/include/public/physdev.h > @@ -16,6 +16,8 @@ > * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2006, Keir Fraser > */ > > #ifndef __XEN_PUBLIC_PHYSDEV_H__ > diff --git a/xen/include/public/pmu.h b/xen/include/public/pmu.h > index 1149678..7753df0 100644 > --- a/xen/include/public/pmu.h > +++ b/xen/include/public/pmu.h > @@ -1,3 +1,25 @@ > +/* > + * Permission is hereby granted, free of charge, to any person obtaining a > copy > + * of this software and associated documentation files (the "Software"), to > + * deal in the Software without restriction, including without limitation the > + * rights to use, copy, modify, merge, publish, distribute, sublicense, > and/or > + * sell copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > + * DEALINGS IN THE SOFTWARE. > + * > + * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved. > + */ > + > #ifndef __XEN_PUBLIC_PMU_H__ > #define __XEN_PUBLIC_PMU_H__ > > -- > generated by git-patchbot for /home/xen/git/xen.git#staging > > _______________________________________________ > Xen-staging mailing list > xen-stag...@lists.xen.org > http://lists.xensource.com/xen-staging _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
