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:

  include/linux/liveupdate.h

between commit:

  459873adf5e90 ("liveupdate: Reference count outgoing FLB data")

from the liveupdate-fixes tree and commit:

  36882f3392395 ("liveupdate: Reference count outgoing FLB data")

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 --combined include/linux/liveupdate.h
index 63ea5417de849,6051abc0612ce..0000000000000
--- a/include/linux/liveupdate.h
+++ b/include/linux/liveupdate.h
@@@ -25,6 -25,7 +25,7 @@@ struct file
  /**
   * struct liveupdate_file_op_args - Arguments for file operation callbacks.
   * @handler:          The file handler being called.
+  * @session:          The session this file belongs to.
   * @retrieve_status:  The retrieve status for the 'can_finish / finish'
   *                    operation. A value of 0 means the retrieve has not been
   *                    attempted, a positive value means the retrieve was
@@@ -45,6 -46,7 +46,7 @@@
   */
  struct liveupdate_file_op_args {
  	struct liveupdate_file_handler *handler;
+ 	struct liveupdate_session *session;
  	int retrieve_status;
  	struct file *file;
  	u64 serialized_data;
@@@ -247,6 -249,14 +249,14 @@@ void liveupdate_flb_put_incoming(struc
  int liveupdate_flb_get_outgoing(struct liveupdate_flb *flb, void **objp);
  void liveupdate_flb_put_outgoing(struct liveupdate_flb *flb);
  
+ /* kernel can internally retrieve files */
+ int liveupdate_get_file_incoming(struct liveupdate_session *s, u64 token,
+ 				 struct file **filep);
+ 
+ /* Get a token for an outgoing file, or -ENOENT if file is not preserved */
+ int liveupdate_get_token_outgoing(struct liveupdate_session *s,
+ 				  struct file *file, u64 *tokenp);
+ 
  #else /* CONFIG_LIVEUPDATE */
  
  static inline bool liveupdate_enabled(void)
@@@ -299,5 -309,17 +309,17 @@@ static inline void liveupdate_flb_put_o
  {
  }
  
+ static inline int liveupdate_get_file_incoming(struct liveupdate_session *s,
+ 					       u64 token, struct file **filep)
+ {
+ 	return -EOPNOTSUPP;
+ }
+ 
+ static inline int liveupdate_get_token_outgoing(struct liveupdate_session *s,
+ 						struct file *file, u64 *tokenp)
+ {
+ 	return -EOPNOTSUPP;
+ }
+ 
  #endif /* CONFIG_LIVEUPDATE */
  #endif /* _LINUX_LIVEUPDATE_H */

Attachment: signature.asc
Description: PGP signature