From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Sep 2021 20:05:42 +0000 (-0700)
Subject: Merge tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=fc0c0548c1a2e676d3a928aaed70f2d4d254e395;p=kernel.git

Merge tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf.

  Current release - regressions:

   - vhost_net: fix OoB on sendmsg() failure

   - mlx5: bridge, fix uninitialized variable usage

   - bnxt_en: fix error recovery regression

  Current release - new code bugs:

   - bpf, mm: fix lockdep warning triggered by stack_map_get_build_id_offset()

  Previous releases - regressions:

   - r6040: restore MDIO clock frequency after MAC reset

   - tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()

   - dsa: flush switchdev workqueue before tearing down CPU/DSA ports

  Previous releases - always broken:

   - ptp: dp83640: don't define PAGE0, avoid compiler warning

   - igc: fix tunnel segmentation offloads

   - phylink: update SFP selected interface on advertising changes

   - stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume

   - mlx5e: fix mutual exclusion between CQE compression and HW TS

  Misc:

   - bpf, cgroups: fix cgroup v2 fallback on v1/v2 mixed mode

   - sfc: fallback for lack of xdp tx queues

   - hns3: add option to turn off page pool feature"

* tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (67 commits)
  mlxbf_gige: clear valid_polarity upon open
  igc: fix tunnel offloading
  net/{mlx5|nfp|bnxt}: Remove unnecessary RTNL lock assert
  net: wan: wanxl: define CROSS_COMPILE_M68K
  selftests: nci: replace unsigned int with int
  net: dsa: flush switchdev workqueue before tearing down CPU/DSA ports
  Revert "net: phy: Uniform PHY driver access"
  net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup
  ptp: dp83640: don't define PAGE0
  bnx2x: Fix enabling network interfaces without VFs
  Revert "Revert "ipv4: fix memory leaks in ip_cmsg_send() callers""
  tcp: fix tp->undo_retrans accounting in tcp_sacktag_one()
  net-caif: avoid user-triggerable WARN_ON(1)
  bpf, selftests: Add test case for mixed cgroup v1/v2
  bpf, selftests: Add cgroup v1 net_cls classid helpers
  bpf, cgroups: Fix cgroup v2 fallback on v1/v2 mixed mode
  bpf: Add oversize check before call kvcalloc()
  net: hns3: fix the timing issue of VF clearing interrupt sources
  net: hns3: fix the exception when query imp info
  net: hns3: disable mac in flr process
  ...
---

fc0c0548c1a2e676d3a928aaed70f2d4d254e395
diff --cc include/linux/mmap_lock.h
index b179f1e3541a2,3af8f7fb067df..96e113e23d04e
--- a/include/linux/mmap_lock.h
+++ b/include/linux/mmap_lock.h
@@@ -140,23 -140,14 +140,14 @@@ static inline bool mmap_read_trylock(st
  
  static inline void mmap_read_unlock(struct mm_struct *mm)
  {
 -	up_read(&mm->mmap_lock);
  	__mmap_lock_trace_released(mm, false);
 +	up_read(&mm->mmap_lock);
  }
  
- static inline bool mmap_read_trylock_non_owner(struct mm_struct *mm)
- {
- 	if (mmap_read_trylock(mm)) {
- 		rwsem_release(&mm->mmap_lock.dep_map, _RET_IP_);
- 		return true;
- 	}
- 	return false;
- }
- 
  static inline void mmap_read_unlock_non_owner(struct mm_struct *mm)
  {
 -	up_read_non_owner(&mm->mmap_lock);
  	__mmap_lock_trace_released(mm, false);
 +	up_read_non_owner(&mm->mmap_lock);
  }
  
  static inline void mmap_assert_locked(struct mm_struct *mm)