Three trivial overlapping conflicts.
Showing the changes to include/linux (4 of 167 files). Show all
Unified · Split
| @@ -546,7 +546,7 @@ int bpf_prog_array_copy(struct bpf_prog_array __rcu *old_array, · 545 unmodified lines | ||
| 546 | 546 | } \ |
| 547 | 547 | _out: \ |
| 548 | 548 | rcu_read_unlock(); \ |
| 549 | − preempt_enable_no_resched(); \ | |
| 549 | + preempt_enable(); \ | |
| 550 | 550 | _ret; \ |
| 551 | 551 | }) |
| 552 | 552 | |
| @@ -176,6 +176,7 @@ void free_pipe_info(struct pipe_inode_info *); · 175 unmodified lines | ||
| 176 | 176 | bool generic_pipe_buf_get(struct pipe_inode_info *, struct pipe_buffer *); |
| 177 | 177 | int generic_pipe_buf_confirm(struct pipe_inode_info *, struct pipe_buffer *); |
| 178 | 178 | int generic_pipe_buf_steal(struct pipe_inode_info *, struct pipe_buffer *); |
| 179 | +int generic_pipe_buf_nosteal(struct pipe_inode_info *, struct pipe_buffer *); | |
| 179 | 180 | void generic_pipe_buf_release(struct pipe_inode_info *, struct pipe_buffer *); |
| 180 | 181 | void pipe_buf_mark_unmergeable(struct pipe_buffer *buf); |
| 181 | 182 | |
| @@ -60,7 +60,7 @@ struct iov_iter { · 59 unmodified lines | ||
| 60 | 60 | |
| 61 | 61 | static inline enum iter_type iov_iter_type(const struct iov_iter *i) |
| 62 | 62 | { |
| 63 | − return i->type & ~(READ | WRITE); | |
| 63 | + return i->type & ~(READ | WRITE | ITER_BVEC_FLAG_NO_REF); | |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | static inline bool iter_is_iovec(const struct iov_iter *i) |
| @@ -200,7 +200,6 @@ usb_find_last_int_out_endpoint(struct usb_host_interface *alt, · 199 unmodified lines | ||
| 200 | 200 | * @dev: driver model's view of this device |
| 201 | 201 | * @usb_dev: if an interface is bound to the USB major, this will point |
| 202 | 202 | * to the sysfs representation for that device. |
| 203 | − * @pm_usage_cnt: PM usage counter for this interface | |
| 204 | 203 | * @reset_ws: Used for scheduling resets from atomic context. |
| 205 | 204 | * @resetting_device: USB core reset the device, so use alt setting 0 as |
| 206 | 205 | * current; needs bandwidth alloc after reset. |
| @@ -257,7 +256,6 @@ struct usb_interface { · 50 unmodified lines | ||
| 257 | 256 | |
| 258 | 257 | struct device dev; /* interface specific device info */ |
| 259 | 258 | struct device *usb_dev; |
| 260 | − atomic_t pm_usage_cnt; /* usage counter for autosuspend */ | |
| 261 | 259 | struct work_struct reset_ws; /* for resets in atomic context */ |
| 262 | 260 | }; |
| 263 | 261 | #define to_usb_interface(d) container_of(d, struct usb_interface, dev) |