]>
Commit | Line | Data |
---|---|---|
08aa9d92 | 1 | --- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100 |
2 | +++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100 | |
3 | @@ -15,7 +15,8 @@ | |
4 | #include <stdio.h> | |
5 | #include <ctype.h> | |
6 | #include "modpost.h" | |
7 | -#include "../../include/generated/autoconf.h" | |
8 | +// PLD architectures don't use CONFIG_SYMBOL_PREFIX | |
9 | +//#include "../../include/generated/autoconf.h" | |
10 | #include "../../include/linux/license.h" | |
11 | ||
12 | /* Some toolchains use a `_' prefix for all user symbols. */ | |
13 | ||
2136e199 AM |
14 | --- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200 |
15 | +++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200 | |
16 | @@ -9,6 +9,12 @@ | |
17 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | |
18 | if [ $? -eq 0 ]; then | |
19 | echo "-l${lib}" | |
20 | + for libt in tinfow tinfo ; do | |
21 | + $cc -print-file-name=lib${libt}.${ext} | grep -q / | |
22 | + if [ $? -eq 0 ]; then | |
23 | + echo "-l${libt}" | |
24 | + fi | |
25 | + done | |
26 | exit | |
27 | fi | |
28 | done | |
44c0f99c | 29 | |
59e60efc AM |
30 | diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c |
31 | index 7a0c800..ec5ebbb 100644 | |
32 | --- a/drivers/net/ethernet/realtek/r8169.c | |
33 | +++ b/drivers/net/ethernet/realtek/r8169.c | |
514e5dae | 34 | @@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const |
59e60efc AM |
35 | for (i = 0; i < ETH_ALEN; i++) |
36 | dev->dev_addr[i] = RTL_R8(MAC0 + i); | |
514e5dae | 37 | |
59e60efc AM |
38 | + if (!is_valid_ether_addr(dev->dev_addr)) { |
39 | + /* Report it and use a random ethernet address instead */ | |
40 | + netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr); | |
41 | + random_ether_addr(dev->dev_addr); | |
42 | + netdev_info(dev, "Using random MAC address: %pM\n", | |
514e5dae | 43 | + dev->dev_addr); |
59e60efc | 44 | + } |
514e5dae | 45 | + |
59e60efc | 46 | SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops); |
514e5dae AM |
47 | dev->watchdog_timeo = RTL8169_TX_TIMEOUT; |
48 | ||
18ae0784 JR |
49 | commit 8efb88340e29293e05f6b498b60596884c05a8a8 |
50 | Author: J. Bruce Fields <bfields@redhat.com> | |
51 | Date: Mon Jul 8 13:44:45 2013 -0400 | |
52 | ||
53 | svcrpc: fix failures to handle -1 uid's | |
54 | ||
55 | As of f025adf191924e3a75ce80e130afcd2485b53bb8 "sunrpc: Properly decode | |
56 | kuids and kgids in RPC_AUTH_UNIX credentials" any rpc containing a -1 | |
57 | (0xffff) uid or gid would fail with a badcred error. | |
58 | ||
59 | Commit afe3c3fd5392b2f0066930abc5dbd3f4b14a0f13 "svcrpc: fix failures to | |
60 | handle -1 uid's and gid's" fixed part of the problem, but overlooked the | |
61 | gid upcall--the kernel can request supplementary gid's for the -1 uid, | |
62 | but mountd's attempt write a response will get -EINVAL. | |
63 | ||
64 | Symptoms were nfsd failing to reply to the first attempt to use a newly | |
65 | negotiated krb5 context. | |
66 | ||
67 | Reported-by: Sven Geggus <lists@fuchsschwanzdomain.de> | |
68 | Tested-by: Sven Geggus <lists@fuchsschwanzdomain.de> | |
69 | Signed-off-by: J. Bruce Fields <bfields@redhat.com> | |
70 | ||
71 | diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c | |
72 | index a98853d..621ca7b 100644 | |
73 | --- a/net/sunrpc/svcauth_unix.c | |
74 | +++ b/net/sunrpc/svcauth_unix.c | |
75 | @@ -493,8 +493,6 @@ static int unix_gid_parse(struct cache_detail *cd, | |
76 | if (rv) | |
77 | return -EINVAL; | |
78 | uid = make_kuid(&init_user_ns, id); | |
79 | - if (!uid_valid(uid)) | |
80 | - return -EINVAL; | |
81 | ug.uid = uid; | |
82 | ||
83 | expiry = get_expiry(&mesg); |