add new kernel for OSCI-946

diff --git a/config-generic-rhel b/config-generic-rhel
index 5b77aff5f7f13cbe64a605448406aa41470733cc..bbe7080bb39af55781681232ec7e3efae50eba7f 100644 (file)
--- a/config-generic-rhel
+++ b/config-generic-rhel
@@ -101,7 +101,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
-CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m
@@ -121,8 +121,7 @@ CONFIG_IP_SET_LIST_SET=m
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_QFQ=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
+# CONFIG_OPENVSWITCH is not set
 CONFIG_VXLAN=m
 CONFIG_NETPRIO_CGROUP=y
 CONFIG_MODULE_SIG=y

diff --git a/kernel.spec b/kernel.spec
index 1a62386d71e879875984a60b28b7e53aee4d950d..8fa149b61dd30e432842a81f1cff6e2b374803e5 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -19,7 +19,7 @@ Summary: The Linux kernel
 
 %define rhel 1
 %if %{rhel}
-%define distro_build 358.118.1.openstack
+%define distro_build 358.123.3.openstack
 %define signmodules 1
 %else
 # fedora_build defines which build revision of this kernel version we're
@@ -171,7 +171,7 @@ Summary: The Linux kernel
 %endif
 
 # The kernel tarball/base version
-%define kversion 2.6.32-358.118.1.openstack.el6
+%define kversion 2.6.32-358.123.3.openstack.el6
 
 %define make_target bzImage
 
@@ -296,6 +296,12 @@ Summary: The Linux kernel
 %define all_arch_configs kernel-%{version}-i?86*.config
 %define image_install_path boot
 %define kernel_image arch/x86/boot/bzImage
+#HACK for obs
+%define with_up 1
+%define with_headers 1
+%define with_perf 1
+%define all_arch_configs kernel-%{version}-*.config
+%define with_firmware 1
 %endif
 
 %ifarch x86_64
@@ -571,7 +577,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 7Gb
 %define strip_cmd strip
 %endif
 
-Source0: linux-2.6.32-358.118.1.openstack.el6.tar.bz2
+Source0: linux-2.6.32-358.123.3.openstack.el6.tar.bz2
 
 Source1: Makefile.common
 
@@ -1741,6 +1747,135 @@ fi
 %endif
 
 %changelog
