History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking.

David S. Miller committed 9 years ago

Commit e1ea2f92 parents aad93c7 0b07194252 files · +2322 −2083Browse files

Showing the changes to scripts (3 of 252 files). Show all

Unified · Split

3 files
  1. scripts/Makefile.modpost +0 −1
  2. scripts/mod/devicetable-offsets.c +0 −1
  3. scripts/mod/file2alias.c +1 −5
scripts/Makefile.modpost+0−1
@@ -97,7 +97,6 @@ vmlinux.o: FORCE · 96 unmodified lines
97 $(call cmd,kernel-mod)97 $(call cmd,kernel-mod)
98 98
99# Declare generated files as targets for modpost99# Declare generated files as targets for modpost
100$(symverfile): __modpost ;
101$(modules:.ko=.mod.c): __modpost ;100$(modules:.ko=.mod.c): __modpost ;
102 101
103 102
scripts/mod/devicetable-offsets.c+0−1
@@ -105,7 +105,6 @@ int main(void) · 104 unmodified lines
105 DEVID_FIELD(input_device_id, sndbit);105 DEVID_FIELD(input_device_id, sndbit);
106 DEVID_FIELD(input_device_id, ffbit);106 DEVID_FIELD(input_device_id, ffbit);
107 DEVID_FIELD(input_device_id, swbit);107 DEVID_FIELD(input_device_id, swbit);
108 DEVID_FIELD(input_device_id, propbit);
109 108
110 DEVID(eisa_device_id);109 DEVID(eisa_device_id);
111 DEVID_FIELD(eisa_device_id, sig);110 DEVID_FIELD(eisa_device_id, sig);
scripts/mod/file2alias.c+1−5
@@ -761,7 +761,7 @@ static void do_input(char *alias, · 760 unmodified lines
761 sprintf(alias + strlen(alias), "%X,*", i);761 sprintf(alias + strlen(alias), "%X,*", i);
762}762}
763 763
764/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwXprX where X is comma-separated %02X. */764/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */
765static int do_input_entry(const char *filename, void *symval,765static int do_input_entry(const char *filename, void *symval,
766 char *alias)766 char *alias)
767{767{
@@ -779,7 +779,6 @@ static int do_input_entry(const char *filename, void *symval, · 11 unmodified lines
779 DEF_FIELD_ADDR(symval, input_device_id, sndbit);779 DEF_FIELD_ADDR(symval, input_device_id, sndbit);
780 DEF_FIELD_ADDR(symval, input_device_id, ffbit);780 DEF_FIELD_ADDR(symval, input_device_id, ffbit);
781 DEF_FIELD_ADDR(symval, input_device_id, swbit);781 DEF_FIELD_ADDR(symval, input_device_id, swbit);
782 DEF_FIELD_ADDR(symval, input_device_id, propbit);
783 782
784 sprintf(alias, "input:");783 sprintf(alias, "input:");
785 784
@@ -817,9 +816,6 @@ static int do_input_entry(const char *filename, void *symval, · 31 unmodified lines
817 sprintf(alias + strlen(alias), "w*");816 sprintf(alias + strlen(alias), "w*");
818 if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)817 if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)
819 do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);818 do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);
820 sprintf(alias + strlen(alias), "pr*");
821 if (flags & INPUT_DEVICE_ID_MATCH_PROPBIT)
822 do_input(alias, *propbit, 0, INPUT_DEVICE_ID_PROP_MAX);
823 return 1;819 return 1;
824}820}
825ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);821ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);