Merge tag 'v5.5-rc7' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/mm/init_32.c
index e9f239e,0a74407..4d8672f
--- 1/arch/x86/mm/init_32.c
--- 2/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@@ -865,15 -865,41 +865,13 @@@ void arch_remove_memory(int nid, u64 st
  {
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
-       struct zone *zone;
  
-       zone = page_zone(pfn_to_page(start_pfn));
-       __remove_pages(zone, start_pfn, nr_pages, altmap);
+       __remove_pages(start_pfn, nr_pages, altmap);
  }
  #endif
  
  int kernel_set_to_readonly __read_mostly;
  
 -void set_kernel_text_rw(void)
 -{
 -      unsigned long start = PFN_ALIGN(_text);
 -      unsigned long size = PFN_ALIGN(_etext) - start;
 -
 -      if (!kernel_set_to_readonly)
 -              return;
 -
 -      pr_debug("Set kernel text: %lx - %lx for read write\n",
 -               start, start+size);
 -
 -      set_pages_rw(virt_to_page(start), size >> PAGE_SHIFT);
 -}
 -
 -void set_kernel_text_ro(void)
 -{
 -      unsigned long start = PFN_ALIGN(_text);
 -      unsigned long size = PFN_ALIGN(_etext) - start;
 -
 -      if (!kernel_set_to_readonly)
 -              return;
 -
 -      pr_debug("Set kernel text: %lx - %lx for read only\n",
 -               start, start+size);
 -
 -      set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
 -}
 -
  static void mark_nxdata_nx(void)
  {
        /*

diff --combined arch/x86/mm/init_64.c
index b326f14,bcfede4..abbdecb
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -1212,10 -1212,8 +1212,8 @@@ void __ref arch_remove_memory(int nid, 
  {
        unsigned long start_pfn = start >> PAGE_SHIFT;
        unsigned long nr_pages = size >> PAGE_SHIFT;
-       struct page *page = pfn_to_page(start_pfn) + vmem_altmap_offset(altmap);
-       struct zone *zone = page_zone(page);
  
-       __remove_pages(zone, start_pfn, nr_pages, altmap);
+       __remove_pages(start_pfn, nr_pages, altmap);
        kernel_physical_mapping_remove(start, start + size);
  }
  #endif /* CONFIG_MEMORY_HOTPLUG */
@@@ -1260,6 -1258,42 +1258,6 @@@ void __init mem_init(void
  
  int kernel_set_to_readonly;
  
 -void set_kernel_text_rw(void)
 -{
 -      unsigned long start = PFN_ALIGN(_text);
 -      unsigned long end = PFN_ALIGN(_etext);
 -
 -      if (!kernel_set_to_readonly)
 -              return;
 -
 -      pr_debug("Set kernel text: %lx - %lx for read write\n",
 -               start, end);
 -
 -      /*
 -       * Make the kernel identity mapping for text RW. Kernel text
 -       * mapping will always be RO. Refer to the comment in
 -       * static_protections() in pageattr.c
 -       */
 -      set_memory_rw(start, (end - start) >> PAGE_SHIFT);
 -}
 -
 -void set_kernel_text_ro(void)
 -{
 -      unsigned long start = PFN_ALIGN(_text);
 -      unsigned long end = PFN_ALIGN(_etext);
 -
 -      if (!kernel_set_to_readonly)
 -              return;
 -
 -      pr_debug("Set kernel text: %lx - %lx for read only\n",
 -               start, end);
 -
 -      /*
 -       * Set the kernel identity mapping for text RO.
 -       */
 -      set_memory_ro(start, (end - start) >> PAGE_SHIFT);
 -}
 -
  void mark_rodata_ro(void)
  {
        unsigned long start = PFN_ALIGN(_text);

diff --combined net/wireless/trace.h
index d5eaa49,8677d7a..3ef1679
--- 1/net/wireless/trace.h
--- 2/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@@ -646,6 -646,11 +646,11 @@@ DEFINE_EVENT(wiphy_netdev_evt, rdev_flu
        TP_ARGS(wiphy, netdev)
  );
  
+ DEFINE_EVENT(wiphy_netdev_evt, rdev_end_cac,
+            TP_PROTO(struct wiphy *wiphy, struct net_device *netdev),
+            TP_ARGS(wiphy, netdev)
+ );
+ 
  DECLARE_EVENT_CLASS(station_add_change,
        TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, u8 *mac,
                 struct station_parameters *params),
@@@ -2009,7 -2014,7 +2014,7 @@@ TRACE_EVENT(rdev_start_nan
                WIPHY_ENTRY
                WDEV_ENTRY
                __field(u8, master_pref)
 -              __field(u8, bands);
 +              __field(u8, bands)
        ),
        TP_fast_assign(
                WIPHY_ASSIGN;
@@@ -2031,8 -2036,8 +2036,8 @@@ TRACE_EVENT(rdev_nan_change_conf
                WIPHY_ENTRY
                WDEV_ENTRY
                __field(u8, master_pref)
 -              __field(u8, bands);
 -              __field(u32, changes);
 +              __field(u8, bands)
 +              __field(u32, changes)
        ),
        TP_fast_assign(
                WIPHY_ASSIGN;