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	int dm_copy_name_and_uuid(struct mapped_device md, char name, char *uuid);	426	int dm_copy_name_and_uuid(struct mapped_device md, char name, char *uuid);
427	struct gendisk dm_disk(struct mapped_device md);	427	struct gendisk dm_disk(struct mapped_device md);
428	int dm_suspended(struct dm_target *ti);	428	int dm_suspended(struct dm_target *ti);
		429	int dm_post_suspending(struct dm_target *ti);
429	int dm_noflush_suspending(struct dm_target *ti);	430	int dm_noflush_suspending(struct dm_target *ti);
430	void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors);	431	void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors);
431	union map_info dm_get_rq_mapinfo(struct request rq);	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	int efivars_unregister(struct efivars *efivars);	994	int efivars_unregister(struct efivars *efivars);
995	struct kobject *efivars_kobject(void);	995	struct kobject *efivars_kobject(void);
996		996
		997	int efivar_supports_writes(void);
997	int efivar_init(int (func)(efi_char16_t , efi_guid_t, unsigned long, void *),	998	int efivar_init(int (func)(efi_char16_t , efi_guid_t, unsigned long, void *),
998	void data, bool duplicates, struct list_head head);	999	void data, bool duplicates, struct list_head head);
999		1000

@@ -56,7 +56,7 @@ struct property_entry; · 55 unmodified lines
56	* on a bus (or read from them). Apart from two basic transfer functions to	56	* on a bus (or read from them). Apart from two basic transfer functions to
57	* transmit one message at a time, a more complex version can be used to	57	* transmit one message at a time, a more complex version can be used to
58	* transmit an arbitrary number of messages without interruption.	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	int i2c_transfer_buffer_flags(const struct i2c_client *client,	61	int i2c_transfer_buffer_flags(const struct i2c_client *client,
62	char *buf, int count, u16 flags);	62	char *buf, int count, u16 flags);

 		   resource_size_t base,
 		   unsigned long size)
 {
+	iomap->iomem = ioremap_wc(base, size);
+	if (!iomap->iomem)
+		return NULL;
 	iomap->base = base;
 	iomap->size = size;
-	iomap->iomem = ioremap_wc(base, size);
 #if defined(pgprot_noncached_wc) /* archs can't agree on a name ... */
 	iomap->prot = pgprot_noncached_wc(PAGE_KERNEL);
 #elif defined(pgprot_writecombine)

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

 	} rack;
 	u16	advmss;		/* Advertised MSS			*/
 	u8	compressed_ack;
-	u8	dup_ack_counter;
+	u8	dup_ack_counter:2,
+		tlp_retrans:1,	/* TLP is a retransmission */
+		unused:5;
 	u32	chrono_start;	/* Start time in jiffies of a TCP chrono */
 	u32	chrono_stat[3];	/* Time in jiffies for chrono_stat stats */
 	u8	chrono_type:2,	/* current chronograph type */
 		save_syn:1,	/* Save headers of SYN packet */
 		is_cwnd_limited:1,/* forward progress limited by snd_cwnd? */
 		syn_smc:1;	/* SYN includes SMC */
-	u32	tlp_high_seq;	/* snd_nxt at the time of TLP retransmit. */
+	u32	tlp_high_seq;	/* snd_nxt at the time of TLP */
 	u32	tcp_tx_delay;	/* delay (in usec) added to TX packets */
 	u64	tcp_wstamp_ns;	/* departure time for next sent data packet */

 #include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/spinlock.h>
+#include <linux/mm.h>
 #include <uapi/linux/xattr.h>
 struct inode;
 	list_for_each_entry_safe(xattr, node, &xattrs->head, list) {
 		kfree(xattr->name);
-		kfree(xattr);
+		kvfree(xattr);
 	}
 }