Enable audit and auditsyscall.  Needed for 4.3
Signed-off-by: scott <scott@ubuntu.com>
Enable trim in lvm
Signed-off-by: scott <scott@ubuntu.com>
Revert another samsung change to mmc/chip/block.c

Change-Id: Ie2fbe3d5a089735533ce411146c9f8220378e7bf
[sd/mmc] remove atheros stuff, which doesn't apply to us.

Change-Id: I73373dff6075cfdd723a48915c2f82cbf096fbdd
[sd/mmc] make core/core.c a bit quieter

Change-Id: I8b73f32de5eefada6fc342c572450513f8280e0d
Screw it. Use aries sd/mmc code.

This fixes my problem where when all devices are disabled, the phone
will lock up on suspend.

Change-Id: I5ad02a544f96c68de378dc5c401716d1f5a77c04
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	drivers/mmc/core/core.c
	drivers/mmc/host/sdhci.c
use wifi from 1.15.15
Signed-off-by: scott <scott@ubuntu.com>
remove legacy code
Signed-off-by: scott <scott@ubuntu.com>
switch drivers again.
Signed-off-by: scott <scott@ubuntu.com>
net/wireless: Support to disable CCK rate for management frame

Provision to distinguish the P2P scan and the normal scan
with no_cck flag and thus disable the 11b rates for
p2p scan.

Signed-off-by: Sunil Dutt Undekari<duttus@codeaurora.org>
(cherry picked from commit 08166fc6f488afef37101a63881ec01613971952)

Change-Id: I4490982a7e6c8f99851b84081cb718b6b8541721
Signed-off-by: Gopal G Goberu <ggober@codeaurora.org>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	include/linux/nl80211.h
	net/wireless/nl80211.c
nl80211: Add probe response offload attribute

Notify user-space about probe-response offloading support in the driver.
A wiphy flag is used to indicate support and a bitmap of protocols
determines which protocols are supported.

Change-Id: I13b16c71449ab61f4308b6caa1cca35529f905b4
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	include/net/cfg80211.h
nl80211/cfg80211: Add crypto settings into NEW_BEACON

This removes need from drivers to parse the beacon tail/head data
to figure out what crypto settings are to be used in AP mode in case
the Beacon and Probe Response frames are fully constructed in the
driver/firmware.

nl80211/cfg80211: Allow SSID to be specified in new beacon command

This makes it easier for drivers that generate Beacon and Probe Response
frames internally (in firmware most likely) in AP mode.

nl80211/cfg80211: Add extra IE configuration to AP mode setup

The NL80211_CMD_NEW_BEACON command is, in practice, requesting AP mode
operations to be started. Add new attributes to provide extra IEs
(e.g., WPS IE, P2P IE) for drivers that build Beacon, Probe Response,
and (Re)Association Response frames internally (likely in firmware).

Change-Id: Ib91cd3fa2bad68e3724db98985e3f3bac72715f0
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	include/linux/nl80211.h
	net/wireless/nl80211.c
cfg80211: Validate cipher suite against supported ciphers

Instead of using a hardcoded list of cipher suites in nl80211.c, use a
shared function in util.c to verify that the driver advertises support
for the specified cipher. This provides more accurate validation of the
values and allows vendor-specific cipher suites to be added in drivers.

Signed-off-by: Jack Cheung <jackc@codeaurora.org>
(cherry picked from commit 976d06b486373ade56494e7ad41660e5db24f6bf)

Change-Id: I8d1494892cc6c3528b5aeae01d5e526602d72d8f
Signed-off-by: Srivalli Oguri <oguri@codeaurora.org>
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	net/wireless/nl80211.c
switch back to bcmdhd_samsung again.. and rename from 4330 to dhd.
Signed-off-by: scott <scott@ubuntu.com>
missed a rename file
Signed-off-by: scott <scott@ubuntu.com>
force reload of first item in hlist_nulls for each_entry_rcu
Signed-off-by: scott <scott@ubuntu.com>
snmp: add align parameter to snmp_mib_init()

In preparation for 64bit snmp counters for some mibs,
add an 'align' parameter to snmp_mib_init(), instead
of assuming mibs only contain 'unsigned long' fields.

Callers can use __alignof__(type) to provide correct
alignment.

(cherry picked from commit 214902264ff5457da4f07d8ab23967dc0cbfe451)

Change-Id: I4a9e40c5c9f25ea3bb8aaeaab149349d54d3d5dd
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
CC: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
CC: Vlad Yasevich <vladislav.yasevich@hp.com>

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: Jessica Gonzalez  <jgaona@codeaurora.org>
snmp: 64bit ipstats_mib for all arches

/proc/net/snmp and /proc/net/netstat expose SNMP counters.

Width of these counters is either 32 or 64 bits, depending on the size
of "unsigned long" in kernel.

This means user program parsing these files must already be prepared to
deal with 64bit values, regardless of user program being 32 or 64 bit.

This patch introduces 64bit snmp values for IPSTAT mib, where some
counters can wrap pretty fast if they are 32bit wide.

    InOctets: 244068329096
    OutOctets: 244069348848

Change-Id: I4387c4529fd49bd380330c429a87b4452be041fb
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
net: Introduce u64_stats_sync infrastructure

To properly implement 64bits network statistics on 32bit or 64bit hosts,
we provide one new type and four methods, to ease conversions.

Stats producer should use following template granted it already got an
exclusive access to counters (include/linux/u64_stats_sync.h contains
some documentation about details)

    u64_stats_update_begin(&stats->syncp);
    stats->bytes64 += len;
    stats->packets64++;
    u64_stats_update_end(&stats->syncp);

While a consumer should use following template to get consistent
snapshot :

    u64 tbytes, tpackets;
    unsigned int start;

    do {
        start = u64_stats_fetch_begin(&stats->syncp);
        tbytes = stats->bytes64;
        tpackets = stats->packets64;
    } while (u64_stats_fetch_retry(&stats->lock, syncp));

Suggested by David Miller, and comments courtesy of Nick Piggin.

(cherry picked from commit dbb6777afc9e1ae3037c68c494ae709b48b01295)

Change-Id: I8ba2977f2327470bbbdc9bfa51b5a606f9e61134
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
net: u64_stats_sync improvements

- Add a comment about interrupts:

6) If counter might be written by an interrupt, readers should block
interrupts.

- Fix a typo in sample of use.

(cherry picked from commit f842d69ef113da9977159a80ed60397b21384860)

Change-Id: If50ebe6635ec3ddc8caefdebba05b228a54c18d0
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>