+* Tue Dec 3 2013 Andrey Korolyov <akorolev@mirantis.com> [2.6.32-358.123.3.openstack.el6]
+- [config] remove OVS dp from the kconfig and move GRE symbols to the module
+ 
+* Thu Sep 26 2013 Radomir Vrbovsky <rvrbovsk@redhat.com> [2.6.32-358.123.2.openstack.el6]
+- [net] vxlan: Avoid creating fdb entry with NULL destination (Amerigo Wang) [1009025 923915]
+- [md] dm-snapshot: fix data corruption (Mikulas Patocka) [1004252 1004233] {CVE-2013-4299}
+
+* Wed Sep 18 2013 Radomir Vrbovsky <rvrbovsk@redhat.com> [2.6.32-358.123.1.openstack.el6]
+- [redhat] configs: enable CONFIG_OPENVSWITCH_VXLAN (Amerigo Wang) [1009006 981285]
+- [net] openvswitch: Add vxlan tunneling support (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Add tx-vlan offload support (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Improve vxlan headroom calculation (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Factor out vxlan send api (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Extend vxlan handlers for openvswitch (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Add vxlan recv demux (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Restructure vxlan receive (Amerigo Wang) [1009006 981285]
+- [net] vxlan: Restructure vxlan socket apis (Amerigo Wang) [1009006 981285]
+- [net] openvswitch: Reset tunnel key between input and output (Amerigo Wang) [1009006 981285]
+- [net] openvswitch: Use correct type while allocating flex array (Amerigo Wang) [1009006 981285]
+- [net] openvswitch: Fix bad merge resolution (Amerigo Wang) [1009006 981285]
+- [net] vxlan: fix a soft lockup in vxlan module removal (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix a regression of igmp join (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix rcu related warning (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fdb: replace an existing entry (Amerigo Wang) [1009025 923915]
+- [kernel] list: introduce list_first_entry_or_null (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix igmp races (Amerigo Wang) [1009025 923915]
+- [net] vxlan: unregister on namespace exit (Amerigo Wang) [1009025 923915]
+- [net] vxlan: add necessary locking on device removal (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Fix kernel crash on rmmod (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix function name spelling (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fdb: allow specifying multiple destinations for zero MAC (Amerigo Wang) [1009025 923915]
+- [net] rtnetlink: allow using zero MAC address in rtnl_fdb_add, rtnl_fdb_del (Amerigo Wang) [1009025 923915]
+- [net] fix address check in rtnl_fdb_del (Amerigo Wang) [1009025 923915]
+- [net] vxlan: allow removal of single destination from fdb entry (Amerigo Wang) [1009025 923915]
+- [net] vxlan: introduce vxlan_fdb_parse (Amerigo Wang) [1009025 923915]
+- [net] vxlan: introduce vxlan_fdb_find_rdst (Amerigo Wang) [1009025 923915]
+- [net] vxlan: add implicit fdb entry for default destination (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Fix sparse warnings 2 (Amerigo Wang) [1009025 923915]
+- [net] vxlan: cosmetic cleanup's (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Use initializer for dummy structures (Amerigo Wang) [1009025 923915]
+- [net] vxlan: port module param should be ushort (Amerigo Wang) [1009025 923915]
+- [net] vxlan: convert remotes list to list_rcu (Amerigo Wang) [1009025 923915]
+- [net] vxlan: make vxlan_xmit_one void (Amerigo Wang) [1009025 923915]
+- [net] vxlan: move cleanup to uninit (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix race caused by dropping rtnl_unlock (Amerigo Wang) [1009025 923915]
+- [net] vxlan: send notification when MAC migrates (Amerigo Wang) [1009025 923915]
+- [net] vxlan: move IGMP join/leave to work queue (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix crash from work pending on module removal (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix out of order operation on module removal (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix check for migration of static entry (Amerigo Wang) [1009025 923915]
+- [net] vxlan: handle skb_clone failure (Amerigo Wang) [1009025 923915]
+- [net] vxlan: only migrate dynamic FDB entries (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix race between flush and incoming learning (Amerigo Wang) [1009025 923915]
+- [net] vxlan: defer vxlan init as late as possible (Amerigo Wang) [1009025 923915]
+- [net] vxlan: use unsigned int instead of unsigned (Amerigo Wang) [1009025 923915]
+- [net] vxlan: remove the unused rcu head from struct vxlan_rdst (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Update vxlan fdb 'used' field after each usage (Amerigo Wang) [1009025 923915]
+- [net] vxlan: listen on multiple ports (Amerigo Wang) [1009025 923915]
+- [net] vxlan: do not set SKB_GSO_UDP (Amerigo Wang) [1009025 923915]
+- [net] vxlan: allow choosing destination port per vxlan (Amerigo Wang) [1009025 923915]
+- [net] vxlan: compute source port in network byte order (Amerigo Wang) [1009025 923915]
+- [net] vxlan: source compatiablity with IFLA_VXLAN_GROUP (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix byte order issues with NDA_PORT (Amerigo Wang) [1009025 923915]
+- [net] vxlan: document UDP default port (Amerigo Wang) [1009025 923915]
+- [net] vxlan: update mail address and copyright date (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Allow L2 redirection with L3 switching (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Allow setting destination to unicast address (Amerigo Wang) [1009025 923915]
+- [net] vxlan: don't bypass encapsulation for multi- and broadcasts (Amerigo Wang) [1009025 923915]
+- [net] vxlan: use htonl when snooping for loopback address (Amerigo Wang) [1009025 923915]
+- [net] vxlan: fix some sparse warnings (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Bypass encapsulation if the destination is local (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Fix sparse warnings (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Use IP Tunnels tunnel ENC encap API (Amerigo Wang) [1009025 923915]
+- [net] vxlan: generalize forwarding tables (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Add vlan support to static neighbors (Amerigo Wang) [1009025 923915]
+- [net] vxlan: allow live mac address change (Amerigo Wang) [1009025 923915]
+- [net] vxlan: add DOVE extensions for VXLAN (Amerigo Wang) [1009025 923915]
+- [net] vxlan: move SET_ETHTOOL_OPS() to vxlan_newlink() (Amerigo Wang) [1009025 923915]
+- [net] vxlan: specify fl4.proto before calling ip_route_output_key() (Amerigo Wang) [1009025 923915]
+- [net] vxlan: Depend on CONFIG_INET (Amerigo Wang) [1009025 923915]
+- [md] raid1, raid10: use freeze_array in place of raise_barrier in various places (Jes Sorensen) [1003765 997845]
+- [scsi] megaraid_sas: megaraid_sas driver init fails in kdump kernel (Nikola Pajkovsky) [1001963 833299]
+- [char] ipmi: eliminate long delay in ipmi_si on SGI UV2 (Nikola Pajkovsky) [988228 876778]
+- [net] bridge: Add multicast_querier toggle and disable queries by default (Nikola Pajkovsky) [995334 905561]
+- [net] bridge: Fix fatal typo in setup of multicast_querier_expired (Nikola Pajkovsky) [995334 905561]
+- [net] bridge: Restart queries when last querier expires (Nikola Pajkovsky) [995334 905561]
+- [net] bridge: Add br_multicast_start_querier (Flavio Leitner) [995334 905561]
+- [kernel] Prevent RT process stall due to missing upstream scheduler bug fix (Larry Woodman) [1006932 1002765]
+- [fs] nfs: Minor cleanups for nfs4_handle_exception and nfs4_async_handle_error (Dave Wysochanski) [1006956 998752]
+- [firmware] efivars: Use correct efi_pstore_info struct when calling pstore_register (Lenny Szubowicz) [993547 867689]
+- [net] bridge: do not call setup_timer() multiple times (Amerigo Wang) [997746 994430]
+- [fs] lockd: protect nlm_blocked list (David Jeffery) [993544 967095]
+- [net] ipv6: call udp_push_pending_frames when uncorking a socket with AF_INET pending data (Jiri Benc) [987649 987651] {CVE-2013-4162}
+- [fs] fuse: readdirplus sanity checks (Niels de Vos) [988708 981741]
+- [fs] fuse: readdirplus cleanup (Niels de Vos) [988708 981741]
+- [fs] fuse: readdirplus change attributes once (Niels de Vos) [988708 981741]
+- [fs] fuse: readdirplus fix instantiate (Niels de Vos) [988708 981741]
+- [fs] fuse: fix readdirplus dentry leak (Niels de Vos) [988708 981741]
+- [fs] cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next (Sachin Prabhu) [994866 976535]
+- [fs] nfs: Make nfs_readdir revalidate less often (Scott Mayhew) [994867 976879]
+- [fs] nfs: Make nfs_attribute_cache_expired() non-static (Scott Mayhew) [994867 976879]
+- [fs] nfs: set verifier on existing dentries in nfs_prime_dcache (Scott Mayhew) [994867 976879]
+- [fs] nfs: Allow nfs_updatepage to extend a write under additional circumstances (Scott Mayhew) [987262 983288]
+- [fs] nfs: fix a leak at nfs_lookup_revalidate() (Dave Wysochanski) [987261 975211]
+- [acpi] efivars: If pstore_register fails, free unneeded pstore buffer (Lenny Szubowicz) [993547 867689]
+- [acpi] Eliminate console msg if pstore.backend excludes ERST (Lenny Szubowicz) [993547 867689]
+- [acpi] Return unique error if backend registration excluded by kernel param (Lenny Szubowicz) [993547 867689]
+- [net] bridge: fix some kernel warning in multicast timer (Amerigo Wang) [997745 952012]
+- [net] bridge: send query as soon as leave is received (Amerigo Wang) [997745 952012]
+- [net] bridge: only expire the mdb entry when query is received (Amerigo Wang) [997745 952012]
+- [net] bridge: Replace mp->mglist hlist with a bool (Amerigo Wang) [997745 952012]
+- [mm] fadvise: drain all pagevecs if POSIX_FADV_DONTNEED fails to discard all pages (Larry Woodman) [994140 957821]
+- [net] sunrpc: don't use a credential with extra groups (Mateusz Guzik) [1003931 955712]
+- [virt] xen-netfront: reduce gso_max_size to account for max TCP header (Andrew Jones) [1004657 957231]
+- [pps] Fix a use-after free bug when unregistering a source (Jiri Benc) [997916 920155]
+- [scsi] fnic: Fix SGEs limit (Chris Leech) [991346 829506]
+- [x86] Round the calculated scale factor in set_cyc2ns_scale() (Prarit Bhargava) [1001954 975507]
+- [x86] sched: Fix overflow in cyc2ns_offset (Prarit Bhargava) [1001954 975507]
+- [fs] autofs: remove autofs dentry mount check (Ian Kent) [1000314 947275]
+- [net] sctp: Fix list corruption resulting from freeing an association on a list (Jiri Pirko) [1002184 887868]
+- [fs] nfs: Add functionality to allow waiting on all outstanding reads to complete (Dave Wysochanski) [996424 976915]
+- [fs] nfs: Ensure that NFS file unlock waits for readahead to complete (Dave Wysochanski) [996424 976915]
+- [fs] nfs: Convert nfs_get_lock_context to return an ERR_PTR on failure (Dave Wysochanski) [996424 976915]
+- [x86] thermal: Disable power limit notification interrupt (Shyam Iyer) [999328 908990]
+- [x86] thermal: Delete power-limit-notification console messages (Shyam Iyer) [999328 908990]
+- [fs] gfs2: Reserve journal space for quota change in do_grow (Robert S Peterson) [988384 976823]
+- [netdrv] bonding: properly unset current_arp_slave on slave link up (Veaceslav Falico) [995458 988460]
+- [fs] nfs4: Fix infinite loop in nfs4_lookup_root (Scott Mayhew) [996014 987426]
+
 * Wed Aug 14 2013 Frantisek Hrbata <fhrbata@redhat.com> [2.6.32-358.118.1.openstack.el6]
 - [netdrv] qlcnic: fix vlgrp handling (Stefan Assmann) [995125 886420]
 - [netdrv] bna: fix vlan_grp handling (Stefan Assmann) [995125 886420]

diff --git a/linux-2.6.32-358.118.1.openstack.el6.tar.bz2 b/linux-2.6.32-358.123.3.openstack.el6.tar.bz2
similarity index 84%
rename from linux-2.6.32-358.118.1.openstack.el6.tar.bz2
rename to linux-2.6.32-358.123.3.openstack.el6.tar.bz2
index 0e37c638cf36c19678c1ff6b2aaf5f632e2866cc..559609034bd6f69322db7f1c0c28988b45a06907 100644 (file)
Binary files a/linux-2.6.32-358.118.1.openstack.el6.tar.bz2 and b/linux-2.6.32-358.123.3.openstack.el6.tar.bz2 differ