linux-next: manual merge of the akpm tree with the bpf-next tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  fs/eventpoll.c

between commits:

  7fd3253a7de6 ("net: Introduce preferred busy-polling")
  7c951cafc0cb ("net: Add SO_BUSY_POLL_BUDGET socket option")

from the bpf-next tree and commit:

  cc2687004c9d ("epoll: simplify and optimize busy loop logic")

from the akpm tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/eventpoll.c
index a80a290005c4,88f5b26806e5..000000000000
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@@ -393,15 -395,19 +395,20 @@@ static bool ep_busy_loop(struct eventpo
  {
  	unsigned int napi_id = READ_ONCE(ep->napi_id);
  
- 	if ((napi_id >= MIN_NAPI_ID) && net_busy_loop_on())
+ 	if ((napi_id >= MIN_NAPI_ID) && net_busy_loop_on()) {
 -		napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep);
 +		napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end, ep, false,
 +			       BUSY_POLL_BUDGET);
- }
- 
- static inline void ep_reset_busy_poll_napi_id(struct eventpoll *ep)
- {
- 	if (ep->napi_id)
+ 		if (ep_events_available(ep))
+ 			return true;
+ 		/*
+ 		 * Busy poll timed out.  Drop NAPI ID for now, we can add
+ 		 * it back in when we have moved a socket with a valid NAPI
+ 		 * ID onto the ready list.
+ 		 */
  		ep->napi_id = 0;
+ 		return false;
+ 	}
+ 	return false;
  }
  
  /*

Attachment: pgpVjJ9AlKsru.pgp
Description: OpenPGP digital signature