snowball/igloo-kernel.git/lib, branch KNOWN_GOOD

Merge branch 'upstream/linaro.38' into linaro-android.38

2011-03-18T23:59:38+00:00

Resolved Conflicts: drivers/mmc/core/sdio.c

Merge commit 'v2.6.38-rc7' into android-2.6.38

2011-03-07T19:51:03+00:00

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

2011-03-03T23:43:15+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits) MAINTAINERS: Add Andy Gospodarek as co-maintainer. r8169: disable ASPM RxRPC: Fix v1 keys AF_RXRPC: Handle receiving ACKALL packets cnic: Fix lost interrupt on bnx2x cnic: Prevent status block race conditions with hardware net: dcbnl: check correct ops in dcbnl_ieee_set() e1000e: disable broken PHY wakeup for ICH10 LOMs, use MAC wakeup instead igb: fix sparse warning e1000: fix sparse warning netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values dccp: fix oops on Reset after close ipvs: fix dst_lock locking on dest update davinci_emac: Add Carrier Link OK check in Davinci RX Handler bnx2x: update driver version to 1.62.00-6 bnx2x: properly calculate lro_mss bnx2x: perform statistics "action" before state transition. bnx2x: properly configure coefficients for MinBW algorithm (NPAR mode). bnx2x: Fix ethtool -t link test for MF (non-pmf) devices. bnx2x: Fix nvram test for single port devices. ...

net: fix nla_policy_len to actually _iterate_ over the policy

2011-02-28T20:38:25+00:00

Currently nla_policy_len always returns n * NLA_HDRLEN: It loops, but does not advance it's iterator. NLA_UNSPEC == 0 does not contain a .len in any policy. Trivially fixed by adding p++. Signed-off-by: Lars Ellenberg Signed-off-by: David S. Miller

swiotlb: fix wrong panic

2011-02-25T23:07:36+00:00

swiotlb's map_page wrongly calls panic() when it can't find a buffer fit for device's dma mask. It should return an error instead. Devices with an odd dma mask (i.e. under 4G) like b44 network card hit this bug (the system crashes): http://marc.info/?l=linux-kernel&m=129648943830106&w=2 If swiotlb returns an error, b44 driver can use the own bouncing mechanism. Reported-by: Chuck Ebbert Signed-off-by: FUJITA Tomonori Tested-by: Arkadiusz Miskiewicz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

Merge commit 'v2.6.38-rc6' into android-2.6.38

2011-02-23T22:44:17+00:00

Conflicts: drivers/rtc/Kconfig Change-Id: I7c1b1711311c008c378774cce1c80bc265f9b0a9

Expand CONFIG_DEBUG_LIST to several other list operations

2011-02-18T19:32:28+00:00

When list debugging is enabled, we aim to readably show list corruption errors, and the basic list_add/list_del operations end up having extra debugging code in them to do some basic validation of the list entries. However, "list_del_init()" and "list_move[_tail]()" ended up avoiding the debug code due to how they were written. This fixes that. So the _next_ time we have list_move() problems with stale list entries, we'll hopefully have an easier time finding them.. Signed-off-by: Linus Torvalds

m68knommu: Remove dependencies on nonexistent M68KNOMMU

2011-02-08T05:07:44+00:00

M68KNOMMU is set nowhere. Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Ungerer

Allow CONFIG_STACKTRACE to be enabled by itself.

2011-02-02T19:19:14+00:00

This allows us to get a kernel stacktrace for a thread though /proc. Also enable it by default. Change-Id: If8c21cd02feaf9863f4841ace524fa30c7328d49 Signed-off-by: Arve Hjønnevåg

Export the augmented rbtree helper functions

2011-01-28T02:16:59+00:00

The augmented rbtree helper functions are not exported to modules right now. (We have started using augmented rbtrees in the upcoming version of drbd.) Signed-off-by: Andreas Gruenbacher Signed-off-by: Linus Torvalds