linux-next: manual merge of the liveupdate tree with the liveupdate-fixes tree

[Mark Brown]

Hi all,

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

  kernel/liveupdate/luo_session.c

between commit:

  da7f658ccc8da ("liveupdate: validate session type before performing operation")

from the liveupdate-fixes tree and commit:

  d6b3d47bdaf89 ("liveupdate: add LIVEUPDATE_SESSION_GET_NAME ioctl")

from the liveupdate 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.

diff --cc kernel/liveupdate/luo_session.c
index 74c39d93d45a1,1caaa7886ec6d..0000000000000
--- a/kernel/liveupdate/luo_session.c
+++ b/kernel/liveupdate/luo_session.c
@@@ -293,15 -306,9 +306,16 @@@ union ucmd_buffer 
  	struct liveupdate_session_finish finish;
  	struct liveupdate_session_preserve_fd preserve;
  	struct liveupdate_session_retrieve_fd retrieve;
+ 	struct liveupdate_session_get_name get_name;
  };
  
 +/* Type of sessions the ioctl applies to. */
 +enum luo_ioctl_type {
 +	LUO_IOCTL_INCOMING,
 +	LUO_IOCTL_OUTGOING,
 +	LUO_IOCTL_ALL,
 +};
 +
  struct luo_ioctl_op {
  	unsigned int size;
  	unsigned int min_size;
@@@ -323,30 -328,15 +337,32 @@@
  
  static const struct luo_ioctl_op luo_session_ioctl_ops[] = {
  	IOCTL_OP(LIVEUPDATE_SESSION_FINISH, luo_session_finish,
 -		 struct liveupdate_session_finish, reserved),
 +		 struct liveupdate_session_finish, reserved, LUO_IOCTL_INCOMING),
  	IOCTL_OP(LIVEUPDATE_SESSION_PRESERVE_FD, luo_session_preserve_fd,
 -		 struct liveupdate_session_preserve_fd, token),
 +		 struct liveupdate_session_preserve_fd, token, LUO_IOCTL_OUTGOING),
  	IOCTL_OP(LIVEUPDATE_SESSION_RETRIEVE_FD, luo_session_retrieve_fd,
 -		 struct liveupdate_session_retrieve_fd, token),
 +		 struct liveupdate_session_retrieve_fd, token, LUO_IOCTL_INCOMING),
+ 	IOCTL_OP(LIVEUPDATE_SESSION_GET_NAME, luo_session_get_name,
 -		 struct liveupdate_session_get_name, name),
++		 struct liveupdate_session_get_name, name, LUO_IOCTL_OUTGOING),
  };
  
 +static bool luo_ioctl_type_valid(struct luo_session *session,
 +				 const struct luo_ioctl_op *op)
 +{
 +	switch (op->type) {
 +	case LUO_IOCTL_INCOMING:
 +		/* Retrieved is only set on incoming sessions */
 +		return session->retrieved;
 +	case LUO_IOCTL_OUTGOING:
 +		return !session->retrieved;
 +	case LUO_IOCTL_ALL:
 +		return true;
 +	}
 +
 +	/* Catch-all. */
 +	return false;
 +}
 +
  static long luo_session_ioctl(struct file *filep, unsigned int cmd,
  			      unsigned long arg)
  {

Attachment: signature.asc
Description: PGP signature