Merge tag 'nand/fixes-for-4.12-rc3' of git://git.infradead.org/linux-mtd into MTD

From Boris:
"""
This pull request contains several fixes to the core and the tango
driver.

tango fixes:
 * Add missing MODULE_DEVICE_TABLE() in tango_nand.c
 * Update the number of corrected bitflips

core fixes:
 * Fix a long standing memory leak in nand_scan_tail()
 * Fix several bugs introduced by the per-vendor init/detection
   infrastructure (introduced in 4.12)
 * Add a static specifier to nand_ooblayout_lp_hamming_ops definition
"""

1 files changed, 7 insertions, 2 deletions

diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
index 378850c70eb8..2431c0321b71 100644
--- a/samples/bpf/xdp1_user.c
+++ b/samples/bpf/xdp1_user.c
@@ -62,13 +62,14 @@ static void usage(const char *prog)
         fprintf(stderr,
                 "usage: %s [OPTS] IFINDEX\n\n"
                 "OPTS:\n"
-                "    -S    use skb-mode\n",
+                "    -S    use skb-mode\n"
+                "    -N    enforce native mode\n",
                 prog);
 }
 
 int main(int argc, char **argv)
 {
-        const char *optstr = "S";
+        const char *optstr = "SN";
         char filename[256];
         int opt;
 
@@ -77,6 +78,9 @@ int main(int argc, char **argv)
                 case 'S':
                         xdp_flags |= XDP_FLAGS_SKB_MODE;
                         break;
+                case 'N':
+                        xdp_flags |= XDP_FLAGS_DRV_MODE;
+                        break;
                 default:
                         usage(basename(argv[0]));
                         return 1;
@@ -102,6 +106,7 @@ int main(int argc, char **argv)
         }
 
         signal(SIGINT, int_exit);
+        signal(SIGTERM, int_exit);
 
         if (set_link_xdp_fd(ifindex, prog_fd[0], xdp_flags) < 0) {
                 printf("link set xdp fd failed\n");