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.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 5 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 2b9395501d81..6ef6e63f96fd 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -761,7 +761,7 @@ static void do_input(char *alias,
                         sprintf(alias + strlen(alias), "%X,*", i);
 }
 
-/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwXprX where X is comma-separated %02X. */
+/* input:b0v0p0e0-eXkXrXaXmXlXsXfXwX where X is comma-separated %02X. */
 static int do_input_entry(const char *filename, void *symval,
                           char *alias)
 {
@@ -779,7 +779,6 @@ static int do_input_entry(const char *filename, void *symval,
         DEF_FIELD_ADDR(symval, input_device_id, sndbit);
         DEF_FIELD_ADDR(symval, input_device_id, ffbit);
         DEF_FIELD_ADDR(symval, input_device_id, swbit);
-        DEF_FIELD_ADDR(symval, input_device_id, propbit);
 
         sprintf(alias, "input:");
 
@@ -817,9 +816,6 @@ static int do_input_entry(const char *filename, void *symval,
         sprintf(alias + strlen(alias), "w*");
         if (flags & INPUT_DEVICE_ID_MATCH_SWBIT)
                 do_input(alias, *swbit, 0, INPUT_DEVICE_ID_SW_MAX);
-        sprintf(alias + strlen(alias), "pr*");
-        if (flags & INPUT_DEVICE_ID_MATCH_PROPBIT)
-                do_input(alias, *propbit, 0, INPUT_DEVICE_ID_PROP_MAX);
         return 1;
 }
 ADD_TO_DEVTABLE("input", input_device_id, do_input_entry);