Merge 5.8-rc7 into usb-next

We want the USB fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit c9779302 parents 9a360a7 92ed301303 files · +3457 −3165Browse files

Showing the changes to include/linux (7 of 303 files). Show all

Unified · Split

7 files

@@ -426,6 +426,7 @@ const char dm_device_name(struct mapped_device md); · 425 unmodified lines
426	426	int dm_copy_name_and_uuid(struct mapped_device md, char name, char *uuid);
427	427	struct gendisk dm_disk(struct mapped_device md);
428	428	int dm_suspended(struct dm_target *ti);
	429	+int dm_post_suspending(struct dm_target *ti);
429	430	int dm_noflush_suspending(struct dm_target *ti);
430	431	void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors);
431	432	union map_info dm_get_rq_mapinfo(struct request rq);

@@ -994,6 +994,7 @@ int efivars_register(struct efivars *efivars, · 993 unmodified lines
994	994	int efivars_unregister(struct efivars *efivars);
995	995	struct kobject *efivars_kobject(void);
996	996
	997	+int efivar_supports_writes(void);
997	998	int efivar_init(int (func)(efi_char16_t , efi_guid_t, unsigned long, void *),
998	999	void data, bool duplicates, struct list_head head);
999	1000

@@ -56,7 +56,7 @@ struct property_entry; · 55 unmodified lines
56	56	* on a bus (or read from them). Apart from two basic transfer functions to
57	57	* transmit one message at a time, a more complex version can be used to
58	58	* transmit an arbitrary number of messages without interruption.
59		− * @count must be be less than 64k since msg.len is u16.
	59	+ * @count must be less than 64k since msg.len is u16.
60	60	*/
61	61	int i2c_transfer_buffer_flags(const struct i2c_client *client,
62	62	char *buf, int count, u16 flags);

@@ -107,9 +107,12 @@ io_mapping_init_wc(struct io_mapping *iomap, · 106 unmodified lines
107	107	resource_size_t base,
108	108	unsigned long size)
109	109	{
	110	+ iomap->iomem = ioremap_wc(base, size);
	111	+ if (!iomap->iomem)
	112	+ return NULL;
	113	+
110	114	iomap->base = base;
111	115	iomap->size = size;
112		− iomap->iomem = ioremap_wc(base, size);
113	116	#if defined(pgprot_noncached_wc) /* archs can't agree on a name ... */
114	117	iomap->prot = pgprot_noncached_wc(PAGE_KERNEL);
115	118	#elif defined(pgprot_writecombine)

@@ -33,7 +33,7 @@ · 32 unmodified lines
33	33	* of two or more hash tables when the rhashtable is being resized.
34	34	* The end of the chain is marked with a special nulls marks which has
35	35	* the least significant bit set but otherwise stores the address of
36		− * the hash bucket. This allows us to be be sure we've found the end
	36	+ * the hash bucket. This allows us to be sure we've found the end
37	37	* of the right list.
38	38	* The value stored in the hash bucket has BIT(0) used as a lock bit.
39	39	* This bit must be atomically set before any changes are made to

@@ -220,7 +220,9 @@ struct tcp_sock { · 219 unmodified lines
220	220	} rack;
221	221	u16 advmss; /* Advertised MSS */
222	222	u8 compressed_ack;
223		− u8 dup_ack_counter;
	223	+ u8 dup_ack_counter:2,
	224	+ tlp_retrans:1, /* TLP is a retransmission */
	225	+ unused:5;
224	226	u32 chrono_start; /* Start time in jiffies of a TCP chrono */
225	227	u32 chrono_stat[3]; /* Time in jiffies for chrono_stat stats */
226	228	u8 chrono_type:2, /* current chronograph type */
@@ -243,7 +245,7 @@ struct tcp_sock { · 16 unmodified lines
243	245	save_syn:1, /* Save headers of SYN packet */
244	246	is_cwnd_limited:1,/* forward progress limited by snd_cwnd? */
245	247	syn_smc:1; /* SYN includes SMC */
246		− u32 tlp_high_seq; /* snd_nxt at the time of TLP retransmit. */
	248	+ u32 tlp_high_seq; /* snd_nxt at the time of TLP */
247	249
248	250	u32 tcp_tx_delay; /* delay (in usec) added to TX packets */
249	251	u64 tcp_wstamp_ns; /* departure time for next sent data packet */

@@ -15,6 +15,7 @@ · 14 unmodified lines
15	15	#include <linux/slab.h>
16	16	#include <linux/types.h>
17	17	#include <linux/spinlock.h>
	18	+#include <linux/mm.h>
18	19	#include <uapi/linux/xattr.h>
19	20
20	21	struct inode;
@@ -94,7 +95,7 @@ static inline void simple_xattrs_free(struct simple_xattrs *xattrs) · 73 unmodified lines
94	95
95	96	list_for_each_entry_safe(xattr, node, &xattrs->head, list) {
96	97	kfree(xattr->name);
97		− kfree(xattr);
	98	+ kvfree(xattr);
98	99	}
99	100	}
100	101