This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, mainline has been updated
3c92ec8 Merge branch 'next' of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
c4c9f01 net: ehea NAPI interface cleanup fix
bf66542 cifs: update for new IP4/6 address printing
d05a788 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
96faec9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
2926328 Merge
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram
54d2f64 Merge branch 'next' into for-linus
ca9153a powerpc/44x: Support 16K/64K base page sizes on 44x
6ca4f74 powerpc: Force memory size to be a multiple of PAGE_SIZE
541ef5c Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
0191b62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
54a696b Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
1d248b2 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
1db2a5c Merge branch 'for-linus' of
git://git390.osdl.marist.edu/pub/scm/linux-2.6
a39b863 Merge branch 'sched-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
b0f4b28 Merge branch 'tracing-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
be9c5ae Merge branch 'x86-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
bb26c6c Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
e14e61e Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
cb10ea5 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
81d6e59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
aa6eeee m68k: use the new byteorder headers
7f877eb fbcon: Protect free_irq() by MACH_IS_ATARI check
79f0c9a fbcon: remove broken mac vbl handler
646819e m68k: fix trigraph ignored warning in setox.S
3839d01 macfb annotations and compiler warning fix
746e8d3 m68k: mac baboon interrupt enable/disable
429dbf5 m68k: machw.h cleanup
4a97359 m68k: Mac via cleanup and commentry
40f7f9c m68k: Reinstate mac rtc
eb56092 net: Allow dependancies of FDDI & Tokenring to be modular.
8d25332 igb: Fix build warning when DCA is disabled.
2d5451d net: Fix warning fallout from recent NAPI interface changes.
0da2afd gro: Fix potential use after free
8438134 sfc: If AN is enabled, always read speed/duplex from the AN
advertising bits
f4bd954 sfc: When disabling the NIC, close the device rather than
unregistering it
307505e sfc: SFT9001: Add cable diagnostics
1796721 sfc: Add support for multiple PHY self-tests
2ef3068 sfc: Merge top-level functions for self-tests
a5692e4 sfc: Clean up PHY mode management in loopback self-test
caa8d8b sfc: Fix unreliable link detection in some loopback modes
6977dc6 sfc: Generate unique names for per-NIC workqueues
e727149 802.3ad: use standard ethhdr instead of ad_header
e4ac432 802.3ad: generalize out mac address initializer
7addeef 802.3ad: initialize ports LACPDU from const initializer
87f422f 802.3ad: remove typedef around ad_system
1624db7 802.3ad: turn ports is_individual into a bool
f48127b 802.3ad: turn ports is_enabled into a bool
d238d45 802.3ad: make ntt bool
d3fa472 ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
7adf152 ixgbe: Fix NAPI enable/disable path when using DCB
d7b0663 net: Init NAPI dev_list on napi_del
26bc19e igb: re-order queues to support cleaner use of ivar on 82576
0e014cb igb: defeature tx head writeback
f2712fd ipsec: Remove useless ret variable
fdb614c ucc_geth: Eliminate the need for forward references
9c54004 atm: Driver for Solos PCI ADSL2+ card.
236b87c gigaset: ifdef cleanup
c8770dc gigaset: use pr_err() and pr_info()
4d8cd00 cxgb3: add control to access embedded images
6dd0148 drivers/net/wireless/prism54: fix sparse warnings: make symbols static
a3d1fd2 drivers/net/wireless/ipw2x00: fix sparse warnings: make symbols static
11ab72a drivers/net/wireless/b43: fix sparse warnings: make symbols static
bf512bc drivers/net/wireless/ath9k: fix sparse warnings: make symbols static
2ed5ba8 drivers/net/wireless: fix sparse warnings: make symbols static
62c5345 drivers/net/wan/z85230.c: fix sparse warnings: un-EXPORT symbols
7b3dfa1 drivers/net/wan: fix sparse warning: make symbol static
d157e02 drivers/net/wan: fix sparse warnings: make do-while a compound
statement
ec1d1eb drivers/net/tulip: fix sparse warnings: make do-while a compound
statement
27cd6ae drivers/net/tokenring: fix sparse warnings: make symbols static
409b204 drivers/net/skfp: fix sparse warnings: make symbols static
2f22d22 drivers/net/qlge: fix sparse warnings: make symbols static
f8057b7 drivers/net/netxen: fix sparse warnings: use NULL pointer instead of
plain integer
e855aac drivers/net/ixgbe: fix sparse warnings: make symbols static
0e49e64 drivers/net/irda: fix sparse warnings: make symbols static
678c610 drivers/net/igb: remove dead code (function 'igb_read_pci_cfg')
5e4232e drivers/net/enic: fix sparse warning: make symbol static
fa4c16d drivers/net/e1000e: fix sparse warnings: make symbols static
af8eca5 drivers/net/cxgb3: comment out dead code
b06715b drivers/net/bonding: fix sparse warnings: move decls to header file
9dc20f5 drivers/net/atlx: fix sparse warnings: make symbols static
888432f drivers/net/arcnet: fix sparse warnings: make symbols static
dac499f drivers/net: fix sparse warnings: make symbols static
a08b32d drivers/net: fix sparse warning: returning void-valued expression
e4c3c13 drivers/net: fix sparse warnings: make do-while a compound statement
2705d4f drivers/net: fix sparse warning: use ANSI-style function declaration
d76e56b ehea: use get_zeroed_page for alignment-sensitive allocation
359d67d [CIFS] Remove redundant test
c6fbba0 [CIFS] make sure that DFS pathnames are properly formed
ac6a3ef Remove an already-checked error condition in SendReceiveBlockingLock
698e96a Streamline SendReceiveBlockingLock: Use "goto out:" in an error
condition
17c8bfe Streamline SendReceiveBlockingLock: Use "goto out:" in an error
condition
2b2bdfb [CIFS] Streamline SendReceive[2] by using "goto out:" in an error
condition
8e4f2e8 Slightly streamline SendReceive[2]
829049c Check the return value of cifs_sign_smb[2]
4c3130e [CIFS] Cleanup: Move the check for too large R/W requests
27a97a6 [CIFS] Slightly simplify wait_for_free_request(), remove an
unnecessary "else" branch
8fbbd36 Simplify allocate_mid() slightly: Remove some unnecessary "else"
branches
6d9c6d5 [CIFS] In SendReceive, move consistency check out of the mutexed
region
00e485b cifs: store password in tcon
4e53a3f cifs: have calc_lanman_hash take more granular args
55162de cifs: zero out session password before freeing it
8570552 cifs: fix wait_for_response to time out sleeping processes correctly
8be0ed4 [CIFS] Can not mount with prefixpath if root directory of share is
inaccessible
61e7480 [CIFS] various minor cleanups pointed out by checkpatch script
3de2091 [CIFS] fix typo
acc18aa [CIFS] remove sparse warning
13a6e42 [CIFS] add mount option to send mandatory rather than advisory locks
d5c5605 cifs: make ipv6_connect take a TCP_Server_Info arg
bcf4b10 cifs: make ipv4_connect take a TCP_Server_Info arg
7586b76 cifs: don't declare smb_vol info on the stack
63c038c cifs: move allocation of new TCP_Server_Info into separate function
8ecaf67 cifs: account for IPv6 in ses->serverName and clean up netbios name
handling
954d7a1 cifs: make dnotify thread experimental code
72ca545 cifs: convert tcpSem to a mutex
0468a2c cifs: take module reference when starting cifsd
8090902 cifs: display addr and prefixpath options in /proc/mounts
24b9b06 cifs: remove unused SMB session pointer from struct mid_q_entry
26c743b mlx4_en: Remove pauses module parameters.
60b9f9e mlx4_en: Removed Interrupt moderation module parameters
c03ea21 mlx4_en: Removed redundant cq->armed flag
48374dd mlx4_en: Removed TX locking when polling TX cq
b51968d mlx4_en: Memory leak on completion queue free
e74b3f7 Merge branch 'for-david' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
13e620e myri10ge: update driver version to 1.4.4-1.395
e92df28 myri10ge: update firmware headers to 1.4.37
36994a0 forcedeth: don't poll NV event 36
88a44e5 net/appletalk: Remove redundant test
c14ea0c drivers/net/wan: Remove redundant test
90f5dfc drivers/net: Remove redundant test
662f44a drivers/net/ehea: Remove redundant test
b0fd0d2 drivers/net/au1000_eth.c: Remove redundant test
c062076 qlge: ql_adapter_down() typo
619e803 netlink: fix (theoretical) overrun in message iteration
64ff3b9 tcp: Always set urgent pointer if it's beyond snd_nxt
8510b93 sctp: Add validity check for SCTP_PARTIAL_DELIVERY_POINT socket option
9fcb95a sctp: Avoid memory overflow while FWD-TSN chunk is received with bad
stream ID
aea3c5c sctp: Implement socket option SCTP_GET_ASSOC_NUMBER
ea686a2 sctp: Fix a typo in socket.c
e89c209 sctp: Bring SCTP_MAXSEG socket option into ietf API extension
compliance
161c8d2 net: PHYLIB mdio fixes #2
f7d1b9f vlan: fix convertion to net_device_ops
d452273 smsc911x: fix platform resource call during module unload
dc26977 smsc911x: don't clobber driver_data
7091e72 netns: igmp: make /proc/net/{igmp,mcfilter} per netns
b4ee07d netns: igmp: allow IPPROTO_IGMP sockets in netns
cb5b04f smsc911x: make smsc911x_ethtool_ops constant
631b756 smsc911x: convert driver to use net_device_ops
dd04519 smsc911x: fix BUG if module is removed while interface is up
4e20228 Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core
cef7125 [S390] provide documentation for hvc_iucv kernel parameter.
2a7c6f2 [S390] convert ctcm printks to dev_xxx and pr_xxx macros.
ecf39d4 [S390] convert zfcp printks to pr_xxx macros.
5466c2e [S390] convert vmlogrdr printks to pr_xxx macros.
17159dc6 [S390] convert zfcp dumper printks to pr_xxx macros.
395d31d [S390] convert cpu related printks to pr_xxx macros.
74eacdb [S390] convert qeth printks to dev_xxx and pr_xxx macros.
b3ff088 [S390] convert sclp printks to pr_xxx macros.
8f7c502 [S390] convert iucv printks to dev_xxx and pr_xxx macros.
136f7a1 [S390] convert ap_bus printks to pr_xxx macros.
93098bf [S390] convert dcssblk and extmem printks messages to pr_xxx macros.
1519c0c [S390] convert monwriter printks to pr_xxx macros.
c5612c1 [S390] convert s390 debug feature printks to pr_xxx macros.
a4f5a29 [S390] convert monreader printks to pr_xxx macros.
e7534b0 [S390] convert appldata printks to pr_xxx macros.
3b6ed4a [S390] convert setup printks to pr_xxx macros.
f55495b [S390] convert hypfs printks to pr_xxx macros.
feab650 [S390] convert time printks to pr_xxx macros.
39f0939 [S390] convert cpacf printks to pr_xxx macros.
e6d5a42 [S390] convert cio printks to pr_xxx macros.
80a5c36 [S390] convert vmur printks to pr_xxx macros.
2f526e5 [S390] convert cpcmd printks to pr_xxx macros.
c99fc5d [S390] convert lcs printks to dev_xxx and pr_xxx macros.
8988e58 [S390] convert vmcp printks to pr_xxx macros.
d1c2f89 [S390] convert xpram printks to pr_xxx macros.
acfa922 [S390] s390: Remove redundant test
0946100 [S390] s390/setup: set default preferred console device "ttyS"
21e7b2c [S390] drivers/s390/crypto: Move dereference to after IS_ERR test
33b1d09 [S390] panic_stack leak in smp_alloc_lowcore
4f7e90d [S390] clear_table inline assembly contraints
c185b78 [S390] Remove config options.
349f1b6 [S390] cpu topology: remove dead code
2b1a61f [S390] cpu topology: introduce kernel parameter
9fee8db [S390] add new machine types to setup_hwcaps.
c58d92b [S390] Remove initial kernel stack backchain initialization.
64253ac [S390] s390: use the new byteorder headers
e37f50e [S390] Add processor type march=z10 and a processor type safety check.
b3b59d3 [S390] sclp vt220: fix compile warning
2d6cd2a [S390] remove warnings with functions ending in BUG
edd5378 [S390] mark disabled_wait as noreturn function
d36f0c6 [S390] cio: use pim to check for multipath.
f444cc0 [S390] cio: commit all pmcw changes.
13952ec [S390] cio: introduce cio_commit_config
cdb912a [S390] cio: introduce cio_update_schib
d6a3076 [S390] cio: Use device_is_registered().
283fdd0 [S390] cio: Dont call ->release directly.
90ed2b6 [S390] cio: Dont fail probe for I/O subchannels.
5fb6b85 [S390] cio: Only register ccw_device for registered subchannel.
6eff208 [S390] cio: Fix I/O subchannel refcounting.
9cd6742 [S390] cio: Fix reference counting for online/offline.
97166f5 [S390] cio: Put referernce on correct device after moving.
c619d42 [S390] cio: fix ccwgroup online vs. ungroup race condition
111e95a [S390] cio: move irritating comment.
d7b6048 [S390] cio: update sac values
191fd44 [S390] cio: get rid of compile warning
547e3ce [S390] remove ptrace warning on 31 bit.
32272a2 [S390] __page_to_pfn warnings
91d5d45 [S390] iucv: Locking free version of iucv_message_(receive|send)
44a01d5 [S390] s390/hvc_console: z/VM IUCV hypervisor console support
5d360a7 [S390] ftrace: function tracer backend for s390
98df67b [S390] struct device - replace bus_id with dev_name(), dev_set_name()
0cd4bd4 [S390] dasd: call cleanup_cqr with request_queue_lock
50afd20 [S390] dasd: correct sense byte condition for SIM
faf16aa [S390] dasd: Use accessors instead of using driver_data directly.
2bf373b [S390] dasd: improve dasd statistics proc interface
bd43a42 [S390] zfcp: Report microcode level through service level interface
6bcac50 [S390] service level interface.
7a0b4cb [S390] qdio: fix error reporting for hipersockets
50f769d [S390] qdio: improve inbound buffer acknowledgement
22f9934 [S390] qdio: rework debug feature logging
9a1ce28 [S390] qdio: fix compile warning under 31 bit
23589d0 [S390] qdio: add eqbs/sqbs instruction counters
bbd50e1 [S390] qdio: fix qeth port count detection
43c207e6 [S390] ap: Minor code beautification.
cb17a63 [S390] zcrypt: Use of Thin Interrupts
320c04c [S390] Move stfle to header file.
ca9fc75 [S390] convert s390 to generic IPI infrastructure
0b3016b [S390] serialize stp/etr work
750887d [S390] convert etr/stp to stop_machine interface
b020632 [S390] introduce vdso on s390
fc5243d [S390] arch_setup_additional_pages arguments
a114a9d [S390] vmcp: remove BKL
f414f5f [S390] cpu topology: dont destroy cpu sets on topology change
8f2961c [S390] audit: get s390 ret_from_fork in sync with other architectures
5439050 [S390] cpu topology: fix cpu_core_map initialization
5250d32 Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and
'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core
468a15b sched, trace: update trace_sched_wakeup()
a3eeeef Merge branch 'x86/tsc' into tracing/core
79a66b9 Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into
x86/core
1fcccb0 x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
5ce442f Merge branch 'topic/udev-id-rename' into to-push
60cda2b Merge branch 'topic/sound-core-fix' into to-push
9649745 Merge branch 'topic/snd-hrtimer' into to-push
a9c3c7e Merge branch 'topic/pcxhr-update' into to-push
cc49108 Merge branch 'topic/oxygen' into to-push
a802269 Merge branch 'topic/jack-mechanical' into to-push
a650562 Merge branch 'topic/hda' into to-push
313769d Merge branch 'topic/cs5535audio' into to-push
8afabfa Merge branch 'topic/convert-tasklet' into to-push
86b3aa3 Merge branch 'topic/ca0106' into to-push
e4456e7 Merge branch 'topic/audigy-capture-boost' into to-push
5c8261e Merge branch 'topic/asoc' into to-push
facef86 Merge branch 'topic/aoa' into to-push
0ca59dd tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
2a0d836 Merge branches 'cma', 'ehca', 'ipath', 'iser', 'mlx4' and 'nes' into
for-next
7798dbf IB/mlx4: Set ownership bit correctly when copying CQEs during CQ
resize
e189062 RDMA/nes: Remove tx_free_list
81ea714 smackfs: check for allocation failures in smk_set_access()
cbacc2c Merge branch 'next' into for-linus
0ee4a96 crypto: aes - Precompute tables
ca38a81 crypto: talitos - Ack done interrupt in isr instead of tasklet
bcf84a3 crypto: testmgr - Correct comment about deflate parameters
f0d1ec3 crypto: salsa20 - Remove private wrappers around various operations
ad79cdd crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
bd9d20d crypto: sha512 - Switch to shash
f9e2bca crypto: sha512 - Move message schedule W[80] to static percpu area
19e2bf1 crypto: michael_mic - Switch to shash
4946510 crypto: wp512 - Switch to shash
f63fbd3 crypto: tgr192 - Switch to shash
50e109b crypto: sha256 - Switch to shash
14b75ba crypto: md5 - Switch to shash
808a176 crypto: md4 - Switch to shash
54ccb36 crypto: sha1 - Switch to shash
3b8efb4 crypto: rmd320 - Switch to shash
d8a5e2e crypto: rmd256 - Switch to shash
e5835fb crypto: rmd160 - Switch to shash
7c4468b crypto: rmd128 - Switch to shash
d35d245 crypto: null - Switch to shash
3751f40 crypto: hash - Make setkey optional
b812eb0 crypto: testmgr - Validate output length in (de)compression tests
dad3df2 crypto: remove uses of __constant_{endian} helpers
664134d crypto: testmgr - Fix error flow of test_comp
5f459f0 crypto: hifn_795x - Use softirq kernel mapping in bh context
d6a10c8 crypto: hifn_795x - Fix queue management
3ec858d crypto: hifn_795x - Remove some unused cruft
ed4f92e crypto: hifn_795x - Fix queue processing
5df4c0c crypto: hifn_795x - Fix request context corruption
3416158 crypto: hifn_795x - Don't copy src sg list
75741a0 crypto: hifn_795x - Fix DMA setup
09fbf7c crypto: ansi_cprng - fix inverted DT increment routine
9302735 libcrc32c: Select CRYPTO in Kconfig
aa1a85d crypto: ansi_cprng - Avoid incorrect extra call to
_get_more_prng_bytes
31a61bf crypto: md4 - Use ARRAY_SIZE
0426c16 libcrc32c: Add crc32c_le macro
53b146a libcrc32c: Fix "crc32c undefined" compilation error
69c35ef libcrc32c: Move implementation to crypto crc32c
8e3ee85 crypto: crc32c - Test descriptor context format
b7e8bda crypto: crc32c-intel - Switch to shash
faccc4b crypto: crc32c - Switch to shash
5f7082e crypto: hash - Export shash through hash
67cd080 crypto: api - Call type show function before legacy for proc
dec8b78 crypto: hash - Add import/export interface
3b2f6df crypto: hash - Export shash through ahash
7b5a080b crypto: hash - Add shash interface
7b0bac6 crypto: api - Rebirth of crypto_alloc_tfm
4a77948 crypto: api - Move type exit function into crypto_tfm
2566578 crypto: ansi_cprng - Allow resetting of DT value
420a4b2 crypto: padlock - Avoid resetting cword on successive operations
1c06da8 crypto: crc32c-intel - Update copyright head
4b24ea9 crypto: talitos - Preempt overflow interrupts off-by-one fix
32bd78e crypto: camellia - use kernel-provided bitops, unaligned access
d12d6b6 crypto: testmgr - Trigger a panic when self test fails in FIPS mode
fe5720e crypto: talitos - Perform auth check in h/w if on sec 2.1 and above
1c2e881 crypto: talitos - Implement done interrupt mitigation
40405f1 crypto: talitos - Pass correct interrupt status to error handler
a44b56c crypto: hifn - Disable driver when physical size exceeds 32 bits
4a6908a Linux 2.6.28
67be403 Revert "x86: disable X86_PTRACE_BTS"
db8862e Merge branch 'linus' into tracing/hw-branch-tracing
c20137f Merge branch 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
1806f82 Merge branch 'x86-fixes-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2523659 Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
1f5175a RDMA/cma: Add IPv6 support
38617c6 RDMA/addr: Add support for translating IPv6 addresses
7645c4b Merge branch 'fix/hda' into topic/hda
574f3c4 ALSA: hda - Add missing terminators in patch_sigmatel.c
40f15ad x86: disable X86_PTRACE_BTS
c1c15b6 x86: PAT: fix address types in track_pfn_vma_new()
6332178 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
5289f46 parisc: disable UP-optimized flush_tlb_mm
8960223 Merge branch 'drm-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
d519c8d edac: fix edac core deadlock when removing a device
20ca9b3 cgroups: avoid accessing uninitialized data in failure path
e368d3a cgroups: suppress bogus warning messages
f00a189 w1: fix slave selection on big-endian systems
cc6c2ca rtc: rtc-isl1208: reject invalid dates
98db8df ring-buffer: prevent false positive warning
a8ccf1d ring-buffer: fix dangling commit race
bed4f13 Merge branch 'x86/irq' into x86/core
3e5621e Merge branch 'x86/iommu' into x86/core
be9a1d3 Merge branch 'x86/tsc' into x86/core
7e3cbc3 Merge branch 'x86/ptrace' into x86/tsc
fa623d1 Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature',
'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc',
'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io',
'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr',
'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace',
'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal',
'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
bf8bd66 Merge branch 'x86/apic' into x86/irq
1ccedb7 Merge commit 'v2.6.28-rc9' into x86/apic
231ffc9 V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to
VIDIOC_INT_RESET command
908a7a1 net: Remove unused netdev arg from some NAPI interfaces.
f8f50b1 powerpc/32: Wire up the trampoline code for kdump
ccdcef7 powerpc/32: Add the ability for a classic ppc kernel to be loaded at
32M
01695a9 powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
6f29c32 powerpc/32: Setup OF properties for kdump
7375331 powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
322b439 powerpc: Prepare xmon_save_regs for use with kdump
5be8554 powerpc: Remove default kexec/crash_kernel ops assignments
77733f8 powerpc: Make default kexec/crash_kernel ops implicit
2e8e4f5 powerpc: Setup OF properties for ppc32 kexec
b906cfa powerpc/pseries: Fix cpu hotplug
fad7b9b powerpc: Fix KVM build on ppc440
889bd9b net: startup race in hso driver
05a8c1c pkt_sched: Remove smp_wmb() in qdisc_watchdog()
4707470 r6040: bump release number to 0.19
3e7c469 r6040: save and restore MIER correctly in the interrupt routine
11e5e8f r6040: fix wrong logic in mdio code
5f2f6da net: Fix oops in dev_ifsioc()
adf77ba x86: prioritize the FPU traps for the error code
077ebed drm/radeon: fix correctness of irq_enabled check for radeon.
c47a75a Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
0099f77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
9ecab6e drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
def434c powerpc/cell: add QPACE as a separate Cell platform
e68558d powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
2e85696 Merge branch 'upstream' of
git://ftp.linux-mips.org/pub/scm/upstream-linus
7ef5f41 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
472346d ALSA: ASoC: fix a typo in omp-pcm.c
c691348 ASoC: Fix DSP formats in SSM2602 audio codec
bd25867 ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
f5eda57 mlx4_core: Delete incorrect comment
b8dd786 mlx4_core: Add support for multiple completion event vectors
59de580 sh: oprofile: Fix up the module build.
7d91fcf sh: add UIO support for JPU on SH7722.
b0c50ad serial: sh-sci: Fix up port pinmux for SH7366.
6f5cd2b sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
2ea40de sh: mach-sh03: Fix up pata_platform build breakage.
b5868e8 sh: enable deferred io LCDC on Migo-R
8564557 video: sh_mobile_lcdcfb deferred io support
37b4837 video: deferred io with physically contiguous memory
6e1038a video: deferred io cleanup
87884bd video: fix deferred io fsync()
0790555 sh: add LCDC interrupt configuration to AP325 and Migo-R
2540c11 sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
da9fdc8 sh: split coherent pages
78fb402 sh: dma: Kill off ISA DMA wrapper.
5d2685d sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
fe58cac sh: Kill off the unused SH_ALPHANUMERIC debug option.
740a3e6 sh: Enable skipping of bss on debug platforms for sh32 also.
8a65505 doc: Update sh cpufreq documentation.
0146d78 sh: mrshpc_setup_windows() needs to be inline.
1f6fd5c serial: sh-sci: sci_poll_get_char() is only used by
CONFIG_CONSOLE_POLL.
073da9c sh: Kill off cf-enabler with extreme prejudice.
8c197c3 sh: Add a simple edosk7705_defconfig for build testing.
866ef8f sh: mach-edosk7705: Fix up edosk7705 so it all builds again.
0ef0e6c sh: mach-microdev: Split out the fdc37c93xapm initialization code.
43eeb0f sh: mach-sh03: Use __set_io_port_base(), kill off special
ioport_map().
8db806e sh: mach-sh03: Move off of cf_enabler to pata_platform, as per
landisk.
98a955d sh: board-shmin: Convert shmin to use __set_io_port_base().
2125a46 sh: Kill off dead mv_init_pci() from machvec.
43f8f9b sh: Simplify kernel_thread_helper() for sh32.
7b80fb3 sh: Kill off mv_heartbeat() from the machvec.
b94ea27 sh: Kill off the cayman and microdev special heartbeat code.
ca0c14e44 sh: Kill off sh_bios_in_gdb_mode().
a9df1ed sh: export sh_bios_get_node_addr() symbol for stnic module.
8e32018 sh: Run sh_bios through a long overdue Lindent.
d570164 serial: sh-sci: Generalize port pin initialization.
d830fa4 serial: sh-sci: Tidy up fifo overrun error handling.
762c69e serial: sh-sci: pr_debug() -> dev_dbg() conversion.
027e687 serial: sh-sci: Fix up the cpufreq notifier to use the proper port
clock.
d9341b5 sh: oprofile: Convert op_model_sh7750 to new common interface.
40a8b42 sh: oprofile: Backtrace support.
60a51fb sh: oprofile: Refactor common setup code for multiple driver support.
70fe224 sh: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH machines
1a94757 sh: Convert Cayman boards from hw_interrupt_type to irq_chip
e85a477 sh: Convert Dreamcast support from hw_interrupt_type to irq_chip
bd0a22d sh: Convert SystemH board support from hw_interrupt_type to irq_chip
be729fd sh: Convert Microdev boards from hw_interrupt_type to irq_chip
180ae20 sh: Provide sdivsi3/udivsi3/udivdi3 for sh64, kill off libgcc linking.
209aa4f fb: SH-5 uses __raw I/O accessors now also, drop the special casing.
4466b20 sh: Add SH-5 optimized memcpy()/memset()/strcpy()/strlen().
776d6c2 sh: Kill off remaining CONFIG_SH_KGDB bits.
07d2a1a serial: sh-sci: Implement CONSOLE_POLL support and kill off old kgdb
console.
ab6e570 sh: Generic kgdb stub support.
d7b01f7 sh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that SH-5 supports it
too.
dd76279 sh: Provide linux/regset.h interface for SH-5.
94e2fb3 sh: Provide asm/syscall.h for SH-5.
6ac0343 sh: Handle cases where setup{_rt,}_frame() fail on SH-5 signal
delivery.
f15b2dc sh: Fix up syscall_get_nr() comment in syscall_32.h.
35724a0 sh: Fix up the cpu_asid() return value on nommu.
a99d6fd sh: Convert sh64 /proc/asids to debugfs and generic sh.
4d1f3bb sh: Kill off sh64's unused alloc/free_task_struct() definitions.
4eec883 sh: mach-migor: Kill off unused Migo-R machvec.
4545bfa sh: add ov772x reset delay on Migo-R
a6bc25a sh: Drop the special qemu defconfig.
bd40e81 sh: Delete unnecessary mov in the interrupt exception entry point.
06be372 sh: Fix an off-by-1 check in __mutex_fastpath_unlock().
a47925f sh: Update rsk701_defconfig to reflect mach-rsk changes.
ff15b90 sh: Enable leds-gpio in rsk7203 defconfig.
ea0aac1 sh: Consolidate rsk7203/7201 in to a new mach-rsk.
b5cfeac sh: Provide ftrace_make_call()/ftrace_make_nop().
4bc3e71 sh: Disable -Werror for arch/sh/oprofile/.
3b04122 sh: Add plain udivsi3 (not _i4*) for gcc-4.1 and lower.
1fdae0e Fix incorrect use of loose in c-checksum.c
77ba93a sh: Fix up the SH-4A mutex fastpath semantics.
c6f17cb sh: allow CONFIG_CPU_IDLE
af998a9 sh: allow CONFIG_PM
3e51762 sh: move the hp6xx pm code
0464518 sh: update se7343 defconfig
21c601b sh: remove ioport cruft and smc91x from se7343
5e5aacb sh: add isp1161 usb host device to se7343
6aacba7 sh: add st16c2550 devices to se7343
5727003 sh: fix number of interrupts on se7343
551ea2b sh: sh7343 scif configuration update
0c0daec sh: propagate r_clk
6feb348 sh: RSK+ 7201 board support.
2825999 sh: Add support for SH7201 CPU subtype.
135210b sh: Switch HD64461 from hw_interrupt_type to irq_chip
331ff10 sh: pci-sh7780: fix pci memory address mask
22f131a sh: Provide a dyn_arch_ftrace struct definition.
1da1180 sh: Split out the idle loop for reuse between _32/_64 variants.
eb67cf1 sh: Consolidate cpu_relax()/cpu_sleep() definitions across _32/_64.
f74c034 sh: do not latency trace idle.
75fd24c sh: Tidy up backtrace formatting with kallsyms disabled.
9cfc9a9 sh: Add a simple code dumper for SUPERH32 show_regs().
edfd6da sh: Add a few more branch types to the branch emulator.
5dd6147 sh: Re-add support for best fit ISA tuning if none is available.
624c6a6 sh: More movmem alias symbol exports for older compilers.
95b781c sh: Provide optimized unaligned loads on SH-4A.
716777d sh: P4 ioremap pass-through
0c91223 sh: Add SH-4A optimized fastpath mutex implementation.
5c72f30 sh: sh7760fb: Add support SH7720/SH7721 of Renesas
679dc3c sh: sh7760fb: Fix color pallette setting
f617682 sh: add SH DMAC burst mode constant
c2c5883 sh: fix DMAOR register access on SH7709
8085ac7 sh: Add platform-specific constants for SH7709
0d5bbe0 sh: Provide optimized non-atomic bitops for SH-2A.
8bcc5c1 sh: Add -m4al tuning for SH4AL-DSP.
9ef1002 sh: Add exports for __udivsi3/__sdivsi3 and the _i4 versions.
16b529d sh: Convert to generic bitops for IRQ-toggling implementation.
709420d sh: Specify sane default image targets for the SH-2 platforms.
1aad54a sh: Migrate necessary libgcc bits in to arch/sh/lib for SUPERH32.
e9bf51e sh: __udivdi3 -> do_div() in softfloat lib.
00e825c sh: Fix clock framework compiler warnings.
d643510 usb: Fix up sh_mobile usbf clock framework warnings.
e7c98dc serial: sh-sci: Codestyle cleanup patch.
af505b1 media: sh_mobile_ceu_camera: Add HAVE_CLK dependency.
fad57fe sh: dynamic ftrace support.
ef6aff6 sh: remove old sh_mobile mstpc clocks
b51339f sh: sh_mobile lcdc clock framework support
765786e sh: sh_mobile usb clock framework support
af5be79 sh: sh_mobile usbf clock framework support
a42b6dd sh: sh_mobile ceu clock framework support
090d951 sh: sh_mobile keysc clock framework support
a5616bd sh: sh_mobile i2c clock framework support
f2eb010 sh: sh_mobile mstpcr clocks for sh7366
6e88d03 sh: sh_mobile mstpcr clocks for sh7343
f14c017 sh: sh_mobile mstpcr clocks for sh7723
ecf399b sh: sh_mobile mstpcr clocks for sh7722
7c7e02a sh: new sh_mobile mstpcr clocks base code
1dc7b77 sh: use arch_flags for sh_mobile mstpcr clock bits
d902d04 sh: sh_mobile clock divider index fix
d12cfac sh: enable and disable clocks recursively
4a4a9be sh: Move arch_get_unmapped_area() in to arch/sh/mm/mmap.c.
ed2b03e MIPS: MIPS64R2: Fix buggy __arch_swab64
08d9d1c MIPS: Fix preprocessor warnings flaged by GCC 4.4
826e08b sched: fix warning in fs/proc/base.c
d3d3170 tg3: Update version to 3.97
aa10f27 tg3: tg3.h cleanups
69fc405 tg3: Remove unused cfgspc device members
027455a tg3: Cleanup IPV6 LSO
2023276 tg3: WOL fixes
7f3ff4f pkt_sched: Annotate uninitialized var in sfq_enqueue()
bfb8cc3 ixgbe: fix the display of DCB control stats in ethtool
f4314e8 net: add DCNA attribute to the BCN interface for DCB
1486a61 net: fix DCB setstate to return success/failure
c2da953 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
59f8500 Convert ixp4xx_eth driver to use net_device_ops.
4cb56b6 drivers/net/wan: Remove redundant test
93bc933 HDLC_PPP: Fix Configure-Ack to return original options as required by
the standard.
e6da96a IXP4xx: move common debugging from network drivers to QMGR module.
9251ce9 Update MAINTAINERS entries for IXP4xx and WAN network drivers.
f5b89e4 WAN: Add IXP4xx HSS HDLC driver.
490b772 IXP4xx: Add ethtool support to Ethernet driver.
4954936 IXP4xx: Add PHYLIB MII ioctl to the Ethernet driver.
2098c18 IXP4xx: Add PHYLIB support to Ethernet driver.
b4c7d3b IXP4xx: Make the Ethernet driver use built-in netdev stats.
3c36a83 IXP4xx: Silence section mismatch warning in Ethernet driver.
ae2754a IXP4xx: clear IRQ stat in qmgr_disable_irq().
3edcfb2 IXP4xx: check for queue being empty in qmgr_release_queue().
bba7ebb IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
139cdab IB/ehca: Remove redundant test of vpage
418441d powerpc/mpc5200: fix error paths in PSC UART probe function
aec739e powerpc/mpc5200: add rts/cts handling in PSC UART driver
b651498 powerpc/mpc5200: Make PSC UART driver update serial errors counters
e51f47a powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
6b61e69 powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
aaab5e8 powerpc/mpc5200: Disable bestcomm prefetching when ATA DMA enabled
e4efe3c powerpc/mpc5200: Bestcomm fixes to ATA support
6228824 powerpc/mpc5200: Bugfix on handling variable sized buffer descriptors
dd952cb powerpc/mpc5200: Make internal 5200 PIC the default interrupt
controller
bcb73f5 powerpc/mpc5200: Document and tidy irq driver
a149535 powerpc: Fix missing 'blr' in _tlbia()
3ddeb91 ftrace: enable format arguments checking
49e6e3f powerpc/bootwrapper: Use the child-bus #address-cells to decide which
range entry to use
e14d774 powerpc: Const-qualify Device Node Argument to DCR Resource Extent API
9dce3ce powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
64b3d0e powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
7752035 powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
760ec0e powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
2a4aca1 powerpc/mm: Split low level tlb invalidate for nohash processors
f048aac powerpc/mm: Add SMP support to no-hash TLB handling
7c03d65 powerpc/mm: Introduce MMU features
2ca8cf7 powerpc/mm: Rework context management for CPUs with no hash table
5e69661 powerpc/mm: Split mmu_context handling
6d2170b powerpc/4xx: Extended DCR support v2
fecba96 powerpc: Add reboot notifier to Collaborative Memory Manager
2218108 powerpc: Disable Collaborative Memory Manager for kdump
5d84e4b powerpc/iseries: viodasd needs to depend on CONFIG_BLOCK
368c1e3 hvc_console: Escape magic sysrq key
532774e powerpc: Pass a valid token to rtas_call() in phyp-dump code
7a2eab0 powerpc: Protect against NULL pointer deref in phyp-dump code
8168b54 powerpc: Rename struct vm_region to avoid conflict with NOMMU
13ba3c0 powerpc: Convert sysfs cache code to of_find_next_cache_node()
b2ea25b powerpc: Convert cpu_to_l2cache() to of_find_next_cache_node()
e523f72 powerpc: Add of_find_next_cache_node()
7498209 of/gpio: Implement of_gpio_count()
7736a3d of: of_parse_phandles_with_args() learns to differentiate 'hole' cells
c1bb7c6 of: Minor simplification for the of_parse_phandles_with_args()
74b7ff4 ALSA: hda: fix incorrect mixer index values for 92hd83xx
f8ccbf6 ALSA: hda: dinput_mux check
ebef7cf Merge branch 'topic/ca0106-spdif-stream' into topic/ca0106
6bcdbd5 Merge branch 'topic/ca0106-resume' into topic/ca0106
6a84364 Merge branch 'topic/ca0106-capture-no-44khz' into topic/ca0106
8326e32 Merge branch 'topic/hda-resume-fix' into topic/hda
55fa518 Merge branch 'topic/pcsp-fix' into topic/misc
69dfaef ALSA: hda - Add quirk for another HP dv7
a31501d ALSA: ASoC - Add missing __devexit annotation to wm8350.c
d6f8339 ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
9e03162 ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
a24f4f6 ALSA: ASoC: tlv320aic3x add dsp_a
07d8d9d ALSA: ASoC: DaVinci: document I2S limitations
69ab820 ALSA: ASoC: DaVinci: davinci-i2s clean up
21903c1 ALSA: ASoC: DaVinci: davinci-i2s clean up
664b4af ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
1152a19 ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
ff75427 ALSA: ca0106 - disable 44.1kHz capture
72077aa ALSA: ca0106 - Add missing card->private_data initialization
50232d6 ALSA: ca0106 - Check ac97 availability at PM
c5dee61 x86, bts: memory accounting
bf53de9 x86, bts: add fork and exit handling
67bac79 x86: PAT: pfnmap documentation update changes
34801ba x86: PAT: move track untrack pfnmap stubs to asm-generic
982d789 x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
d87fe66 x86: PAT: modify follow_phys to return phys_addr prot and return value
6bd9cd5 x86: PAT: clarify is_linear_pfn_mapping() interface
8403295 x86: ia32_signal: remove unnecessary declaration
34945ed x86: common.c boot_cpu_stack and boot_exception_stacks should be
static
7419224 SELinux: don't check permissions for kernel mounts
12204e2 security: pass mount flags to security_sb_kern_mount()
459c19f SELinux: correctly detect proc filesystems of the form "proc/foo"
9bb4824 allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
ad7a953 kbuild: strip generated symbols from *.ko
37a8d9f kbuild: simplify use of genksyms
9cf7f24 b43: Add key memory dumping
b929ecf b43: Suspend MAC while killing the radio
fd6effc ath5k: correct packet length in tx descriptors
520eb82 mac80211: implement dynamic power save
ce7c911 mac80211: track master queue status
e0cb686 mac80211: enable IEEE80211_CONF_PS only when associated
d10d0e5 b43: Fix some MAC locking
0e7690f iwlwifi: iwl-tx.c cleanup (remove unused parameter and unused local
variable).
be2864c ath9k: Fixed RX decryption status reporting
ea61213 ath9k: Fix key cache slot selection for splitmic
aa33de0 ath9k: Protect config() callback with a mutex
5e3f308 mac80211: Print unknown packet type in tasklet_handler
6110781 p54usb: bring first generation devices back to life
6ace289 ath9k: Key cache allocation for AP mode
f66000f ath9k: Fix a NULL pointer dereference in ath_rate_get
91f39e8 iwlwifi: indicate txpower is off in sysfs
f1bc4ac iwlwifi: use GFP_KERNEL to allocate Rx SKB memory
4087f6f iwlwifi: use meaningful vars in _iwl_poll_bit()
febf337 iwlwifi: remove useless goto
95aa194 iwlwifi: use type uint for module param debug
c3a739f iwlwifi: update comments on the debug interface
5c11ec6 iwlwifi: add line feed to printk
34c22cf iwlwifi: cleanup iwl-dev.h
1355412 mac80211: fix a typo in ieee80211_send_assoc() method.
73ec1cc iwlwifi: remove a parameter (dest) from *_fill_beacon_frame() methods.
ca8a856 ath9k: Move rate control alg register/unregister to appropriate place
9bf9fca ath9k: Synchronize DMA transfer with CPU at right place
f7a276a ath9k: Remove MAC header pad before reporting TX status
da027ca ath9k: Fix TX status reporting for retries and MCS index
8d6f658 mac80211: Remove radiotap rate-present flag for HT
d858822 rtl8187: Fix crash on unload when using SLUB debug
0a5ec96 p54: remove free_on_tx parameter
69ba3e5 p54: more accurate rssi to dBm conversion
da9f57e rtl8187: Fix error returns
2382792 libertas: use roundup instead of opencoding
ee370ce p54: update ACK failure statistic counter in real-time
54fdb04 p54: move statistic timer update routine into a workqueue
d5e4903 iwlagn: fix agn rate scaling
b8d476c mac80211: Send Layer 2 Update frame on reassociation
0fe45b1 ath5k: fix 802.11 header padding on RX, unpadding on TX
baad1d9 ath9k: Report HT rates in RX status
0fb8ca4 mac80211: Add HT rates into RX status reporting
9d8eed1 ath9k: Do not use association state to update rate table
094d05d mac80211: Fix HT channel selection
420e7fa nl80211: Add signal strength and bandwith to nl80211station info
a1d94aa kernel-doc: check for extra kernel-doc notations
eb63212 ALSA: hda - Power up always when no jack detection is available
213cc06 ftrace: introduce tracing_reset_online_cpus() helper
9158923 ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
6030634 Merge branch 'topic/hda-stac-fix' into topic/hda
7004305 Merge branch 'fix/asoc' into topic/asoc
d4d9cd03 ALSA: hda - Add probe_only option
7662453 ALSA: hda - Use more distinct name for a unique volume in STAC/IDT
c21ca4a ALSA: hda - Rework on STAC/IDT auto-configuration code
03c6901 Merge branch 'fix/hda' into topic/hda
8df0f70 ALSA: ca0106 - Fix typo in resume code
692f904 ALSA: hda - Fix HD-Audio.txt reference of model list
3d47582 ALSA: ca0106 - Add IEC958 PCM Stream controls
86effd7 ALSA: ca0106 - Don't override the values at resume
abe1dfa ACPI: don't cond_resched() when irqs_disabled()
e76f427 ACPI: fix 2.6.28 acpi.debug_level regression
4f2d23e ALSA: hda - Use snd_hda_ctl_add() in patch_sigmatel.c
827057f ALSA: hda - Add missing initializations of amp and verb caches
30cd324 Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and
'tracing/urgent' into tracing/core
345077c x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
cae5117 ALSA: split HD-audio model list to HD-Audio-Models.txt
335b986 Merge branch 'topic/hda-doc' into topic/hda
0ff5551 Merge branch 'fix/hda' into topic/hda
c94cb31 net: prepare usb net drivers for addition of status as a parameter
ab5024a net: ppp_generic - use DEFINE_IDR for static initialization
a109a5b cxgb3: manage private iSCSI IP address
221b3d6 ucc_geth: Remove UGETH_FILTERING dead code
3e73fc9 ucc_geth: Fix IO memory (un)mapping code
ba57469 ucc_geth: Cleanup repetitive ucc_geth_memclean() calls
67c2fb8 ucc_geth: Fix IRQ freeing code in ucc_geth_open()
1762a29 ucc_geth: Fix TX watchdog timeout handling
b3431c6 ucc_geth: Fix endless loop in stop_{tx,rx} routines
6086ebc tcp: Stop scaring users with "treason uncloaked!"
e98def1 NIU: Implement discard counters, optimize
d231776 NIU: Implement discard counters, info/debug statements.
b8a606b NIU: Implement discard counters
5664dd5 enc28j60: reduce the number of spi transfers in enc28j60_set_bank()
b88a2a2 netdevice zd1201: Use after free
3de77cf Revert "xfrm: Accept ESP packets regardless of UDP encapsulation mode"
739840d ppp: fix segfaults introduced by netdev_priv changes
1b08534 net: Fix module refcount leak in kernel_accept()
f34a10b x86: fix warning in arch/x86/kernel/microcode_amd.c
c71dd42 tracing: fix warnings in kernel/trace/trace_sched_switch.c
3bddb9a tracing: fix warning in kernel/trace/trace.c
9f22149 x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
8869a2e x86: asm-offset_64: use rt_sigframe_ia32
b2fa739 x86: sigframe.h: include headers for dependency
d1769d5 x86: traps.c declare functions before they get used
a2ced6e x86: PAT: update documentation to cover pgprot and remap_pfn related
changes - v3
2520bd3 x86: PAT: add pgprot_writecombine() interface for drivers - v3
8a7b12f x86: PAT: change pgprot_noncached to uc_minus instead of strong uc -
v3
5899329 x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
2ab6403 x86: PAT: hooks in generic vm code to help archs to track pfnmap
regions - v3
e121e41 x86: PAT: add follow_pfnmp_pte routine to help tracking pfnmap pages
- v3
3c8bb73 x86: PAT: store vm_pgoff for all linear_over_vma_region mappings - v3
f0bc220 x86: process.c declare c1e_remove_cpu before they get used
5c2628e x86: sigframe.h: add guard macro
f269b07 x86: revert CONFIG_RELOCATABLE=y defconfig change
179efcb kbuild: add headerdep used to detect inclusion cycles in header files
40aa4a3 ASoC: Add WM8350 AudioPlus codec driver
b8b33cb ASoC: Complain if we fail to create DAPM controls
0b34a3d ASoC: Ease merge difficulties from new architectures
9c2c480 schedstat: consolidate per-task cpu runtime stats
6d102bc tracing/ring-buffer: remove unused ring_buffer size
7c9c160 x86: tls.c declare sys_set_thread_area and sys_get_thread_area before
they get used
57a3750 x86: time_64.c timer_interrupt() should be static
3d9101e trace: fix task state printout
ea3a6d6 ftrace: add not to regex on filtering functions
e05a43b trace: better use of stack_trace_enabled for boot up code
f38f1d2 trace: add a way to enable or disable the stack tracer
4087449 Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into
tracing/core
1f04128 ALSA: hda - Convert from takslet_hi_schedule() to tasklet_schedule()
d98f9d8 x86: ia32_signal: use sigframe.h
3b0d29e x86: ia32_signal: rename struct sigframe and rt_sigframe
c85c2ff x86: signal: prepare to include from ia32_signal.c
41af86f x86: signal: move sigframe.h to arch/x86/include/asm
a5c56eb x86: signal: rename sigframe and rt_sigframe on 32-bit
f522376 x86: signal: move ia32 func declarations into arch/x86/kernel/signal.c
3218c17 ALSA: hda - Remove duplicated strings from codec name
74c6113 ALSA: hda - Add Intel vendor id string
49ad959 Revert "net: release skb->dst in sock_queue_rcv_skb()"
3b5b35d bonding: use port_params in __update_lacpdu_from_port
3c52065 bonding: use port_params in __update_default_selected()
ce6a49a bonding: use port_params in __update_selected()
a6ae186 bonding: remove various function declarations
c7e703d bonding: init port_params from template
5eefd1a bonding: use plain memcpy in __record_default()
b99d6ba bonding: use port_params in __record_pdu()
1055c9a bonding: introduce and use port_params structure
aa31281 bonding: improve elaborate port_state assignment
4219988 gianfar: Continue polling until both tx and rx are empty
8c7396a gianfar: Merge Tx and Rx interrupt for scheduling clean up ring
c50a5d9 gianfar: Use interface name in interrupt name to distinguish the
source.
4669bc9 gianfar: Add Scatter Gather support
8882d9a gianfar: Fix packet drop when out of memory
a693722 dccp_diag: LISTEN sockets don't have CCIDs
c280266 Merge branch 'linux-2.6' into next
9732d52 Phonet: USB CDC Phonet function for gadget framework
893873f Phonet: get rid of deferred work on the transmission path
be67773 Phonet: use atomic for packet TX window
57c81ff Phonet: allocate separate ARP type for GPRS over a Phonet pipe
2d91d78 Phonet: allocate a non-Ethernet ARP type
fc10af8 vcan: whitespace fixes
a67534a V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
7a95d26 net: ppp_generic - use idr technique instead of cardmaps
c0700f9 bnx2x: Fix namespace collision with FLOW_CTRL_{TX,RX}
f6d5243 bnx2: Don't redefine FLOW_CTRL_{RX,TX}.
1f2435e bnx2: Update version to 1.9.0.
4e1d0de bnx2: Rename MSI-X vectors.
eddce36 Merge branch 'next' of
master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into next
f40e063 drivers/net/hamradio: Move a dereference below a NULL test
f162e97 phylib: Remove unnecessary "reset" fixups in genphy_setup_forced
5a5efed gianfar: Make all BD status writes 32-bit
31de198 gianfar: Add macros for stepping through BDs
a22823e gianfar: Remove unused gfar_add_fcb() function parameter
2c2db48 gianfar: Enable padding and Optimize the frame prepended bytes
handling
77ecaf2 gianfar: Fix VLAN HW feature related frame/buffer size calculation.
12dea57 gianfar: Fix eTSEC configuration procedure
b46a845 gianfar: Optimize interrupt coalescing configuration
b31a1d8 gianfar: Convert gianfar to an of_platform_driver
d680fe4 x86: entry_64 - introduce FTRACE_ frame macro v2
66896a8 tracing/ftrace: add the printk-msg-only option
2c2d732 tracing/ftrace: use preempt_enable_no_resched_notrace in
ring_buffer_time_stamp()
257d938 gianfar: Use gfar_halt to stop DMA in gfar_probe
5eeabf5 tlan: Remove broken support for big buffers
354ade9 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
8bee3f0 x86: ia32_signal: use proper macro __USER32_DS
d0b48ca x86: ia32_signal: use __put_user() instead of __copy_to_user()
ae417bb x86: signal: use signal_fault() in sys_sigreturn()
c8182f0 sgi-xp: xpc needs to pass the physical address, not virtual
189f67c x86: UV fix for global physical addresses
c15cb37 Merge commit 'v2.6.28-rc8' into x86/uv
fde9071 x86: clean up dead code in vmi_32.c
8ae9366 x86: hardirq: use inc_irq_stat() in non-unified functions
e1286f2 x86: documentation fix regarding boot protocol
78f902c Merge commit 'v2.6.28-rc8' into x86/doc
ecbf29c xen: clean up asm/xen/hypervisor.h
80f40ee sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
a9b43c7 x86: setup.c find_and_reserve_crashkernel should be static
c0195b6 x86: ldt.c declare sys_modify_ldt before they get used
7b5b50f x86: signal.c declare do_notify_resume before they get used
aab02f0 x86: process_64.c declare __switch_to() and sys_arch_prctl before
they get used
f63c2f2 xen: whitespace/checkpatch cleanup
40fb171 x86: support always running TSC on Intel CPUs
7e91a12 Merge branch 'x86/cpufeature' into x86/tsc
d437797 x86: support always running TSC on Intel CPUs, add cpufeature
definition
dd7a523 Merge commit 'v2.6.28-rc8' into x86/cpufeature
df23cab x86: microcode_amd: modify log messages
5549b94 x86: microcode_amd: use 'packed' attribute for structs
9841530 x86: microcode_amd: remove (wrong) chipset deivce ID checks
6cc9b6d x86: microcode_amd: consolidate macro definitions
29d0887 x86: microcode_amd: replace inline asm by common rdmsr/wrmsr functions
0657d9e x86: microcode_amd: don't pass superfluous function pointer for
get_ucode_data
8c13520 x86: microcode_amd: fix compile warning
be95776 x86: microcode_amd: fix checkpatch warnings/errors
2a3282a x86: microcode_amd: fix typos and trailing whitespaces in log messages
3c763fd x86: microcode_amd: fix wrong handling of equivalent CPU id
3ca81a5 V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
8b21c1e V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
f86d4a9 V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
11c6c7f V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2
support)
4b330be V4L/DVB (9780): dib0700: Stop repeating after user stops pushing
button
b6fd6f2 x86, mm: limit MAXMEM on 64-bit
cfc3198 x86, 32-bit: improve lazy TLB handling code
beeb419 x86, 32-bit: add some compile time checks to mem_init()
d6be89a x86, 32-bit: simplify alloc_low_page()
b93a531 allow bug table entries to use relative pointers (and use it on
x86-64)
1796316 x86: consolidate __swp_XXX() macros
d072c25 x86, bts: correctly report invalid bts records
cc1dc6d x86, bts: remove recursion from get_context
bb1f24b ALSA: ca0106 MSI K8N Diamond MB spi_dac 2->1
f649a71 ALSA: ca0106 Add comments to snd_ca0106_details struct
31117b7 ALSA: hda - Add Nvidia vendor id string
e9515c3 sched, cpuacct: export percpu cpuacct cgroup stats
720f549 sched, cpuacct: refactoring cpuusage_read / cpuusage_write
9dfc3bc Merge branches 'tracing/fastboot', 'tracing/ftrace',
'tracing/function-graph-tracer' and 'tracing/hw-branch-tracing' into
tracing/core
9f690db ipv6: fix the outgoing interface selection order in udpv6_sendmsg()
f250dcd ipv6: fix the return interface index when get it while no message is
received
b24a251 ipv6: Add IPV6_PKTINFO sticky option support to setsockopt()
bc02ff9 net: Refactor full duplex flow control resolution
e18ce34 net: Move flow control definitions to mii.h
f986732 simeth: convert to net_device_ops
8207bef cxgb3: untie strict FW matching
5ad258c vcan: convert to net_device_ops
ffcebb1 l2tp: fix UDP checksum support
09a2c3c Phonet: improve GPRS variable names
4ee59d5 isdn: eicon: fix sparse warning: make global functions static
205516c x86: convert rdtscll() to use __native_read_tsc
b187920 ipmr: merge common code
c40cf51 hp100: use roundup instead of open coding
82ad332 cxgb3: Add multiple Tx queue support.
34f28ec sched: optimize update_curr()
03e89e4 sched: fix wakeup preemption clock
89c88b1 e1000e: Add GRO support
b240a0e ethtool: Add GGRO and SGRO ops
bf296b1 tcp: Add GRO support
71d93b3 net: Add skb_gro_receive
73cc19f ipv4: Add GRO infrastructure
d565b0a net: Add Generic Receive Offload infrastructure
1a881f2 net: Add frag_list support to GSO
89319d3 net: Add frag_list support to skb_segment
b53c758 rapidio: struct device - replace bus_id with dev_name(),
dev_set_name()
aab0d37 powerpc: struct device - replace bus_id with dev_name(),
dev_set_name()
f63837f powerpc/mm: Remove flush_HPTE()
e41e811 powerpc/mm: Rename tlb_32.c and tlb_64.c to tlb_hash32.c and
tlb_hash64.c
1a37a3f powerpc/mm: Add local_flush_tlb_mm() to SW loaded TLB implementations
a58f053 powerpc: Fix asm EMIT_BUG_ENTRY with !CONFIG_BUG
3045b3c powerpc: Remove dead BIO_VMERGE_BOUNDARY definition
7fe519c powerpc: Introduce ppc_pci_flags accessors
edc72ac powerpc/pseries: Check for GIQ indicator before calling set-indicator
6ff04c5 powerpc/powermac: Use set_hard_smp_processor_id() instead of
smp_hw_index
13a9801 powerpc: Move smp_hw_index to 32-bit code
6b82b3e powerpc: Remove `have_of' global variable
eb14f01 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
0efbb57 powerpc: Fix !CONFIG_PPC_NEED_DMA_SYNC_OPS build warning
46d0149 powerpc/ps3: Add sub-match id modalias support
62d8074 powerpc/ps3: Quiet dmesg output
15cb1cc powerpc: Fix typo in pgtable-ppc64.h
29e931c powerpc/chrp: Add missing of_node_put in pci.c
1e1c568 Merge branch 'merge' into next
9a4a842 8390/8390p: Fix compat netdev ops handling.
91cac62 powerpc/85xx: Fix compile issues with mpc8572ds.dts
8309ce7 powerpc: Fix bogus cache flushing on all 40x and BookE processors v2
3d1ee37 ALSA: Fix declaration of sound_class
8b124a8 net: fix dcbnl_setnumtcs operation check
5ecc361 ixgbe: fix dma mapping unbalance
a7276db smsc9420: add ethtool register dump support
b1721d2 rpc/rdma: goto instead of copypaste
79f55f1 nf/dccp: merge errorpaths
e780f1c irda: merge exit paths
037322a bt/rfcomm/tty: join error paths
0eae1b9 ax25: join the return paths that free skb
ebad5c0 can: merge error paths
d8eb930 xfrm: join error paths
8da73b7 ip6mr: use goto to common label instead of opencoding
448eb71 ipv6/mcast: join error paths using goto
5ce1bbb xfrm6_tunnel: join error paths using goto
857a6e0 icsk: join error paths using goto
9cd28ab ASoC: switch davinci DPRINTK to pr_debug()
a6ba0cb kbuild: fix string equality testing in tags.sh
709cc37 kbuild: fix make tags/cscope
31110eb kbuild: fix make incompatibility
012b215 smsc9420: add ethtool eeprom support
e312674 smsc9420: add netpoll support
1757ab2 smsc911x: make smsc911x_poll_controller static
56bde88 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
a7a81fc sfc: Version 2.3
7dde596 sfc: Fix synchronisation of efx_mtd_{probe,rename,remove}
0c53d8c sfc: Use kzalloc() to ensure struct efx_spi_device is fully
initialised
fa402b2 sfc: Treat probe as unsuccessful if it scheduled a reset
ab37735 sfc: Use model numbers for PHY type names
ca54a9f sfc: Use mutex_lock_interruptible() for ethtool EEPROM access
11e6696 sfc: Specify a meaningful component for loopback RX-side and PHY tests
b453193 sfc: Remove leading spaces
6f158d5 sfc: Add support for SFN4111T
e6fa2eb sfc: Add support for Solarflare 10Xpress SFT9001
766ca0f sfc: Rework MAC, PHY and board event handling
04cc8ca sfc: Implement auto-negotiation
177dfcd sfc: Add support for sub-10G speeds
356eebb sfc: Clean up MDIO flag setting
04300d2 sfc: Clean up board identification
06d5e19 sfc: Add phy_type device attribute
27dd2ca sfc: Add support for MMDs numbered >15
f31a45d sfc: Remove MII extension cruft
5005087 sfc: Don't count RX checksum errors during loopback self-test
740ced9 sfc: Abbreviate self-test names so they are not truncated
56536e9 sfc: Provide hints to irqbalance daemon
28b581a sfc: Add option to use a separate channel for TX completions
84ae48f sfc: Restore phy_flash_cfg module parameter
2f7f573 sfc: Work around unreliable strap pins
be4ea89 sfc: Clean up waits for flash/EEPROM operations
1ab0062 sfc: Make reset_workqueue driver-global rather than per-NIC
65f667f sfc: Correct interpretation of second param to ethtool phys_id()
2b2734d sfc: Remove unneeded register write
23d30f0 sfc: Change SPI lengths to type size_t
a17102b sfc: Board support fixes
702c790 misdn: Fix lockdep warning
c31655f mISDN: hfcmulti: use __iomem address space modifier
c46f0a2 mISDN: timerdev: use __user for mISDN_read's buffer argument
047ce8f mISDN: comment out unused symbols
863a76e mISDN: fix sparse warning: symbol 'id' shadows an earlier one
bb68b1d mISDN: fix sparse warning: symbol 'nskb' shadows an earlier one
65a4051 mISDN: un-export symbol 'plx_lock'
5b83435 mISDN: make global symbols static or include header files
dfa96ec mISDN: consistently define 'debug' as '*u_int'
bcf9174 mISDN: use NULL pointer instead of plain integer
a7b7520 iwlwifi: add contact email to MODULE_AUTHOR
2aa6ab8 iwlwifi: remove 4965 from common uCode API structures
b5047f7 iwlwifi: remove includes of iwl-helpers.h where not needed
29d51d9 iwlwifi: remove unused clip_groups priv member
edb3422 iwlwifi: fix resume while txpower off
3d5717a iwlwifi: use iwl_poll_direct_bit in EEPROM reading
9c5f89b ath9k: Do not remove header padding on RX from short frames
f2f1ba2 iwlwifi: fix build warning (iwl-rx.c)
ab1f5c0 mac80211: misc cleanups
4dec9b8 rfkill: strip pointless notifier chain
6fb5325 libertas: Create sysfs entry for changing the mesh probe response
limit
b77f483 ath9k: Refactor struct ath_softc
59651e8 p54: fix oops on faulty devices
b7a530d mac80211: Disable requests for new scans in AP mode
14a4dfe ipw2200: fix scanning while associated
d8004cb b43legacy: Fix sparse warnings
c1db52b rtl8187: Use usb anchor facilities to manage urbs
388cdf3 ath5k: fix endianness of bitwise ops when installing mic
62d714e spectrum_cs: Fix function names used in debug strings
499b702 orinoco: Fix inappropriate use of IRQ_BAP
0c06dd8 orinoco: Fix function names used in debug strings
39ca5bb p54: enforce strict tx_queue limits
30dab79e iwlwifi: remove qos module parameter
6d1ef1a iwlwifi: 3945 remove qos module parameter
9f92593 iwlifi: remove twice defined SINGLE_FRAME RX FH MASK
759ef89 iwlwifi: change email contact information
d070d85 airport: remove useless return in a function returning void
89fad57 mac80211: integrate sta_notify_ps cmds into sta_notify
dd397dc p54usb: rewriting rx/tx routines to make use of usb_anchor's
facilities
a07d361 ath9k: BH shouldn't be enabled when hardirqs are disabled.
b143923 mac80211/cfg80211: check endianness in sparse runs
f546638c mac80211: remove fragmentation offload functionality
e4f2a34 ath9k: remove fragmentation workaround again
21a49fc iwlwifi: fix build error (iwl-rx.c).
8dffff2 mac80211: only create default STA interface if supported
0f202aa ieee80211_security: correct warning about width of auth_mode
8aa15e1 ath9k: avoid rx frames with corrupted descriptor.
2df1bff ath9k: Incorrect band enum causes invalid antenna configuration.
e759407 ath9k: Adding support for Atheros AR9285 chipset.
e8fbc99 ath9k: Adding initvalues for Atheros AR9285 chipset.
02e90d6 ath9k: Adding AR9285 chipset register information.
306d611 cfg80211: fix nl80211 frequency handling
7ba1c04 mac80211: improve sta_notify documentation
8ee5afb ath9k: Merge structures ath_atx, ath_node_aggr with ath_node
f6688cd ath9k: Remove remaining occurrences of CONFIG_SLOW_ANT_DIV
817e11d ath9k: Add a debugfs file to show interrupt statistics
3706de6 ath9k: Maintain rate table choice after association
40990ec ath9k: Fix bug in rate table management
6b3aa6a ath9k: Disable staggered Beacon frame scheduling
3fbb9d9 ath9k: Free Beacon skbs in AP mode
61ff84a iwlwifi: cleanup (remove pm_state)
a8ec42c iwlwifi: use rmb/wmb to protect indirect mmio operation
73d7b5a iwlwifi: iwl_poll_{direct_}bit cleanup
42802d7 iwlwifi: fix "MAC in deep sleep" error
f056658 iwlwifi: fix time interval misuse in iwl_poll_{direct_}bit
7262796 iwl3945: Fix rate scale for B-mode connection
00e540b iwlwifi: implement iwl_debug_report_frame for iwlagn
447107f mac80211: remove WARN_ON() from ieee80211_hw_config
bb608e9 wireless: Incorrect LEAP authentication algorithm identifier.
a7db74f rtl8187: Improve wireless statistics for RTL8187
fd28a5b x86: remove simnow earlyprintk support
9470565 x86: remove init_mm export as planned for 2.6.26
d65bd5e sched: add missing arch_update_cpu_topology() call
ee79d1b sched: let arch_update_cpu_topology indicate if topology changed
2bed844 tracing/function-graph-tracer: add a new .irqentry.text section, fix
cbc34ed sched: fix tracepoints in scheduler
915b0d0 x86: hardirq: introduce inc_irq_stat()
fd10902 Merge commit 'v2.6.28-rc8' into x86/irq
8f2466f x86: kill #ifdef for exit_idle()
16855f8 x86: uaccess: return value of __{get|put}_user() can be int
e18d7af Merge commit 'v2.6.28-rc8' into x86/mm
f8b755a tracing/function-graph-tracer: Output arrows signal on hardirq
call/return
bcbc4f2 tracing/function-graph-tracer: annotate do_IRQ and
smp_apic_timer_interrupt
a0343e8 tracing/function-graph-tracer: add a new .irqentry.text section
85072bd x86, debug: remove EBDA debug printk
c1dfdc7 Merge commit 'v2.6.28-rc8' into sched/core
da485e0 tracing/fastboot: include missing headers
8001530 tracing/fastboot: fix len of func buffer
8808500 x86: soften multi-BAR mapping sanity check warning message
ffc2238 x86, bts: fix build error
a93751c x86, bts, ftrace: adapt the hw-branch-tracer to the ds.c interface
c272477 x86, bts: provide in-kernel branch-trace interface
b0884e2 x86, bts: turn BUG_ON into WARN_ON_ONCE
f3134de Merge branches 'tracing/function-graph-tracer' and
'tracing/ring-buffer' into tracing/core
7a3c66e net: Add support for the KS8695 ethernet devices.
82a9928 tc35815: Enable StripCRC feature
2cb3772 smsc9420: SMSC LAN9420 10/100 PCI ethernet adapter
ea943d4 igb: fixup AER with proper error handling
49d92c7 ASoC: TWL4030: hands-free start-up sequence.
4544f8a ASoC: Fix variable name for Blackfin I2S DAI
cd85400 powerpc/4xx: Add L2 cache node to AMCC Canyonlands dts file
132bb7c ALSA: hda - Add development tree URLs in HD-audio.txt
f8bbd06 ALSA: hda - Fix another typo in HD-Audio.txt
42a73df ALSA: sb8 - Fix a return code in the error path
5c0b9be ALSA: hda - Fix a compile warning when CONFIG_PM=n
6de45d5 ALSA: ASoC - Fix DAI registration in s3c2443-ac97.c
623b9f6 ALSA: hda - Update HD-Audio.txt
293a4f2 netfilter: xt_NFLOG is dependant of nfnetlink_log
8229efd netns: ip6mr: enable namespace support in ipv6 multicast forwarding
code
8b90fc7 netns: ip6mr: declare ip6mr /proc/net entries per-namespace
950d570 netns: ip6mr: declare reg_vif_num per-namespace
a21f3f9 netns: ip6mr: declare mroute_do_assert and mroute_do_pim per-namespace
4045e57 netns: ip6mr: declare counter cache_resolve_queue_len per-namespace
4a6258a netns: ip6mr: dynamically allocate mfc6_cache_array
58701ad netns: ip6mr: store netns in struct mfc6_cache
4e16880 netns: ip6mr: dynamically allocates vif6_table
bd91b8b netns: ip6mr: allocate mroute6_socket per-namespace.
5eaa65b net: Make static
2107fb8 smsc911x: add dynamic bus configuration
3b1228a ASoC: Stop WM8903 SYSCLK when suspending
d58d5d5 ASoC: Convert WM8903 driver to register at I2C probe time
78e19a3 ASoC: Convert WM8900 to do more work at I2C probe time
f144b7f ALSA: cs5535 - Make OLPC-stuff depending on MGEODE_LX
0fb497f ALSA: cs5535audio: ensure MIC Bias/Analog Input bail if not on an
OLPC machine
b5ccc57 ALSA: cs5535audio: clean up OLPC code
c8f0eee ALSA: cs5535audio: turn off mic bias on OLPCs by default
01da024 ALSA: cs5535audio: for OLPC, default to Analog Input being off
bf1e527 ALSA: cs5535audio: rename V_REFOUT control to MIC Bias
e463ae1 ALSA: cs5535audio: enable OLPC's V_REFOUT bias when recording
189d34e ALSA: cs5535audio: check OLPC's Analog Input status vis GPIO
466ae3055 ALSA: cs5535audio: rename OLPC's analog input control && drop
AD1888's HPF
d6276b7 ALSA: cs5535audio: create function for setting OLPC's Analog Input
mode
1e2232b ALSA: cs5535audio: decouple HPF from V_REFOUT in OLPC code
b91254e ALSA: cs5535audio: drop ec_analog_input flag for OLPC stuff
3556d18 ALSA: cs5535audio: invert EAPD for OLPC (newer than B3)
c8974be ALSA: cs5535audio: Use OLPC/Geode basic infrastructure
57d4bf6 ALSA: cs5535audio: OLPC analog input support
b6c52a2 ALSA: cs5535audio: suspend/resume callbacks are only defined with
CONFIG_PM
b035ce0 ALSA: cs5535audio: turn off PCM properly if closing the audio device
0bed7b2 ALSA: cs5535audio: stick AD1888 bitshift values into a header file
0d0cf00 ASoC: Add codec registration API
cdc6936 ALSA: Add support for mechanical jack insertion
1e5fa31 ASoC: TWL4030: Change the name for the DACs
d4a7313 ASoC: TWL4030: Small cleanup
6a1bee4 ASoC: TWL4030: Add missing Carkit output
1e297a1 ASoC: Work around warnings from some build environments
11d518e ALSA: hda - Add quirk for HP6730B laptop
6fabd71 ixgbe: Implement PCIe AER support
5e8427e igb: Correctly determine pci-e function number in virtual environment
b4557be igb: update handling of RCTL for smaller buffer sizes
d2afbe7 ALSA: hda - Update documentation
44411e0 ALSA: ca0106 - Check return value of pci_enable_device() in resume
e97fd7c bonding: turn all bond_parm_tbls const
325dcf7 bonding: make tbl argument to bond_parse_parm() const
d787552 bonding: remove duplicate declarations
5a03cdb bonding: use pr_debug instead of own macros
ef65583 bonding: fix compile error if debug enabled
77afc92 bonding: use table for mode names
5840205 bonding: add and use bond_is_lb()
f73f2a6 ALSA: ASoC - Fix symbol conflicts in omac-mcbsp.c
acc4216 ALSA: sound: Make static
c9b3a40 ALSA: ASoC - Fix wrong section types
24e07db ALSA: ASoC - Fix module init entry for twl4030.c
512bb43 pkt_sched: sch_htb: Optimize WARN_ONs in htb_dequeue_tree() etc.
1b5c007 pkt_sched: sch_htb: Optimize htb_find_next_upper()
dbb7a95 phy: Add LSI ET1011C PHY driver
471716f ASoC: Fix typos in Atmel module registration
f075233 ASoC: Convert WM8900 to allow registration by machine code
6b05eda ASoC: Wait for non-AC97 codec DAIs before instantiating
435c5e2 ASoC: Initial framework for dynamic card instantiation
64089b8 ASoC: Register non-AC97 codec DAIs
958e792 ASoC: Register platform drivers
12a48a8 ASoC: Add platform registration API
3f4b783 ASoC: Register platform DAIs
9115171 ASoC: Add DAI registration API
c5af3a2 ASoC: Add card registration API
ca4513f ASoC: TWL4030: Do not alter the Headset output volume on power-up/down
df33980 ASoC: TWL4030: DAPM mapping of the Handsfree outputs
5152d8c ASoC: TWL4030: DAPM mapping of the Carkit outputs
dfad21a ASoC: TWL4030: DAPM mapping of the Headset outputs
2a6f5c5 ASoC: TWL4030: DAPM mapping of the PreDriv outputs
5e98a46 ASoC: TWL4030: DAPM mapping of the Earpiece output
e8ff9c4 ASoC: TWL4030: Add DAPM event handler for output MUX selection
44c5587 ASoC: TWL4030: Add Analog PGA control switch to DAPM
53b5047 ASoC: TWL4030: Correct DAPM_DAC with power control
1e64174 Audit: Log TIOCSTI
e19caae bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().
bcb09dc myri10ge: check fragmentation in LRO get_frag_header()
6cf1a0f bluetooth: Fix rfcomm_sock_ioctl() build failure with debugging
enabled.
e421300 hydra: fix compilation
30bc448 ALSA: Updates about bug-reporting in ALSA-Configuration.txt
94d6a5f user namespaces: document CFS behavior
e726f5f tracing/function-graph-tracer: fix 'flags' variable mismatch
efbe027 sched: idle_balance() does not call load_balance_newidle()
4217458 x86: signal: change type of paramter for sys_rt_sigreturn()
380c4b1 tracing/function-graph-tracer: append the tracing_graph_flag
8e1b82e tracing/function-graph-tracer: turn tracing_selftest_running into an
int
8b96f01 tracing/function-graph-tracer: introduce __notrace_funcgraph to
filter special functions
69b88af x86: clean up get_smp_config()
aa9c9b8 Merge branch 'linus' into x86/quirks
361b73d ring_buffer: fix comments
5436499 sched: fix sd_parent_degenerate on non-numa smp machine
4d117c5 Merge branch 'sched/urgent' into sched/core
3e1e900 x86: change static allocation of trampoline area
decbec3 tracing/function-graph-tracer: implement a print_headers function
5e03c54 ALSA: hrtimer - Use hard-irq callback
647808a ALSA: timer - Add comments and use ns_to_ktime()
6fdd34d dccp ccid-2: Phase out the use of boolean Ack Vector sysctl
4098dce dccp: Remove manual influence on NDP Count feature
0049bab dccp: Remove obsolete parts of the old CCID interface
63b8e28 dccp: Clean up old feature-negotiation infrastructure
991d927 dccp: Integration of dynamic feature activation - part 3 (client side)
192b27f dccp: Integration of dynamic feature activation - part 2 (server side)
6eb55d1 dccp: Integration of dynamic feature activation - part 1 (socket
setup)
b74ca3a netdevice: Kill netdev->priv
5a001a0 staging-winbond: Kill directly reference of netdev->priv
7657d90 user namespaces: require cap_set{ug}id for CLONE_NEWUSER
c37bbb0 user namespaces: let user_ns be cloned with fairsched
32e176c Sound: hda - Restore PCI configuration space with interrupts off
4bcd426 staging-slicoss: Kill directly reference of netdev->priv
979123d staging-p80211: Kill directly reference of netdev->priv
ad660e2 s390_net: Kill directly reference of netdev->priv
26aca5e net: Fix incorrect use of loose in spider_net.c
6c5cc8e wireless: Fix incorrect use of loose in wext.c
a2acde0 tcp: fix tso_should_defer in 64bit
d5dd917 tcp: use tcp_write_xmit also in tcp_push_one
730c30e Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
726e07a tcp: move some parts from tcp_write_xmit
41834b7 tcp: share code through function, not through copy-paste. :-)
ee6aac5 tcp: drop tcp_bound_rto, merge content of it tcp_set_rto
5013316 tcp: no need to pass prev skb around, reduces arg pressure
a1197f5 tcp: introduce struct tcp_sacktag_state to reduce arg pressure
775ffab tcp: make mtu probe failure to not break gso'ed skbs unnecessarily
9969ca5 tcp: Fix thinko making the not-shiftable to cover S|R as well
f0bc52f tcp: force mss equality with the next skb too.
61c1d05 dccp: use roundup instead of opencoding
d2b8881 tty: driverdata and discdata are void *
8a1ec21 tty: Flags should be accessed via the foo_bit interfaces
098401a Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
cb7b48f igb/e1000e: Naming interrupt vectors
1c72194 IB/ehca: Replace modulus operations in flush error completion path
3d08909 IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
1bf7724 IB/ipath: Fix spi_pioindex value
6114d4c IB/ipath: Only do 1X workaround on rev1 chips
60e8450 IB/ipath: Don't count IB symbol and link errors unless link is UP
890fccb IB/ipath: Check return value of dma_map_single()
fab01fc IB/ipath: Fix PSN of send WQEs after an RDMA read resend
6098d10 RDMA/nes: Cleanup warnings
1ee8655 RDMA/nes: Add loopback check to make_cm_node()
f3181a1 RDMA/nes: Check cqp_avail_reqs is empty after locking the list
abb7725 RDMA/nes: Fix TCP compliance test failures
4a14f6a RDMA/nes: Forward packets for a new connection with stale APBVT entry
183ecfa RDMA/nes: Avoid race between MPA request and reset event to rdma_cm
879e5bd RDMA/nes: Lock down connected_nodes list while processing it
c5d321e RDMA/nes: Cleanup cqp_request list usage
abf681c kbuild: remove TAR_IGNORE
28a1d86 ASoC: tlv320aic3x: control additions and cleanups
68fb740 ASoC: Add support for OMAP3 Pandora
c112d0c ath9k: Use GFP_ATOMIC when allocating TX private area
f8316df ath9k: Check for pci_map_single() errors
73a5267 rt2x00: Correctly initialize AID during set_key()
9c3444d rt2x00: Move crypto TX descriptor handling to rt2x00crypto.c
1c02667 rt2x00: Fix check for BSS info changes
4c7f0bc generic swap(): ath9k: rename swap() to swap_array()
74415ed rt2x00: Add RXDONE_CRYPTO_IV/ICV flags
011a033 iwl3945 : Fix a-band association for passive channels
a0987a8 iwlwifi: rely on API version read from firmware
c02b3ac iwlwifi: store ucode version number
f3f911d iwlwifi: fix DMA channel number in iwl_txq_ctx_stop
74221d0 iwl3945: Fix iwl3945 rate scaling.
c30e30e iwl3945: add debugfs support
d366df5 iwlwifi: move channels sysfs to debugfs
0ad91a3 iwlwifi: move disable/enable interrupts to iwl-core.c
c93007e iwl3945: Select correct sta ID from find_station()
99df630 iwlwifi: fix printk size format error
8f5c87d iwlwifi: move host command check function into separate file
304a698 rt2x00: Release rt2x00 2.2.3
dddfb47 rt2x00: Implement HW encryption (rt2500usb)
0b927a0 rt2x00: Remove duplicate code
42c8285 rt2x00: Store retry limit values
1ce9cda rt2x00: Optimize IV/EIV handling
aac9207 ath9k: Choose correct ANI calibration period
7470d7f iwlwifi: 5150 enable LO, TXIQ and BB calibrations
fd63edb iwlwifi: 5150 parametrize eeprom versions
339afc8 iwlwifi: 5150 compute ct kill threshold
819500c iwlwifi: 5150 enable DC calibration
7100e92 iwlwifi: 5150 add support for 5150
d97809d ath9k: Replace ath9k_opmode with nl80211_iftype
33fd819 iwlwifi: disable AP mode
c912765 p54: fix lm87 checksum endianness
0f70f39 cfg80211: "fix" 11d oops
c58f9f6 iwl3945: remove obsolete irq handling
8e7be8d mac80211: tx module cleanup.
4a4f4d8 cfg80211: fix wiphy remove if no regulatory request
8bef7a1 mac80211: document ieee80211_tx_info.pad
02e37ba p54: per-device names
b2023dd p54: refactoring
64c354d p54: include support for 2.13.24.0 USB LM87 Firmwares
25900ef p54: utilize cryptographic accelerator
c772a08 p54: revamp station power save management in access point mode
4571d3b mac80211: add sta_notify_ps callback
2a163c6 ath9k: Add a debugfs file for dumping DMA status
826d268 ath9k: Add initial layout for an ath9k specific debugfs mechanism
16d68ab ath9k: Remove includes that are not needed
88b126a ath9k: Add ATH9K_DEBUG configuration option
04bd463 ath9k: Use cleaner debug masks
d9a1f48 rtl8187: fix retry count passed in rtl8187_tx
007e5dd wireless: clean up radiotap a bit
e11602b ath9k: Handle channel initialization for AP mode
cb3da8c mac80211: accept empty strings for hidden SSIDs
e60c774 cfg80211: handle SIOCGIWMODE/SIOCSIWMODE
fee5267 cfg80211: handle SIOCGIWNAME
f650470 ath5k: enable combined michael mic in key cache
6714349 ath5k: clean up ath5k_hw_set_key
f6bac3e ath5k: preserve higher order bits when setting mac address
51e9bf5 iwlwifi: remove uses of __constant_{endian} helpers
10ec4f1 nl80211: relicense nl80211.h under the ISC
72bdcf3 nl80211: Add frequency configuration (including HT40)
72eaa43 mac80211: only transition STAs ps->wake on data frames
0d950d8 iwlwifi: properly initialize calibration command header
8e268e4 mac80211: disassociate prior to unlinking AP/station
e327b84 mac80211: deauth when interface is marked down
04adf89 hostap: select required crypto bits in Kconfig
21bbecd ftrace: use init_struct_pid as swapper pid
21a8c46 tracing/ftrace: provide the macro task_curr_ret_stack()
77d683f tracing/ftrace: fix the check of ftrace_trace_task
ff32504 tracing/ftrace: don't insert TRACE_PRINT during selftests
970987b Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and
'tracing/urgent' into tracing/core
a0286c9 x86: fix missing space in printk, #2
12dde4c ALSA: hda - Proper power-map toggling for input pins
55c395b x86: fix missing space in printk
e6e3ea2 ALSA: hda - Fix pin-detection in patch_sigmatel.c
e061b16 xfrm: Accept ESP packets regardless of UDP encapsulation mode
3f9b766 sgi-xp: Kill directly reference of netdev->priv
17c324f um: Kill directly reference of netdev->priv
6cbeba5 xtensa: Kill directly reference of netdev->priv
28945dd simeth: Kill directly reference of netdev->priv
5da9527 ALSA: ca0106 - Add power-management support
84d727a powerpc/4xx: Add support for ISA holes on 4xx PCI/X/E
9d2421e powerpc/44x: update ppc44x_defconfig
23f402c powerpc/kvm: update KVM config options in ppc44x_defconfig
32c8dab ASoC: Remove obsolete declaration of struct snd_soc_clock_info
affa219 x86: change thread_info's flag field back to 32 bits
c051556 Merge commit 'v2.6.28-rc7' into x86/cleanups
4e7c4d7 ALSA: hda - Add reference to HD-Audio.txt in ALSA-Configuration.txt
1fd8f2a tracing/function-graph-tracer: handle ftrace_printk entries
faec2ec ftrace: avoid duplicated function when writing set_graph_function
6b25393 tracing: fix typo and missing inline function
e32d895 ftrace: add ability to only trace swapper tasks
978f3a4 ftrace: use struct pid
5ef6476 pid: fix the do_each_pid_task() macro
804a685 ftrace: trace single pid for function graph tracer
0ef8cde ftrace: use task struct trace flag to filter on pid
ea4e2bc ftrace: graph of a single function
b29144c Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer'
into tracing/core
b8307db Merge commit 'v2.6.28-rc7' into tracing/core
4151d15 ALSA: hda - Add forgotten module alias for Nvidia MCP67 HDMI
e5f7343 ALSA: hda - Add MCP67 HDMI support
36cbac5 net/ipv6/ip6mr.c: Use kmem_cache_zalloc, remove memset
df66f85 if_usb: Kill directly reference of netdev->priv
4850218 smc91x: remove isa stuff from smc91x driver
999890b net: /proc/net/ip_mr_cache, display Iif as a signed short
1ea472e net: fix /proc/net/ip_mr_cache display - V2
9de6d99 netdev: remove pathetic compile-command lines
ec98ce4 Merge branch 'master' into next
8865c41 atm: 32-bit ioctl compatibility
dcd39c9 ne-h8300: convert to net_device_ops
5618f0d hydra: convert to net_device_ops
b611479 zorro8390: convert to net_device_ops
3e1d7cd e1000: e1000_adapter->polling_netdev is useless
a4d2f34 ixgbe: function comment typo
e4e6c38 jme: Remove 64 and 40 bit dma_mask
4f40bf4 jme: GHC register control fix for new hardware
59e4220 pkt_sched: sch_htb: Replace HTB_ACCNT() macro with inlines
23cb913 pkt_sched: sch_htb: Remove L2T()
244ef9b bond: Kill directly reference of netdev->priv
9734124 mptlan: Kill directly reference of netdev->priv
0eade1f dvb: Kill directly reference of netdev->priv
c19f7a3 pkt_sched: sch_htb: Clean htb_class prio and quantum fields
633fe66 pkt_sched: sch_htb: Remove htb_sched nwc_hit field
4164d66 pkt_sched: sch_htb: Remove htb_class aprio field
cb52deb forcedeth: power down phy when interface is down
a316084 drivers/net/smc911x.c: smc911x_drv_probe() cleanup
fd568fc drivers/isdn/mISDN: use ARRAY_SIZE
838361f isdn: Kill directly reference of netdev->priv
25dd7e6 hysdn: Kill directly reference of netdev->priv
5240488 Phonet: basic net namespace support
d81d228 xfrm: Accept XFRM_STATE_AF_UNSPEC SAs on IPv4/IPv6 only hosts
ff80aa9 setlocalversion: add git-svn support
167d6a0 setlocalversion: print correct subversion revision
846442c scripts: improve the decodecode script
c39dd50 scripts/package: allow custom options to rpm
5dae9a5 genksyms: allow to ignore symbol checksum changes
64e6c1e genksyms: track symbol checksum changes
a680eed tags and cscope support really belongs in a shell script
361425f powerpc/85xx: Create dts for each core in CAMP mode for MPC8572DS
f6682f9 kconfig: fix options to check-lxdialog.sh
3b1ec9f kbuild: gen_init_cpio expands shell variables in file names
efddd79 remove bashisms from scripts/extract-ikconfig
d230124 kbuild: teach mkmakfile to be silent
fd54f50 kbuild: use KECHO convenience echo
5410ecc kbuild: introduce $(kecho) convenience echo
d03fab4 kbuild: kill output in silent mode of mkcompile_h
d8672b4 kbuild: expand -I in KBUILD_CPPFLAGS
5b91c33 kbuild: fix -I option expansion with O=... builds
dc7d7b8 ASoC: Remove platform device from DAI suspend and resume operations
07c84d0 ASoC: Remove device from platform suspend and resume operations
384c89e ASoC: Push debugfs files out of the snd_soc_device structure
a7fe49b ALSA: Add more documentation about HD-audio driver
06be64a powerpc/85xx: Don't reset the MPIC for CAMP mode on MPC8572DS
c64ef80 powerpc/85xx: Add localbus node in mpc8572ds dts file
965dc5f powerpc/86xx: Basic GPIO support for GE Fanuc SBC610
09a3fba powerpc/qe: Move cmxgcr_lock definition from the ucc.c into the qe.c
d3a8cda powerpc/86xx: Add use of Epson RTX-8581 RTC to GE Fanuc SBC610 dts
24a9959 powerpc/85xx: Fix compile warnings in mpc85xx_mds.c
e8e1abe ftrace: fix race in function graph during fork
0a37119 trace: fix output of stack trace
0f62083 ALSA: Reduce stall detection timeout in riptide.c
d5b26db powerpc/85xx: Add support for SMP initialization
06b9096 powerpc/85xx: minor head_fsl_booke.S cleanup
b389889 powerpc: Better setup of boot page TLB entry
6a800f3 powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.
033b8a3 powerpc/math-emu: Remove redundant 'ret'
463a8c0 powerpc/math-emu: Adopt new version of _FP_CHOOSENAN
cf03033 powerpc/math-emu: Fix single float point division bug
55b9121 powerpc: Remove unncessary SPE related compiler flag
0640f84 Merge branch 'topic/hda-modularize' into topic/hda
6f2a974 ASoC: tlv320aic3x: headset/button press support
4b4fffd ASoC: Fix WM8903 right mixer bypass path
5920b45 ASoC: TWL4030: Add input selection and gain controls
7947cf0 hvc_console: Always schedule resize work on resize
3d26825 powerpc: Make open count variables signed in hvcs/hvsi/hvc_console
dc42149 drivers/hvc: Add missing of_node_put
b908b53 of/gpio: Implement of_get_gpio_flags()
2fd091f powerpc/macintosh: Fix unsigned check in smu_sat_get_sdb_partition()
e6a437e of/i2c: Fill the archdata for I2C devices
3f3b163 powerpc and sparc: Introduce dev_archdata node accessors
a0e2f9f powerpc/BSR: Support multiple OF-node description of BSR
6358d6c powerpc/ibmebus: Get rid of the IRQ mapping in ibmebus_free_irq()
786b32f powerpc: Eliminate NULL test and memset after alloc_bootmem
15e09c0 powerpc: Add sync_*_for_* to dma_ops
c4d04be powerpc: Allow the max stack trace depth to be configured
0186f47 powerpc: Use RCU based pte freeing mechanism for all powerpc
df3b861 powerpc: Add a local_flush_tlb_page to handle kmap_atomic invalidates
f4f3a12 powerpc: hash_page_sync should only be used on SMP & STD_MMU_32
4ee5f55 powerpc: Fix ppc32 mm_struct CPU tracking in SMP
1b98326 powerpc: Add MSR[CE, DE] to the MSR bits we print on show_regs()
764f3b9 tracing/function-graph-tracer: enabled by default
5274918 Merge branch 'merge'
29fa0b3 xfrm: Cleanup for unlink SPD entry
22d5532 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
166d3c7 tracing/function-graph-tracer: improve duration output
11e84ac tracing/function-graph-tracer: display unified style cmdline and pid
62679ef ftrace: add checks on ret stack in function graph
e49dc19 ftrace: function graph return for function entry
7ee991f ftrace: print real return in dumpstack for function graph
044fa78 ring-buffer: change "page" variable names to "bpage"
14a866c ftrace: add ftrace_graph_stop()
bb4304c ftrace: have function graph use mcount caller address
347fdd9 ftrace: clean up function graph asm
8789a9e ring-buffer: read page interface
abc9b56 ring-buffer: move some metadata into buffer page
a5e2588 ftrace: replace raw_local_irq_save with local_irq_save
dfdc543 Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
f0461d0 Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer'
into tracing/core
181de82 x86: remove dead BIO_VMERGE_BOUNDARY definition
6083aa4 Merge branch 'x86/io' into x86/iommu
3f8c6c9 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
aa2ba5f Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
6802454 Merge branch 'master' of
ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
ca17584 mac8390: update to net_device_ops
b9a9b4b etherh: build fix for net-next
dcb7731 x86: fix broken flushing in GART nofullflush path
87689d5 ASoC: Push platform registration down into the card
96841ba ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration
6308419 ASoC: Push workqueue data into snd_soc_card
39da581 virtio_net: large tx MTU support
8daa190 x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel
parameter
48d68b2 tracing/function-graph-tracer: support for x86-64
16950e0 ALSA: emu10k1 - Add capture boost mixer switch for Audigy
66eafeb function trace: fix a bug of single thread function trace
222658e Merge branches 'tracing/branch-tracer', 'tracing/ftrace',
'tracing/function-graph-tracer', 'tracing/markers', 'tracing/powerpc',
'tracing/stack-tracer' and 'tracing/tracepoints' into tracing/core
74bf3ca Merge branch 'tracing/urgent' into tracing/core
6976a1d net: percpu_counter_inc() should not be called in BH-disabled section
422d9cd dccp: Feature activation handlers
b1ad004 dccp: Processing Confirm options
e77b836 dccp: Process incoming Change feature-negotiation options
75757a7 dccp: Preference list reconciliation
8b7b6c7 dccp: Integrate feature-negotiation insertion code
0971d17 dccp: Insert feature-negotiation options into skb
7c37d74 IB/ipath: Improve UD loopback performance by allocating temp array
only once
64f22fa IB/ipath: Fix pointer-to-pointer thinko in ipath_fs.c
75c21ae IB/ehca: Fix locking for shca_list_lock
0ecfe79 ASoC: Don't free static data in WM9713
4290239 ASoC: TWL4030: Add volume controls for outputs
d889a72 ASoC: TWL4030: Change the common playback volume controls
381a22b ASoC: TWL4030: Change the capture volume control to TLV
fa5c769 ASoC: Remove in-code changelog from AD73311 driver
7d8c16a ASoC: Annotate core removal function
968a602 ASoC: Rename snd_soc_register_card() to snd_soc_init_card()
6c415b9 sched: add uid information to sched_debug for CONFIG_USER_SCHED
50cec5c x86: fix dma_mapping_error for 32bit x86, cleanup
f6d2e6f Merge branch 'x86/urgent' into x86/iommu
682d587 ALSA: ASoC: Fix old-style trigger callback in s3c2443-ac97.c
5220ed6 ALSA: ASoC: Fix compile warnings on corgi.c
0bc286e Revert "ALSA: soc - Fix compile warnings in wm8903.c"
2caf6a1 ALSA: ASoC: Remove superfluous dependency on SND_SOC
3af4182 Merge branch 'upstream' into topic/asoc
f5d4c67 ALSA: soc - Remove obsoleted sound/driver.h inclusion
1966bbd ALSA: ac97 - Add WM9715 to AC97 IDs
9171e5e ALSA: soc - Fix compile warnings in wm8903.c
ade9b2f ALSA: pcxhr - change firmware filenames
480cf66 ALSA: Fix a compile warning in cs46xx_lib.c
8c2f767 ALSA: hda - Remove unnecessary caches for power states in
patch_sigmatel.c
c9b46f9 ALSA: hda - Use amp cache for SPDIF mute controls in patch_sigmatel.c
9a5df92 Bluetooth: Fix RFCOMM release oops when device is still in use
2e79299 Bluetooth: Fix format arguments warning
a418b89 Bluetooth: Enable per-module dynamic debug messages
5ddd4a6 Bluetooth: Allow SCO audio with Asus WL-BTD202 dongle
7a9d402 Bluetooth: Send HCI Reset command by default on device initialization
12421b4 Bluetooth: Remove deprecated hci_usb driver
7b99d17 Bluetooth: Respect HCI_UART_DEBUG config in hci_ll.c
51a6fbc Bluetooth: Change simple_strtol to simple_strtoul
db7aa1c Bluetooth: Fix warnings for bt_key_strings and bt_slock_key_strings
c6bf514 Bluetooth: Fix leak of uninitialized data to userspace
7644d63 Bluetooth: Fix TX error path in btsdio driver
6a88adf Bluetooth: Add suspend/resume support to btusb driver
a780efa Bluetooth: Handle bulk URBs in btusb driver from notify callback
2eda66f Bluetooth: Add fine grained mem_flags usage to btusb driver
93093d0 x86: provide readq()/writeq() on 32-bit too, complete
a0b1131 x86: provide readq()/writeq() on 32-bit too, cleanup
2c5643b x86: provide readq()/writeq() on 32-bit too
4385cec x86: intel_cacheinfo, minor show_type cleanup
25f1304 gigaset: get rid of info() and warn() macros
af4218c gigaset: remove unnecessary poll method
f08340c tracepoints: Documentation TPPROTO misspelt in
Documentation/tracepoints.txt
65c6dc6 tracing/branch-tracer: include missing irqflags.h
c5419e6 cxgb3: Fix sparse warning and micro-optimize is_pure_response()
f95be180 phy: add the ST ste10Xp PHYs
4621bf1 phy: Add file missed in previous commit.
0f0ca34 phy: power management support
914804b phy: add natsemi PHY driver
65a467f ne2: silence static never defined warnings
d8e8034 bnx2: use net_device_stats nowadays available in net_device
9fd4287 niu: use net_device_stats nowadays available in net_device
70574a9 sched: move double_unlock_balance() higher
f1860c3 Merge branch 'sched/urgent' into sched/core
604094f vfs, seqfile: export mangle_path() generally
a838c2e markers: comment marker_synchronize_unregister() on data dependency
02834f1 ALSA: ac97 - Remove EXPERIMENTAL from CONFIG_SND_AC97_POWER_SAVE
36adba1 ALSA: hda - Remove EXPERIMENTAL from CONFIG_SND_HDA_POWER_SAVE
8caac56 aperture_64.c: clarify that too small aperture is valid reason for
this code
ff7a326 ALSA: hda - Don't export symbols when built-in kernel
645f10c ALSA: hda - Check MODULE instead of CONFIG_SND_HDA_INTEL_MODULE
5b3eec0 x86: ret_from_fork - get rid of jump back
3bdae4f Merge branch 'x86/debug' into x86/irq
9f1e87e x86: entry_64.S - trivial: space, comments fixup
de04b10 ALSA: oxygen: add Claro halo support
57a5ef4 ALSA: hda - Add quirk for Sony VAIO VGN-SR19XN
56d1771 ALSA: hda - Clear codec->proc_widget_hook at reset
2d34e1b ALSA: hda - Add IDT/STAC-specific proc output
5ae3a13 x86: uv bau interrupt -- use proper interrupt number
f1eecf0 powerpc/ppc32: static ftrace fixes for PPC32
0029ff8 powerpc: ftrace, use create_branch
ec682ce powerpc: ftrace, added missing icache flush
d9af12b powerpc: ftrace, fix cast aliasing and add code verification
c7b0d17 powerpc: ftrace, do nothing in mcount call for dyn ftrace
c072c24 ftrace: improve documentation
1d9b16d x86: move GART specific stuff from iommu.h to gart.h
bb40abe ALSA: hda - Remove unused proc entry in hda_bus struct
daead53 ALSA: hda - Add codec-specific proc hook
50cdaf0 ftrace: improve seq_operation of ftrace
6113b74 pkt_sched: fix sparse warning
ea5693c netlink: allow empty nested attributes
c7425ac tracing, alpha: fix build: add missing #ifdef CONFIG_STACKTRACE
ed77a89 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
d51090b tracing/function-graph-tracer: more output tweaks
1a05615 tracing/function-graph-tracer: adjustments of the trace informations
475ad8e decnet: compile fix for removal of byteorder wrapper
11cd41b ALSA: hda - Fix build error with CONFIG_SND_HDA_POWER_SAVE
feea6a5 ixgbe: section fixes
157653c sctp: fix missing label when PROC_FS=n
1289e9e ALSA: hda - Modularize HD-audio driver
73f6a12 ALSA: sound/pci/mixart/mixart.c: Add missing snd_card_free
30d72e9 ALSA: hda - Fix creation of automatic capture mixers
529bd6c ALSA: hda - Fix PCM reconfigure
c2c631e x86: entry_64.S - use ENTRY to define child_rip
3345453 x86: entry_64.S - use X86_EFLAGS_IF instead of hardcoded number
fee2fba ALSA: hda - Move power_save option to hda_intel.c
986862b ALSA: hda - make some functions static
d211af0 i386: get rid of the use of KPROBE_ENTRY / KPROBE_END
ddeb8f2 x86_64: get rid of the use of KPROBE_ENTRY / KPROBE_END
83a8df6 tracing/function-graph-tracer: enhancements for the trace output
c7cc773 Merge branches 'tracing/blktrace', 'tracing/ftrace',
'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core
40a914f igb: Add support for pci-e Advanced Error Reporting
f411303 e100: cleanup link up/down messages
d276016 ixgb: cleanup link up/down messages
b30c4d8 e1000: cleanup link up/down messages
a46e534 ixgbe: cleanup link up/down messages
527d47c igb: link up/down messages must follow a specific format
c4106aa decnet: remove private wrappers of endian helpers
5b9ab2e Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
12666f0 ALSA: snd-usb-caiaq: clean up the control adding code
851fd7b cxgb3: Update FW loading path.
ad58633 cxgb3: integrate FW and protocol engines in the kernel
5256554 cxgb3: avoid potential memory leak.
43a944f cxgb3: set hard_xmit in the netdev_ops
b5ddedc Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
244e6c2 pkt_sched: gen_estimator: Optimize gen_estimator_active()
54f0191 ASoC: Allow more routing features for tlv320aic3x
b235507 mac80211_hwsim: fix-up some print_mac merge damage
860c6e6 mac80211: fix unaligned access in ieee80211_wep_encrypt_data
b50563a p54: fix wmm queue settings
99405f9 ath9k: Use proper TX channel width for setting channels
ff37e33 ath9k: Code scrub
bf8c1ac nl80211: Change max TX power to be in mBm instead of dBm
39d1ffe orinoco: Provide option to avoid unnecessary fw caching
ac7cafd orinoco: Resume spectrum_cs in the same way as orinoco_cs
2cea7b2 orinoco: Cache Symbol firmware
7473431 orinoco: Separate fw caching from download
cb71d9b ath9k: Handle -ENOMEM on RX gracefully
24689c8 rfkill: always call get_state() hook on resume
f80b5e9 rfkill: preserve state across suspend
5925d97 mac80211: Look out for some other AP when disassoc is received.
e2f367f nl80211: Report max TX power in NL80211_BAND_ATTR_FREQS
1048643 ath5k: Clean up eeprom parsing and add missing calibration data
7ac4701 ath9k: Dont update rate control for every AMPDU
40fc95d iwlwifi: TX update chicken bits
31a73fe iwlwifi: TX setup fix confusion between TX queue and TX DMA channel
25e35a5 iwlwifi: 4965 define firmware file name once
201706a iwlwifi: enable base band calibration in 5000 HW
83dde8c iwlwifi: move iwl_clear_stations_table to iwl-sta.c
ce546fd iwl3945 : Fix ad-hoc mode for 3945
0e149cf ath5k: set mac address in add_interface
8f93b8b ath9k: Use straightforward PCI routines to setup the TX buffer.
daa9deb ath9k: Update TX trigger level on a FIFO underrun.
788a3d6 ath9k: Fix bug in deciphering channel flags
c428839 ath9k: Move TX completion routine to xmit.c
2c5a744 ath9k: Use helpers
46d14a5 ath9k: General code scrub
e63835b ath9k: Remove ath9k_rate_table
a8efee4 ath9k: Use rate_driver_data
fe7f4a7 ath9k: Remove ath_rate_softc
5ddfac3 ath9k: Remove rate control reference in VAP
ffd651c ath9k: We don't support non-HT devices, so remove superfluous code.
be0418a ath9k: Revamp RX handling
2b406f1 ath9k: Nuke fixed rate handling in driver
46494e6 ath9k: Remove half/quarter rate tables
4df8ec6 ath9k: Remove ath_rate_newassoc()
7b4d273 ath9k: Remove ath_setup_rates
fe60594 ath9k: Simplify RC alloc/free functions
256b775 ath9k: Merge struct ath_tx_ratectrl with ath_rate_node
3fcdfb4 ath9k: Fix panic while unregistering rfkill
1548c86 rtl8187: Fix transmission count sent to mac80211
1dc5a84 mac80211: Fix pid rate-setting algorithm to allow rate changes
d507748 rt2x00: Don't switch off LED on initialization
f941f85 orinoco: indicate it is using dBm in wireless_stats and spy
8eb41c9 mac80211: make Minstrel the default rate control algorithm
eea0579 ALSA: pcsp - Fix starting the stream with HRTIMER_CB_IRQSAFE_UNLOCK
e7dd8c1 Merge branch 'topic/misc' into topic/pcsp-fix
0bfc245 blktrace: port to tracepoints, update
5f3ea37 blktrace: port to tracepoints
414ff49 ASoC: Fix word wrapping in OMAP Kconfig
3d4cd60 smc-mca: Fix build failure due to typo.
7035560 net: release skb->dst in sock_queue_rcv_skb()
4db646b x86: microcode: fix sparse warnings
f3f47a6 tracing: add "power-tracer": C/P state tracer to help power
optimization
4f19962 ALSA: sound/pci/hda/hda_codec.c: cleanup kernel-doc
437f24f ftrace: add cpu annotation for function graph tracer
660c7f9 ftrace: add thread comm to function graph tracer
e53a631 ftrace: let function tracing and function return run together
5a45cfe ftrace: use code patching for ftrace graph tracer
df4fc31 ftrace: add function tracing to single thread
3496f92 Merge branch 'serge-next' into next
dd24c00 net: Use a percpu_counter for orphan_count
1748376 net: Use a percpu_counter for sockets_allocated
c1b5687 tc: policing requires a rate estimator
71bcb09 tc: check for errors in gen_rate_estimator creation
0e991ec tc: propogate errors from tcf_hash_create
5ceb40d x86: signal: unify signal_{32|64}.c
e5fa2d0 x86: signal: unify signal_{32|64}.c, prepare
bfeb91a x86: signal: cosmetic unification of __setup_sigframe() and
__setup_rt_sigframe()
2601657 x86: signal: move {setup|restore}_sigcontext()
d144d5e ftrace: adding other non-leaving .text sections
4ef8e76 ne2000: convert to net_device_ops
53cdd28 3c503: convert to net_device_ops
e0b8cb0 stnic: convert to net_device_ops
7d359da apne: convert to net_device_ops
50014f1 ne2: convert to net_device_ops
4be7ef4 hp: convert to net_device_ops
0ec4d4f lne390: convert to net_device_ops
8284abe e2100: convert to net_device_ops
9a9aa14 es3210: convert to net_device_ops
d269941 ne3210: convert to net_device_ops
d079841 smc: convert to net_device_ops
d4a97d4 hp-plus: convert to net_device_ops
458228b wd: use net_device_ops
8884c09 8390: add common net_device ops
c2324b6 tracing: function graph tracer, fix
b27aead netns xfrm: per-netns sysctls
c68cd1a netns xfrm: /proc/net/xfrm_stat in netns
59c9940 netns xfrm: per-netns MIBs
4fb236b netns xfrm: AH/ESP in netns!
7013ec3 netns PF_KEY: per-netns /proc/pfkey
07fb0f1 netns PF_KEY: part 2
3fa87a3 netns PF_KEY: part 1
7c2776e netns xfrm: flush SA/SPDs on netns stop
fbda33b netns xfrm: ->get_saddr in netns
c5b3cf4 netns xfrm: ->dst_lookup in netns
db983c1 netns xfrm: KM reporting in netns
7067802 netns xfrm: pass netns with KM notifications
fc34acd netns xfrm: xfrm_user module in netns
a6483b7 netns xfrm: per-netns NETLINK_XFRM socket
bd235e3 netns xfrm: xfrm_input() fixup
ddcfd79 netns xfrm: dst garbage-collecting in netns
3dd0b49 netns xfrm: flushing/pruning bundles in netns
99a6665 netns xfrm: xfrm_route_forward() in netns
f6e1e25 netns xfrm: xfrm_policy_check in netns
52479b6 netns xfrm: lookup in netns
cdcbca7 netns xfrm: policy walking in netns
8d1211a netns xfrm: finding policy in netns
33ffbbd netns xfrm: policy flushing in netns
1121994 netns xfrm: policy insertion in netns
e92303f netns xfrm: propagate netns into policy byidx hash
284fa7d netns xfrm: state walking in netns
5447c5e netns xfrm: finding states in netns
12604d8 netns xfrm: fixup xfrm_alloc_spi()
221df1e netns xfrm: state lookup in netns
0e60245 netns xfrm: state flush in netns
98806f7 netns xfrm: trivial netns propagations
64d0cd0 netns xfrm: propagate netns into bydst/bysrc/byspi hash functions
66caf62 netns xfrm: per-netns policy hash resizing work
dc2caba netns xfrm: per-netns policy counts
a35f6c5 netns xfrm: per-netns xfrm_policy_bydst hash
8b18f8e netns xfrm: per-netns inexact policies
8100bea netns xfrm: per-netns xfrm_policy_byidx hashmask
93b851c netns xfrm: per-netns xfrm_policy_byidx hash
adfcf0b netns xfrm: per-netns policy list
0331b1f netns xfrm: add struct xfrm_policy::xp_net
50a3065 netns xfrm: per-netns km_waitq
c783714 netns xfrm: per-netns state GC work
b8a0ae2 netns xfrm: per-netns state GC list
6308273 netns xfrm: per-netns xfrm_hash_work
0bf7c5b netns xfrm: per-netns xfrm_state counts
529983e netns xfrm: per-netns xfrm_state_hmask
b754a4f netns xfrm: per-netns xfrm_state_byspi hash
d320bbb netns xfrm: per-netns xfrm_state_bysrc hash
73d189d netns xfrm: per-netns xfrm_state_bydst hash
9d4139c netns xfrm: per-netns xfrm_state_all list
673c09b netns xfrm: add struct xfrm_state::xs_net
d62ddc2 netns xfrm: add netns boilerplate
c958396 xfrm: initialise xfrm_policy_gc_work statically
46a8494 3c523: fix warning in drivers/net/3c523.c
99da1a8 depca: fix warning in drivers/net/depca.c
a098397 atlx: fix warning in drivers/net/atlx/atl2.c
287b6e6 tracing/function-return-tracer: set a more human readable output
fb52607 tracing/function-return-tracer: change the name into
function-graph-tracer
45555c0 bluetooth: fix warning in net/bluetooth/rfcomm/sock.c
ff0db04 sunrpc: fix warning in net/sunrpc/xprtrdma/verbs.c
e14bec2 ax25: fix warning in net/ax25/sysctl_net_ax25.c
509dcee Merge branches 'tracing/hw-branch-tracing' and
'tracing/branch-tracer' into tracing/core
e6a1762 mlx4: fix warning in drivers/net/mlx4/mcg.c
3ed7cc0 dccp: fix warning in net/dccp/options.c
b71e839 cassini: fix warning in drivers/net/cassini.c
b58515b mlx4: fix error path in drivers/net/mlx4/en_rx.c
4174439 z85230: fix warning in drivers/net/wan/z85230.c
ef0cd87 sis900: fix warning in drivers/net/sis900.c
180b65d fix warning in fs/dlm/netlink.c
d3f644d dsa: fix warning in net/dsa/mv88e6060.c
2a9e797 dsa: fix warning in net/dsa/mv88e6xxx.c
55205d4 ipv6: fix warning in net/ipv6/ip6_flowlabel.c
dc0a001 pkt_sched: fix warning in net/sched/sch_hfsc.c
ed72b9c sunrpc: fix warning in net/sunrpc/xprtrdma/svc_rdma_transport.c
be5a3c6 qla3xxx: fix warning in drivers/net/qla3xxx.c
f166400 niu: fix another warning in drivers/net/niu.c
51e0f05 niu: fix warnings in drivers/net/niu.c
2e6a684 s2io: fix warning in drivers/net/s2io.c
09bb521 netns: filter out uevent not belonging to init_net
cb13fc2 ixgbe: Naming interrupt vectors
70340d7 niu: Naming interrupt vectors.
9f782db tcp: skb_shift cannot cache frag ptrs past pskb_expand_head
f6486d4 pkt_sched: sch_api: Remove qdisc_list_lock
723b461 net: udp_unhash() can test if sk is hashed
5bc0b3b net: Make sure BHs are disabled in sock_prot_inuse_add()
8eecaba tcp: tcp_limit_reno_sacked can become static
4ada424 mac80211: don't assume driver has been attached on registration
4d3601b ath9k: Configure AR_PHY_SWITCH_COM with apropriate antenna control
ced0957 p54: honour bss_info_changed's basic_rates and other settings
40db0b2 p54pci: cache firmware for suspend/resume
ffed785 p54: minor fixes
d131bb5 p54: enable Mesh Point support
f16f33d mac80211: Use the HT capabilities from the IE instead of the
station's caps.
97b777d ath9k: make DMA memory consistent
1d450cf ath9k: Clarify we only want 32-bit DMA
f1ca216 rt2x00: Detect USB BULK in/out endpoints
c8f9697 rtl8187: Remove module warning and dependence on CONFIG_EXPERIMENTAL
3517afd rtl8187: feedback transmitted packets using tx close descriptor for
8187B
b4572a9 rtl8187: implement conf_tx callback to configure tx queues
54ac218 rtl8187: fix 8187B throughput regression
db93e7b ath9k: Race condition in accessing TX and RX buffers.
306efdd ath9k: IRQ should be disabled before calling free_irq()
e97275c ath9k: Build RFKILL feature even when RFKILL subsystem is a MODULE
f9bbf43 ath9k: incorrect noise floor threshold values.
9f80420 ath9k: INI update for atheros chipets.
ea4a82d iwlwifi: enable custom fw regulatory solution
14b9815 cfg80211: add support for custom firmware regulatory solutions
3f2355c cfg80211/mac80211: Add 802.11d support
88dc1c3 cfg80211: mark regdomains with > NL80211_MAX_SUPP_REG_RULES invalid
02ba0b3 cfg80211: call_crda() won't tell us if CRDA was present
a01ddaf cfg80211: expect different rd in cfg80211 when intersecting
b8295ac cfg80211: separate intersection section in __set_regdom()
8375af3 cfg80211: remove switch from __set_regdom()
5203cdb cfg80211: remove switch from __regulatory_hint()
91e9900 cfg80211: mark negative frequencies as invalid
e0737a7 iwlwifi: iwl-fh.h cleanup
34faf78 iwlwifi: some fh document fix and cleanup
352bc8d iwlwifi: configure_filter rewrite
c305606 iwlwifi : fix checkpatch.pl errors
dbce56a iwlwifi: replace magic constants with define
417f114 iwlwifi: rs: remove fc variable and other cleanups
9f58671 iwlwifi: consolidate station management code
cee53dd iwl3945 : Simplify iwl3945_pci_probe
0e3de99 rt2x00: Fix TX failure path
0f829b1 rt2x00: Move rt73usb register access wrappers into rt2x00usb
c9c3b1a rt2x00: Cleanup indirect register access
9764f3f ath5k: name pci driver "ath5k" too
d6e8cc6 netfilter: fix warning in net/netfilter/nf_conntrack_ftp.c
65f233f netfilter: fix warning in net/netfilter/nf_conntrack_proto_tcp.c
1e9b51c x86, bts, ftrace: a BTS ftrace plug-in prototype
8bba1bf x86, ftrace: call trace->open() before stopping tracing; add
trace->print_header()
6abb11a x86, bts, ptrace: move BTS buffer allocation from ds.c into ptrace.c
ca0002a x86, bts: base in-kernel ds interface on handles
7d55718 Merge branches 'tracing/core', 'x86/urgent' and 'x86/ptrace' into
tracing/hw-branch-tracing
9e0f1b7 ASoC: Clean up kernel-doc for snd_soc_dai_set_fmt
5c0d7bb ASoC: tosa: move gpio probing to machine callbacks
4451582 ASoC: Add support for TI SDP3430
9c8f1a0 ASoC: Fix TWL4030 Kconfig dependency
375e8a7 ASoC: OMAP: Add support for mono audio links in McBSP DAI
0be4305 ASoC: OMAP: Apply channel constrains to N810 machine driver
b0e6481 ALSA: hda - Really fix bits value in proc output
eefe93b Merge branch 'topic/fix/hda' into topic/hda
ee09543 ALSA: hda - Add quirk for MSI 7260 mobo
c0193f3 ALSA: pcxhr - add support for pcxhr stereo sound cards (mixer part)
2f9889a Revert "hso: Fix crashes on close."
ab153d8 Revert "hso: Fix free of mutexes still in use."
cd90ee1 Revert "hso: Add TIOCM ioctl handling."
7628700 ALSA: pcxhr - add support for pcxhr stereo sound cards (firmware
support)
9d948d2 ALSA: pcxhr - add support for pcxhr stereo sound cards (core change)
93bf5d8 ALSA: pcxhr - add support for pcxhr stereo sound cards
9f40ac7 netfilter: nfmark IPV6 routing in OUTPUT, mangle, NFQUEUE
5f145e4 netfilter: nfmark routing in OUTPUT, mangle, NFQUEUE
c6e4c66 ALSA: hda - Assign unsol tags dynamically in patch_sigmatel.c
0e19e7d Merge branch 'topic/fix/hda' into topic/hda
82894b6 ALSA: hda - Fix proc pcm rate bits
fb7e067 xfrm: remove useless forward declarations
6daad37 ah4/ah6: remove useless NULL assignments
69d728b igb: loopback bits not correctly cleared from RCTL register
9b07f3d igb: remove unneeded bit refrence when enabling jumbo frames
7a6b6f5 DCB: fix kconfig option
411c41e aoe: remove private mac address format function
9c8f92a hso: Hook up ->reset_resume
7ea3a9a hso: Add TIOCM ioctl handling.
52429eb hso: Fix free of mutexes still in use.
89930b7 hso: Fix URB submission -EINVAL.
4a3e818 hso: Fix crashes on close.
bab04c3 hso: Add new usb device id's.
47fd5b8 netdev: add HAVE_NET_DEVICE_OPS
e951e4a x86: fix unused variable warning in arch/x86/kernel/hpet.c
14bfc98 tracing, tty: fix warnings caused by branch tracing and tty_kref_get()
0ace285 tcp: handle shift/merge of cloned skbs too
111cc8b tcp: add some mibs to track collapsing
92ee76b tcp: Make shifting not clear the hints
832d11c tcp: Try to restore large SKBs while SACK processing
f58b22f tcp: make tcp_sacktag_one able to handle partial skb too
adb92db tcp: Make SACK code to split only at mss boundaries
e8bae27 tcp: more aggressive skipping
e1aa680 tcp: move tcp_simple_retransmit to tcp_input
4a17fc3 tcp: collapse more than two on retransmission
200036c CRED: fix sparse warnings
a21bba9 net: avoid a pair of dst_hold()/dst_release() in
ip_push_pending_frames()
6ded6ab User namespaces: use the current_user_ns() macro
18b6e04 User namespaces: set of cleanups (v2)
2e77d89 net: avoid a pair of dst_hold()/dst_release() in ip_append_data()
4db0acf net: gen_estimator: Fix gen_kill_estimator() lookups
3f0947c pkt_sched: sch_drr: fix drr_dequeue loop()
4b40eed infiniband: Kill directly reference of netdev->priv
486bf8d netdevice sbni: Convert directly reference of netdev->priv
5c94afd tokenring/3c359.c: Prevent possible mem leak when open failed
138a5cd tokenring/3c359.c: Fix error message when allocating tx_ring
d0cc10a tokenring/3c359.c: fix allocation null check
85920d4 8139too: use err.h macros
3755810 net: Make sure BHs are disabled in sock_prot_inuse_add()
fde22f2 ASoC: Lower priority of resume work logging
67c9151 ASoC: Flag AD1980 as an AC97 interface
3ba9e10 ASoC: Remove DAI type information
4813ead netfilter: nf_conntrack_ftp: change "partial ..." message to
pr_debug()
6f893fb Merge branches 'tracing/branch-tracer', 'tracing/fastboot',
'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/power-tracer',
'tracing/powerpc', 'tracing/ring-buffer', 'tracing/stack-tracer' and
'tracing/urgent' into tracing/core
64b7482 Merge branch 'sched/rt' into sched/core
ef1681d ALSA: hda - Add probe_mask quirk for Medion MD96630
b0bd53a ASoC: TWL4030: Add helper function for output gain controls
0d33ea0 ASoC: TWL4030: Add CGAIN volume control
c10b82c ASoC: TWL4030: Change the Master volume control to TLV
f8d05bd ASoC: TWL4030: Disable soft-volume
55b8bac ASoC: Use supplied DAI for WM9713 rather than substream
328bd89 netfilter: nf_conntrack_proto_sctp: avoid bogus warning
ad07e91 x86 defconfig: increase CONFIG_LOG_BUF_SHIFT
b47b928 x86: drop REBOOT_CF9_COND from reboot fallback chain
920de80 net: Make sure BHs are disabled in sock_prot_inuse_add()
1f87e23 eth: Declare an optimized compare_ether_addr_64bits() function
ef8ef5f ALSA: hda: Added an ALC888 model entry for Fujitsu-Siemens Amilo
Xa3530
a9cb5c9 ALSA: hda - No 'Headphone as Line-out' swich without line-outs
70eb1bf axnet_cs: Fix build after net device ops ne2k conversion.
6f756a8 net: Make sure BHs are disabled in sock_prot_inuse_add()
be77e59 net: fix tunnels in netns after ndo_ changes
c25eb3b net: Convert TCP/DCCP listening hash tables to use RCU
8c862c2 dccp: Header option insertion routine for feature-negotiation
d371056 dccp: Support for Mandatory options
02fa460 dccp: Increase the scope of variable-length htonl/ntohl functions
71c262a dccp: API to query the current TX/RX CCID
b20a9c2 dccp: Set per-connection CCIDs via socket options
2c62ad7 myri10ge: update firmware headers
4ee2ac5 myri10ge: update DCA comments
c1fd3b9 net: af_netlink should update its inuse counter
04f258c net: some optimizations in af_inet
958086d vfs, seqfile: fix comment style on mangle_path
65afa5e tracing/function-return-tracer: free the return stack on free_task()
3b71e9e x86: HPET: fix sparse warning
5f5db59 x86, debug: remove the confusing entry in call trace
a1a00b5 x86: boot - fix sparse warnings
3b6c52b x86: introduce ENTRY(KPROBE_ENTRY)_X86 assembly helpers to catch
unbalanced declaration v3
eae849c tracing/function-return-tracer: don't trace kfree while it frees the
return stack
6efdcfa x86: KPROBE_ENTRY should be paired wth KPROBE_END
322648d x86: include ENTRY/END in entry handlers in entry_64.S
813b852 Merge branch 'ppc/ftrace' of
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into
tracing/powerpc
050dc69 x86: remove duplicate #define from 'cpufeature.h'
8a2503f x86: move dwarf2 related macro to dwarf2.h
e38da59 tracing/stack-tracer: avoid races accessing file
8d26487 tracing/stack-tracer: introduce CONFIG_USER_STACKTRACE_SUPPORT
cffa10a tracing/stack-tracer: fix locking and refcounts
8d7c6a9 tracing/stack-tracer: fix style issues
0429149 trace: fix compiler warning in branch profiler
69bb54e ftrace: add ftrace_off_permanent
033601a ring-buffer: add tracing_off_permanent
e58918a ftrace: scripts/recordmcount.pl support for ARM
3a3d04a ftrace: specify $alignment for sh architecture
2bcd521 trace: profile all if conditionals
bac28bf trace: branch profiling should not print percent without data
45b7974 trace: consolidate unlikely and likely profiler
42f565e trace: remove extra assign in branch check
c204f72 ftrace: create default variables for archs in recordmcount.pl
42e007d ftrace: add support for powerpc to recordmcount.pl script
0da85c0 sh: dynamic ftrace support.
4e42ebd x86: hypervisor - fix sparse warnings
1d926f2 init/main.c: use ktime accessor function in initcall_debug code
c450d78 x86: vmware - fix sparse warnings
2456d73 x86: signal: cosmetic unification of sys_rt_sigreturn()
666ac7b x86: signal: cosmetic unification of sys_sigaltstack()
5c9b3a0 x86: signal: cosmetic unification of including headers
cbe2f5a tracing: allow tracing of suspend/resume & hibernation code again
b54d3de tracing: identify which executable object the userspace address
belongs to
74e2f33 vfs, seqfile: make mangle_path() global
02b6751 tracing: add support for userspace stacktraces in tracing/iter_ctrl
82f60f0 tracing/function-return-tracer: clean up task start/exit callbacks
f201ae2 tracing/function-return-tracer: store return stack into task_struct
and allocate it dynamically
a0a70c7 Merge branches 'tracing/profiling', 'tracing/options' and
'tracing/urgent' into tracing/core
f377fa1 x86: clean up stack overflow debug check
3aeb95d x86_64: fix the check in stack_overflow_check
ca9eed7 Merge commit 'v2.6.28-rc6' into x86/debug
3889d0c x86: revert default reboot method to REBOOT_KBD
4805286 ALSA: hda - fix build warning when CONFIG_PROC_FS=n
9415e1c ALSA: hda - fix DisplayPort naming
a5fcf89 ALSA: hda - document the ELD proc interface
acb0599 ALSA: hda - ELD proc interface write updates
03284c8 ALSA: hda - make HDMI messages more user friendly
cc02b83 ALSA: hda - report selected CA index for Audio InfoFrame
b83923a ALSA: hda - minor HDMI code cleanups
c810841 x86: split out some macro's and move common code to paranoid_exit, fix
c46920d Merge branch 'for-david' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
f5f4cf0 igb: do not use phy ops in ethtool test cleanup for non-copper parts
21fc578 enic: misc cleanup items:
8459645 enic: move wmb closer to where needed: before writing posted_index to
hw
cb3c766 enic: mask off some reserved bits in CQ descriptor for future use
27372bf enic: driver/firmware API updates
86ca9db enic: enable ethtool LRO support
6476a90 WAN pc300too.c: Fix PC300-X.21 detection
7236470 WAN: syncppp.c is no longer used by any kernel code. Remove it.
e022c2f WAN: new synchronous PPP implementation for generic HDLC.
e1f024e WAN: Simplify sca_init_port() in HD64572 driver.
fcfe9ff WAN: Correct comments in hd6457[02].c
0b59cef WAN: HD64572 drivers don't use next_desc() anymore.
61e0a6a WAN: Simplify HD64572 drivers.
9678343 WAN: don't print HD64572 driver versions anymore.
0954ed8 WAN: Simplify HD64572 status handling.
0446c3b WAN: rework HD64572 interrupts a bit.
b0942f7 WAN: HD64572 already handles TX underruns with DMAC.
09fd65a WAN: TX-done handler now uses the ownership bit in HD64572 drivers.
abc9d91 WAN: convert HD64572-based drivers to NAPI.
3022439 WAN: remove SCA support from SCA-II drivers
8859736 WAN: remove SCA II support from SCA drivers
6b40aba WAN: split hd6457x.c into hd64570.c and hd64572.c
4e4fd4e ne2k: convert to net_device_ops
99921b7 eql: convert to net_device_ops
974acda sc92031: convert to net_device_ops
da1c14a qla3xxx: convert to net_device_ops
a8652d2 hamachi: convert to net_device_ops
c64213c bnx2x: convert to net_device_ops
6557d7b ns83820: convert to net_device_ops
bfd82c3 yellowfin: convert to net_device_ops
a7bd89c r6040: convert to net_device_ops
09ab9e7 sis900: convert to net_device_ops
2f30b1f tehuti: convert to net_device_ops
c3ecb9f sfc: convert to net_device_ops
1abd266 netxen: convert to net_device_ops
8765264 dl2k: convert to net_device_ops
0421eae bnx2: convert to net_device_ops
3addc56 mlx4: convert to net_device_ops
8126089 myri10ge: convert to net_device_ops
5d1d07d via-rhine: convert to net_device_ops
8668ae9 qlge: fix sparse warnings
25ed784 qlge: convert to net_device_ops
0402509 s2io: convert to net_device_ops
e48714b jme: convert driver to net_device_ops
e245a38 tg3: Update version to 3.96
2fbb69a broadcom: Add 57780 support
321d32a tg3: Add 57780 support
2243584 tg3: Allow GPHY powerdown on 5761
d5fe488 tg3: Embrace pci_ioremap_bar()
dfe00d7 tg3: Extract FW ver from alt NVRAM formats
6833c04 tg3: Enable GPHY APD on select devices
5e7dfd0 tg3: Prevent corruption at 10 / 100Mbps w CLKREQ
52f4490 tg3: Qualify use of tp->pcix_cap
ad82926 tg3: Use NET_IP_ALIGN
cf005b1 net: remove redundant argument comments
6c0bce3 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
e243455 e1000e: check return code from NVM accesses and fix bank detection
a20e4cf e1000e: fix incorrect link status when switch module pulled
8452759 e1000e: store EEPROM version number to prevent unnecessary NVM reads
0285c8d e1000e: cosmetic newline in debug message
5c48ef3 e1000e: sync change flow control variables with ixgbe
8f12fe8 e1000e: link up/down messages must follow a specific format
75eb0fa e1000e: ESB2 config after link up
438b365 e1000e: check return of pci_save_state
1605927 e1000e: update comments listing supported parts for each MAC family
63dcf3d e1000e: 82571 check for link fix on 82571 serdes
5aa49c8 e1000e: commit speed/duplex changes for m88 PHY
005cbdf e1000e: disable correctable errors for quad ports while going to D3
7e3aab4 inet_diag: Missed conversion after changing inet ehash lockl to
spinlocks.
176301e netdevice pc300: Add the reason about PC300 BROKEN in Kconfig
6636e11 netdevice pc300: Convert directly reference of netdev->priv
2baf8a2 netdevice hdlc: Convert directly reference of netdev->priv
f757fec net: use net_eq() in INET_MATCH and INET_TW_MATCH
b202226 ALSA: hda - Fix build without CONFIG_PROC_FS
b8b1d08 x86: entry_64.S: split out some macro's and move common code to
paranoid_exit
e2f6bc2 x86: entry_64.S: factor out save_paranoid and paranoid_exit
c002a1e x86: introduce save_rest and restructure the PTREGSCALL macro in
entry_64.S
c70bfa8 Merge branch 'topic/fix/hda' into topic/hda
d6752a5 ALSA: hda - mark Dell studio 1535 quirk
a1eb5fe wireless: missing include in lib80211.h
3461fc1 rtl8187: Update file authorship in comments
5984048 Update of MAINTAINERS for RTL8187
4f6d4d1 wireless: clean up sysfs code using %pM
96dd603 MAINTAINERS: claim maintenance over rtl818x drivers
da81ded rtl8180: adapt for deprecated IEEE80211_CONF_SHORT_SLOT_TIME flag
6272710 mac80211: add explicit padding in struct ieee80211_tx_info
beb2a7f net/ieee80211 -> drivers/net/ipw2x00/libipw_* rename
0795cd2 ipw2x00: relocate ipw2100/ipw2200 to common directory
2ba4b32 lib80211: consolidate crypt init routines
274bfb8 lib80211: absorb crypto bits from net/ieee80211
dfe1baf orinoco: fix last beacon reporting on 64-bit systems
1d047de mac80211: remove unnecessary include.
8ff48a8 rt2x00: Fix race condition when using inderect registers
bad1363 rt2x00: Optimize get_duration / get_duration_res
87c1687 drivers/net/wireless/ath9k/rc.c: use ARRAY_SIZE
f9f88fe mac80211_hwsim: Update documentation (AP mode enabled)
9902b18 mac80211: rc80211_pid eliminate sparse warnings
798b7ad rt2x00: Cleanup TX/RX entry handling
0ed94ea mac80211: remove more excess kernel-doc
e4e58cf iwlwifi: use Rx single frame mode (one Rx frame per RB)
01ef932 iwlwifi: get some more information about command failure
c24f081 iwl3945 : Simplify iwl3945_send_beacon_cmd
cb299ba iwlwifi: move iwl_print_hex_dump to iwl-debug.h
e720ce9 iwl3945 : Fix Sparse Warnings
21c339b iwlwifi: move spectrum measurement code to iwl-spectrum.c file
4ddbb7d iwlwifi: revamp tx scheduler byte count tables handling
8d86422 iwlwifi: move rx queue read pointer into rxq
5c5aa3f iwlwifi: update iwl-commands.h for 3 stream support
a71c8f6 iwlwifi: don't fail power set when calibration is not done yet
1933577 iwlwifi: trivial fix in includes
9bdf5ec iwl3945: fix resume for ADHOC network
ada1751 iwlagn: fix resume for ADHOC network
1e87d68 b43: remove rate index warning
7f3704e b43legacy: implement short slot and basic rate handling
3e4127f ipw2200: make association only if SSID is known.
ffb8267 ath9k: enable RXing of beacons on STA/IBSS
296bf2a ath5k: allow APs to receive beacons
6a53a8a ath5k: Fix IMR init
392dff8 ath9k : Display MAC/BB and RF version at startup (v2)
4821277 mac80211: fix BUILD_BUG_ON() caused by misalignment on arm
8b0162a ath5k: ignore the return value of ath5k_hw_noise_floor_calibration
6d64360 rt2x00: Fix BUG_ON() with antenna handling
8058409 rt2x00: Block set_key() during suspend/shutdown
9a95dba rt2x00: Fix LED state handling
3d8606a rt2x00: Remove RATE_BASIC flag
1c740ed Move all rtl818x files to a common directory.
55b3961 mac80211_hwsim: enable Mesh Point operation
a3c9aa5 mac80211: disable BSSID filtering for mesh interfaces
b7b05fe ssb: struct device - replace bus_id with dev_name(), dev_set_name()
582c1b5 libertas: Fine grained configuration of wake-on-lan.
50da3ea ipw2100, ipw2200: select LIB80211
3d29b0c netdevice zd1201: Convert directly reference of netdev->priv to
netdev_priv()
4f90473 ALSA: ASoC: Fix typo in snd_soc_card update documentation
42e81c9 ALSA: hda - fix sparse warning
39639fa ASoC: Improve error reporting for AC97 reset failures
0e734ad ASoC: Staticise pxa2xx_pcm_ops
0c758bd ASoC: OMAP: Fix preprocessor filled DAI name in McBSP DAI
2dac921 ASoC: Add Marvell Zylonite machine support
14ae22b x86: entry_64.S: rename
e8a0e27 x86: clean up after: move entry_64.S register saving out of the
macros, fix
dee89c4 ASoC: Merge snd_soc_ops into snd_soc_dai_ops
a47cbe7 ASoC: Move DAI structure definitions into new soc-dai.h
5de27b6 ASoC: ssm2602: Update supported stream formats
faab5a3 ASoC: ssm2602: Fix priv substreams refs
bd903bd ASoC: Add abbreviation to maintainers for searchability
8750654 ASoC: Rename snd_soc_card to snd_soc_machine
98aa9c8 pkt_sched: sch_drr: Fix qlen in drr_drop()
9d2f472 ixgbe: convert directly reference of netdev->priv
11b444d ALSA: hda - Move HD-audio Kconfig items to sound/pci/hda/Kconfig
e7ee058 ALSA: hda - Make CONFIG_SND_HDA_RECONFIG for codec reconfiguration
f208dba ALSA: hda - Release ELD proc file
b94d353 ALSA: hda - Fix double free of jack instances
957ad01 sched: update comment for move_task_off_dead_cpu
fc02e90 Merge commit 'v2.6.28-rc6' into sched/core
0623536 ALSA: hda - Add missing static for snd_hda_eld_proc_new() inline
funciton
3ddd972 x86: signal: rename COPY_SEG_STRICT to COPY_SEG_CPL3
acdda79 ALSA: hda - support writing to the ELD proc file
db74210 ALSA: hda: modify monitor name to be consistent with other ELD proc
items
218b5ff ALSA: hda - properly print ELD sample bits
75a287d Merge branch 'topic/fix/hda' into topic/hda
c4900be ixgbe: add SFP+ driver support
859ee3c DCB: Add support for DCB BCN
0eb3aa9 DCB: Add interface to query the state of PFC feature.
33dbabc DCB: Add interface to query # of TCs supported by device
4613218 DCB: Add interface to query for the DCB capabilities of an device.
2f90b86 ixgbe: this patch adds support for DCB to the kernel and ixgbe driver
9db66bd net: convert TCP/DCCP ehash rwlocks to spinlocks
b8c26a3 ipgre: convert to netdevice_ops
1326c3d ipv6: convert tunnels to net_device_ops
23a12b1 ipip: convert to net_device_ops
748ff68 hippi: convert driver to net_device_ops
fd8f499 defxx: convert driver to net_device_ops
145186a fddi: convert to new network device ops
007c383 ipmr: convert ipmr virtual interface to net_device_ops
aa18e9e dummy: convert to net_device_ops
0082982 netdev: add more functions to netdevice ops
1725b82 ALSA: hda - make laptop-eapd model back for AD1986A
6ab33d5 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
7cc45e6 powerpc/ppc32: ftrace, dynamic ftrace to handle modules
f48cb8b powerpc/ppc64: ftrace, handle module trampolines for dyn ftrace
e4486fe powerpc: ftrace, use probe_kernel API to modify code
8fd6e5a powerpc: ftrace, convert to new dynamic ftrace arch API
6d07bb4 powerpc: ftrace, do not latency trace idle
dcd072e x86: clean up after: move entry_64.S register saving out of the macros
018a7bf netfilter: ip{,6}t_policy.h should include xp_policy.h
7be6065 netdevice wanrouter: Convert directly reference of netdev->priv
826dd0e netdevice ni65: Convert directly reference of netdev->priv
c8019bf netdevice ppp: Convert directly reference of netdev->priv
f7b2927 smsc95xx: add tx checksum offload support
8761169 sfc: Fix dependency for SFC_MTD
47a1a1d pkt_sched: remove unnecessary xchg() in packet classifiers
b94c8af pkt_sched: remove unnecessary xchg() in packet schedulers
c19d036 isdn: isdn_net.c annotate struct ip_ports and trivial sparse fixes
13d2a1d pkt_sched: add DRR scheduler
0c19b0a netlink: avoid memset of 0 bytes sparse warning
c010360 netdevice lance: Convert directly reference of netdev->priv
5377152 mv643xx_eth: calculate descriptor pointer only once in rxq_refill()
f61e554 mv643xx_eth: move receive error handling out of line
66e63ff mv643xx_eth: implement ->set_rx_mode()
66823b9 mv643xx_eth: inline txq_alloc_desc_index()
37a6084 mv643xx_eth: introduce per-port register area pointer
10a9948 mv643xx_eth: checkpatch fixes
21d1a16 net: ip_sockglue.c add static, annotate ports' endianness
00b5e50 myri10ge: remove hardcoded sram_size
d6279c8 myri10ge: fix per-slice rx/tx_dropped counters
d99015b x86: move entry_64.S register saving out of the macros
c032a2d Merge branch 'x86/cleanups' into x86/irq
87f7606 x86: fix wakeup_cpu with numaq/es7000 v2 - call ->update_genapic()
a61fc1e netdev/smc91x: unify Blackfin code a bit and use proper read/write
functions
3d3e35a dccp: Fix bracing in dccp_feat_list_lookup.
f4bdd26 netdevice hamradio: Convert directly reference of netdev->priv
56bc0f9 netfilter: nf_conntrack_proto_gre: spread __exit
f3a216d netdevice: 82596: Convert netdev->priv to netdev_priv
61d3015 netfilter: ip6table_filter: merge LOCAL_IN and FORWARD hooks
b0ceb56 netfilter: xt_recent: don't save proc dirs
d214c75 filter: add SKF_AD_NLATTR_NEST to look for nested attributes
68fd991 igb: Fix tx/rx_ring_count parameters for igb on suspend/resume/ring
resize
b2d5653 igb: simplify swap in clean_rx_irq if using packet split
3ef6b23 igb: update name to reflect new hardware
5caea4e net: listening_hash get a spinlock per bucket
bb55746 x86: fix arch/x86/kernel/setup.c build warning when
!CONFIG_X86_RESERVE_LOW_64K
90accd6 Merge branch 'linus' into x86/memory-corruption-check
77be80e x86: fix arch/x86/kernel/genx2apic_uv_x.c build warning when
!CONFIG_HOTPLUG_CPU
fbc2a06 Merge branch 'linus' into x86/uv
5b2d1ec ALSA: hda: Added Realtek ALC888 model entry for Acer Aspire 4930G
laptop
41dda0f ALSA: azx_probe() cleanup
d8b83c5 acenic: convert to net_device_ops
2c9171d niu: convert to net_device_ops
b94426b forcedeth: convert to net_device_ops
7c7d64b tg3: convert to net_device_ops
0edc352 ixgb: convert to net_device_ops
afe29f7 enic: convert to net_device_ops
52256cf ppp: convert to net_device_ops
acc7842 e100: convert to net_device_ops
2e5c692 igb: convert to net_device_ops
39a11bd via-velocity: convert to net_device_ops
0e7614b e1000: convert to net_device_ops
80ff32b cxgb2: convert to net_device_ops
dd75269 cxgb3: convert to net_device_ops
825a84d atlx: convert to net_device_ops
1e058ab atl1e: convert to net_device_ops
758e43b tun: convert to net_device_ops
48dfcde 8139: convert to net_device_ops
8b4ab28 r8169: convert to net_device_ops
f80d032 skge: convert to net_device_ops
1436b30 sky2: convert to net_device_ops
651c246 e1000e: convert to net_device_ops
eb7cc59 bonding: convert to net_device_ops
656299f vlan: convert to net_device_ops
5bc3eb7 ip: convert to net_device_ops for ioctl
54a30c9 macvlan: convert to net_device_ops
4456e7b veth: convert to net_device_ops
a2dbb88 bridge: convert to net_device_ops
8dfcdf3 ifb: convert to net_device_ops
c02373b netdev: convert loopback to net_device_ops
ccad637 netdev: expose ethernet address primitives
eeda3fd netdev: introduce dev_get_stats()
d314774 netdev: network device operations infrastructure
6b41e7d net: af_unix should use KERN_INFO instead of KERN_DEBUG
d171235 drivers/s390/ - csum_partial - remove unnecessary casts
07f0757 include/net net/ - csum_partial - remove unnecessary casts
a7a0d6a net: inet_diag_handler structs can be const
14e943d net: make /proc/net/protocols namespace aware
3680453 net: af_packet should update its inuse counter
9789cfe nfsctl: add headers for credentials
7596b27 coda: fix creds reference
ec4e0e2 sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares
9b0db7e ASoC: Convert blackfin machines to use DAI accessor functions
d0c3663 ASoC: s3c24xx_uda134x DAI accessor functions and static cleanup
df573d2 ASoC: Add support for omap2evm board
08bd168 ASoC: Add driver for the Lyrtech SFFSDR board
1c0090c ASoC: Add PCM3008 ALSA SoC driver
8563964 ALSA: hda - Show missing GPIO unsol bits
60a5151 profiling: clean up profile_nop()
9676e73 Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
86fa2f6 ftrace: fix selftest locking
3ac3ba0 Merge branch 'linus' into sched/core
ae8cb4c ALSA: hda: compact ELD output messages
d39b435 ALSA: hda: make global snd_print_pcm_bits()
06f69d1 ALSA: hda: minor output message cleanups
5b87ebb ALSA: hda: rename sink_eld to hdmi_eld
4e19c58 ALSA: hda: minor code cleanups
198d6ba Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
c6798d2 ALSA: hda: EAPD mute on suspend
9c8641e ALSA: hda: HDMI channel mapping cleanups
698544d ALSA: hda: HDMI channel allocations for audio infoframe
903b21d ALSA: hda: make global snd_print_channel_allocation()
5457a98 ALSA: hda: make standalone hdmi_fill_audio_infoframe()
cea555d Merge branch 'linux-2.6' into next
78608dd powerpc/mpic: Use new smp_request_message_ipi
25ddd73 powerpc: Provide a separate handler for each IPI action
a6326e9 powerpc: Correct page-in counter for CMM with 64k pages
22059a9 powerpc/pmac: Use of_find_node_with_property() in pmac_setup_arch()
ba82efb powerpc: Use of_find_node_with_property() in
cell_iommu_fixed_mapping_init()
5401817 powerpc: Use for_each_node_with_property() in of_irq_map_init()
1e291b1 of: Add helpers for finding device nodes which have a given property
ae564c6 powerpc: Optimise mutex
957ab07 powerpc: Optimise smp_rmb
46d075b powerpc: Optimise smp_wmb
a4e22f0 powerpc: Update 64bit __copy_tofrom_user() using
CPU_FTR_UNALIGNED_LD_STD
7526ff7 powerpc: Remove superfluous WARN_ON() from dma-noncoherent.c
efc3624 powerpc: Tell gcc when we clobber the carry in inline asm
d5e5491 powerpc: udbg-based backend for hvc_console
8c65318 serial/pmac_zilog: Add console polling support
9b82f3e powerpc/ps3: Replace the flip_ctl logic in ps3av and ps3fb by a mutex
a225063 ftrace: preemptoff selftest not working
ca3ea02 ASoC: Remove unused snd_soc_machine_config declaration
2af7529 sound: Fix warnings relating to ignored return value in
snd_card_register
b5fe363 x86: use update_genapic to get rid of ES7000_CLUSTERED_APIC v2
f632ddc x86: fix wakeup_cpu with numaq/es7000, v2, fix #2
6497760 x86: ia32_signal: change order of storing in setup_sigcontext()
047ce93 x86: ia32_signal: remove using temporary variable
8c6e5ce x86: ia32_signal: cleanup macro RELOAD_SEG
d71a68d x86: ia32_signal: introduce COPY_SEG_CPL3
b78a5b5 x86: ia32_signal: cleanup macro COPY
cbe9ee0 Merge branch 'x86/urgent' into x86/cleanups
a1afd01 x86: default to SWIOTLB=y on x86_64
72f2b89 ASoC: Move uda134x_codec.h to uda134x.h
a0bd65f ASoC: Blackfin: always set a default value for that GPIO range
27b9be5 ASoC: Blackfin: Simplify the MMAP_SUPPORT macros protected code
caa4583 ASoC: Blackfin: do not force TWI bus for ssm2602 codec
0cade26 ASoC: Fix Blackfin AC97 DAI probe function return code
a89e611 ASoC: Blackfin: Fix AD1980/1 build with MMAP support disabled
67f854b ASoC: Blackfin: add multi-channel function support
9905ed3 ASoC: AD1980 codec: add multi-channel function support
a11311d ASoC: Blackfin: updates Kconfig for SPORT
cb6e206 ASoC: DaVinci: Fix audio stall when doing full duplex
cd896c3 ALSA: hda - Allow multiple imux for matrix-type mixers of ALC codecs
e17b666 netfilter: nf_conntrack: fix warning and prototype mismatch
d9e1500 netfilter: nfnetlink_log: fix warning and prototype mismatch
19abb7b netfilter: ctnetlink: deliver events for conntracks changed from
userspace
226c0c0 netfilter: ctnetlink: helper modules load-on-demand support
0231022 tracing/function-return-tracer: add the overrun field
0619faf tracing/ftrace: make nop tracer using tracer flags
adf9f19 tracing/ftrace: implement a set_flag callback for tracers
a581780 Merge branch 'topic/fix/hda' into topic/hda
af9f341 ALSA: hda - Fix restore of pin configs at resume for STAC/IDT codecs
2c88587 ALSA: hda - Use init callback in stac92xx_resume()
e4973e1 ALSA: hda - Create jack detection elements in build_controls
f3a5c54 Merge branch 'master' into next
5a209c2 Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into
tracing/core
5f1e71b ALSA: ELD proc interface for HDMI sinks
7f4a9f4 ALSA: create hda_eld.c for ELD routines and proc interface
33deeca ALSA: introduce snd_print_pcm_rates()
2eca83b ALSA: hda: remove redundant get_amp_nid()
bc4a68f ALSA: snd-powermac: enable mic on iMac G4
54ac14a x86: fix wakeup_cpu with numaq/es7000, v2, fix
8d702f2 ASoC: Build tlv320aic23 cleanly
2adb983 ASoC: Manage VMID mode for WM8990
be1b87c ASoC: Enable WM8990 ADC clocking workaround
ba533e9 ASoC: Allow writes to uncached registers in WM8990
569712b x86: fix wakeup_cpu with numaq/es7000, v2
4dc06f9 netfilter: nf_conntrack: connection tracking helper name persistent
aliases
528a3a6 netfilter: ctnetlink: get rid of module refcounting in ctnetlink
bfe2967 netfilter: ctnetlink: use EOPNOTSUPP instead of EINVAL if the
conntrack has no helper
238ede8 netfilter: ctnetlink: use nf_conntrack_get instead of atomic_inc
7ad933d ASoC: Machine driver for for s3c24xx with uda134x
1cad1de ASoC: UDA134x codec driver
0c726da tracing: branch tracer, fix writing to trace/trace_options
6e5d9db ASoC: Fix for master playback/capture volume range for TWL4030 codec
9a57f7f net: sctp should update its inuse counter
a8076d8 net: af_unix should update its inuse counter
0bd7b79 x86: entry_64.S: remove whitespace at end of lines
9dacc71 Merge commit 'v2.6.28-rc5' into x86/cleanups
796359d ALSA: hda-intel: reorder HDMI audio enabling sequence
c0cea0d ALSA: hda: STAC_DELL_M6 EAPD
3ab9093 ALSA: hda: alc883 model for ASUS P5Q-EM boards
3f8e402 Merge branches 'tracing/branch-tracer', 'tracing/ftrace',
'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent'
into tracing/core
248969a net: af_unix can make unix_nr_socks visbile in /proc
c3ccc12 netdevice chelsio: Convert directly reference of netdev->priv
4d24b52 ematch: simpler tcf_em_unregister()
6eba6a3 net: Cleanup of af_unix
1910299 dccp: Tidy up setsockopt calls
dd9c0e3 dccp: Deprecate Ack Ratio sysctl
2945055 dccp: Feature negotiation for minimum-checksum-coverage
49aebc6 dccp: Deprecate old setsockopt framework
0c11683 dccp: Mechanism to resolve CCID dependencies
3f2c31d virtio_net: VIRTIO_NET_F_MSG_RXBUF (imprive rcv buffer allocation)
0276b49 virtio_net: hook up the set-tso ethtool op
0a888fd virtio_net: Recycle some more rx buffer pages
908cd2d net: use %pF for /proc/net/ptype
5635c10 net: make sure struct dst_entry refcount is aligned on 64 bytes
536533e rcu: documents rculist_nulls
3ab5aee net: Convert TCP & DCCP hash tables to use RCU / hlist_nulls
88ab193 udp: Use hlist_nulls in UDP RCU code
bbaffac rcu: Introduce hlist_nulls variant of hlist
e8b2dfe TPROXY: implemented IP_RECVORIGDSTADDR socket option
8164f1b ipv4: Fix ARP behavior with many mac-vlans
6ea7ae1 e1000e: enable ECC correction on 82571 silicon
f004f3e phylib: make mdio-gpio work without OF (v4)
72af187 phylib: rename mdio-ofgpio to mdio-gpio
6817ba2 dm9000: Fix build error.
227a837 markers/tracpoints: fix non-modular build
cda2836 pegasus: minor resource shrinkage
74ad0a5 ixgbe: Fix usage of netif_*_all_queues() with netif_carrier_{off|on}()
0a7ad64 tracepoints: format documentation
0dcf8fe tracepoints, docs:
marker_synchronize_unregister->tracepoint_synchronize_unregister
8fd88d1 tracepoints: documentation fix for teardown
7e066fb tracepoints: add DECLARE_TRACE() and DEFINE_TRACE()
32f8574 tracepoints: use modules notifiers
5f38267 tracepoints: do not put arguments in name
c420970 tracepoints: use unregister return value
da7b3ea tracepoints: use rcu_*_sched_notrace
de0baf9 tracepoints: fix disable
2504ea5 tracepoints: samples, fix teardown
a0bca6a markers: create DEFINE_MARKER and GET_MARKER (new API)
c1df1bd markers: auto enable tracepoints (new API : trace_mark_tp())
a419246 markers: use module notifier
021aeb0 markers: use rcu_*_sched_notrace and notrace
e3f8c4b markers: add missing stdargs.h include, needed due to va_list usage
2bdba31 markers: fix unregister
954e100 rcu: add rcu_read_*_sched_notrace()
e7d3737 tracing/function-return-tracer: support for dynamic ftrace on
function return tracer
b01c746 tracing/function-return-tracer: add a barrier to ensure return stack
index is incremented in memory
9858096 Merge branch 'tracing/ftrace' into tracing/function-return-tracer
072b40a tracing/branch-tracer: fix a trace recursion on branch tracer
1c80025 tracing/ftrace: change the type of the init() callback
e6e7a65 tracing/ftrace: fix unexpected -EINVAL when longest tracer name is set
ee02a2e ftrace: make filtered functions effective on setting
982c350 ftrace: fix dyn ftrace filter
20e5227 ftrace: allow NULL pointers in mcount_loc
31e8890 ftrace: pass module struct to arch dynamic ftrace functions
d51ad7a ftrace: replace raw_local_irq_save with local_irq_save
918c115 ftrace: do not process freed records
b17e8a3 ftrace: disable ftrace on anomalies in trace start and stop
f3c7ac4 ftrace: remove condition from ftrace_record_ip
c91add5 Merge branches 'tracing/fastboot', 'tracing/ftrace' and
'tracing/urgent' into tracing/core
e2da9ba Merge branch 'topic/fix/hda' into topic/hda
e50a906 capabilities: define get_vfs_caps_from_disk when file caps are not
enabled
71cfc90 ASoC: Add WM8728 codec driver
2bef901 ASoC: Revert "ASoC: Add new parameter to s3c24xx_pcm_enqueue"
127e82e ALSA: hda - Support Headphone and Speaker volumes control on VAIO
8a75f4f ALSA: pcsp - Use HRTIMER_CB_IRQSAFE_UNLOCKED
ef711cf net: speedup dst_release()
f30ab41 pkt_sched: Remove qdisc->ops->requeue() etc.
38a7ddf tcp: remove an unnecessary field in struct tcp_skb_cb
00bcd52 isdn: use %pI4, remove get_{u8/u16/u32} and put_{u8/u16/u32} inlines
722024d x86: irq: fix apicinterrupts on 64 bits
2b82892 Merge branch 'master' into next
3a3b7ce CRED: Allow kernel services to override LSM settings for task actions
1bfdc75 CRED: Add a kernel_service object class to SELinux
3b11a1d CRED: Differentiate objective and effective subjective credentials on
a task
98870ab CRED: Documentation
d76b0d9 CRED: Use creds in file structs
1d04598 CRED: Prettify commoncap.c
a6f76f2 CRED: Make execve() take advantage of copy-on-write credentials
d84f4f9 CRED: Inaugurate COW credentials
745ca24 CRED: Pass credentials through dentry_open()
88e67f3 CRED: Make inode_has_perm() and file_has_perm() take a cred pointer
6cc88bc CRED: Rename is_single_threaded() to is_wq_single_threaded()
bb952bb CRED: Separate per-task-group keyrings from signal_struct
275bb41 CRED: Wrap access to SELinux's task SID
c69e8d9 CRED: Use RCU to access another task's creds and to release a task's
own creds
86a264a CRED: Wrap current->cred and a few other accessors
f1752ee CRED: Detach the credentials from task_struct
b6dff3e CRED: Separate task security context from task_struct
15a2460 CRED: Constify the kernel_cap_t arguments to the capset LSM hooks
1cdcbec CRED: Neuter sys_capset()
8bbf497 KEYS: Alter use of key instantiation link-to-keyring argument
e9e349b KEYS: Disperse linux/key_ui.h
76aac0e CRED: Wrap task credential accesses in the core kernel
b103c59 CRED: Wrap task credential accesses in the capabilities code
47d804b CRED: Wrap task credential accesses in the key management code
8192b0c CRED: Wrap task credential accesses in the networking subsystem
19d6562 CRED: Wrap task credential accesses in the UNIX socket protocol
8f41940 CRED: Wrap task credential accesses in the SunRPC protocol
c2a2b8d CRED: Wrap task credential accesses in the ROSE protocol
ba95b23 CRED: Wrap task credential accesses in the netrom protocol
f82b3590 CRED: Wrap task credential accesses in the IPv6 protocol
7340040 CRED: Wrap task credential accesses in the AX25 protocol
414c070 CRED: Wrap task credential accesses in the SYSV IPC subsystem
da9592e CRED: Wrap task credential accesses in the filesystem subsystem
82ab8de CRED: Wrap task credential accesses in the XFS filesystem
a5f773a CRED: Wrap task credential accesses in the UFS filesystem
7706bb3 CRED: Wrap task credential accesses in the UDF filesystem
26bf194 CRED: Wrap task credential accesses in the UBIFS filesystem
fc7333d CRED: Wrap task credential accesses in the SYSV filesystem
e2950b1 CRED: Wrap task credential accesses in the SMBFS filesystem
414cb20 CRED: Wrap task credential accesses in the ReiserFS filesystem
0785f4d CRED: Wrap task credential accesses in the RAMFS filesystem
c222d53 CRED: Wrap task credential accesses in the OMFS filesystem
b19c2a3 CRED: Wrap task credential accesses in the OCFS2 filesystem
5cc0a84 CRED: Wrap task credential accesses in the NFS daemon
4893702 CRED: Wrap task credential accesses in the NCPFS filesystem
922c030 CRED: Wrap task credential accesses in the Minix filesystem
8f659ad CRED: Wrap task credential accesses in the JFS filesystem
77c70de CRED: Wrap task credential accesses in the hugetlbfs filesystem
de395b8 CRED: Wrap task credential accesses in the HPFS filesystem
4ac8489 CRED: Wrap task credential accesses in the HFSplus filesystem
94c9a5e CRED: Wrap task credential accesses in the HFS filesystem
3de7be3 CRED: Wrap task credential accesses in the GFS2 filesystem
2186a71 CRED: Wrap task credential accesses in the FUSE filesystem
f0ce7ee CRED: Wrap task credential accesses in the FAT filesystem
4c9c544 CRED: Wrap task credential accesses in the Ext4 filesystem
6a2f90e CRED: Wrap task credential accesses in the Ext3 filesystem
a8dd4d6 CRED: Wrap task credential accesses in the Ext2 filesystem
4eea035 CRED: Wrap task credential accesses in the eCryptFS filesystem
ec4c2aa CRED: Wrap task credential accesses in the devpts filesystem
97b7702 CRED: Wrap task credential accesses in the Coda filesystem
a001e5b CRED: Wrap task credential accesses in the CIFS filesystem
1109b07 CRED: Wrap task credential accesses in the BFS filesystem
0eb790e CRED: Wrap task credential accesses in the autofs4 filesystem
73c646e CRED: Wrap task credential accesses in the autofs filesystem
2155998 CRED: Wrap task credential accesses in the AFFS filesystem
f8b9d53 CRED: Wrap task credential accesses in 9P2000 filesystem
cd80ca8 CRED: Wrap task credential accesses in the USB driver
ee9785a CRED: Wrap task credential accesses in the network device drivers
0e164b6 CRED: Wrap task credential accesses in the ISDN drivers
66303bc CRED: Wrap task credential accesses in the tty driver
b0fafa8 CRED: Wrap task credential accesses in the block loopback driver
350b4da CRED: Wrap task credential accesses in the x86 arch
e542370 CRED: Wrap task credential accesses in the S390 arch
1330deb CRED: Wrap task credential accesses in the PowerPC arch
25e1573 CRED: Wrap task credential accesses in the PA-RISC arch
b421273 CRED: Wrap task credential accesses in the MIPS arch
ef81ee9 CRED: Wrap task credential accesses in the IA64 arch
d1aaf8c tracing/fastboot: put error message on stderr
b3535c6 ftrace: remove unnecessary if condition of
__unregister_ftrace_function
cd80bc6 Merge branch 'topic/fix/hda' into topic/hda
0b60485 ASoC: OMAP: Add more supported sample rates into McBSP DAI driver
bbba944 ASoC: Fix supported sample rates of TWL4030 audio codec
c4da29c ALSA: hda - support detecting HD Audio devices with PCI class code
12ef7d4 ftrace: CPU buffer start annotation clean ups
ee6bce5 ftrace: rename iter_ctrl to trace_options
1696b2b ftrace: show buffer size in kilobytes
a94c80e ftrace: rename trace_entries to buffer_size_kb
24de386 Merge branches 'tracing/branch-tracer', 'tracing/fastboot',
'tracing/function-return-tracer' and 'tracing/urgent' into tracing/core
524ad0a netdevice: safe convert to netdev_priv() #part-4
8f15ea4 netdevice: safe convert to netdev_priv() #part-3
4cf1653 netdevice: safe convert to netdev_priv() #part-2
454d7c9 netdevice: safe convert to netdev_priv() #part-1
7a12122 net: Remove unused parameter of xfrm_gen_index()
2378982 net: ifdef struct sock::sk_async_wait_queue
3a95cb9 ALSA: handle SiI1392 HDMI codec in patch_intelhdmi.c
e4412cb bnx2: Update version to 1.8.2.
40105c0 bnx2: Reorganize timeout constants.
d8026d9 bnx2: Set rx buffer water marks based on MTU.
5ec6d7b bnx2: Restrict WoL support.
1caacec bnx2: Add PCI ID for 5716S.
1dc1c6a tracing/function-return-tracer: call prepare_ftrace_return by
registers
62d59d1 tracing/function-return-tracer: make the function return tracer
lockless
94b80ff ftrace: rename trace_unlikely.c file
80e5ea4 ftrace: add tracer called branch
9f029e8 ftrace: rename unlikely iter_ctrl to branch
2ed84ee trace: rename unlikely profiler to branch profiler
8652cb4 x86: warn of incorrect cpu_khz on AMD systems
8665596 x86: fix up the new IRQ code for older versions of gas
68f96c0 tracing/fastboot: fix perlcritic warning
c415b3d x86: disable IRQs before doing anything on nmi_shootdown_cpus()
bb8dd27 x86: make nmi_shootdown_cpus() available on !SMP and !X86_LOCAL_APIC
2ddded2 x86: move nmi_shootdown_cpus() to reboot.c
c370e5e x86 kdump: make nmi_shootdown_cpus() non-static
8e29478 x86 kdump: make kdump_nmi_callback() a function ptr on
crash_nmi_callback()
d1e7b91 x86 kdump: create kdump_nmi_shootdown_cpus()
b2bbe71 x86 kdump: move crashing_cpu assignment to nmi_shootdown_cpus()
a7d4182 x86 kdump: extract kdump-specific code from crash_nmi_callback()
fd64138 ALSA: include/sound/info.h - coding style changed
972d4c5 ALSA: hdsp/hdspm: remove card->id from rawmidi device name
c2eb9c4 ALSA: when card identification is changed, change also /proc/asound
symlink
9fb6198 ALSA: add /sys/class/sound/card#/id (r/w) and card#/number (r/o) files
eb42c75 Merge branch 'linus' into x86/crashdump
11843ee ALSA: powermac - Rename mic-analog loopback mixer element
68d119f tracing: finetune branch-tracer output
2b7d039 tracing: branch tracer, fix vdso crash
fb0ef64 ASoC: DaVinci: Audio: Fix swapping of channels at start of stereo
playback
9cc3c49 x86: ia32_signal: remove unnecessary padding
4a61204 x86: signal_32: introduce retcode and rt_retcode
f88c4ae tracing: branch tracer, tweak output
52f232c tracing: likely/unlikely branch annotation tracer
1f0d69a tracing: profile likely and unlikely annotations
cb9382e Merge branches 'tracing/fastboot', 'tracing/function-return-tracer'
and 'tracing/ring-buffer' into tracing/core
642edba ring-buffer: fix deadlock from reader_lock in read_start
92a77aa security: remove broken and useless declarations
a7d26f8 ALSA: Release v1.0.18a
7423907 tracing/fastboot: Use the ring-buffer timestamp for initcall entries
3f5ec13 tracing/fastboot: move boot tracer structs and funcs into their own
header.
60a011c Merge branch 'tracing/function-return-tracer' into tracing/fastboot
d06bbd6 Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
90d0be2 Merge branch 'topic/fix/hda' into topic/hda
e42ea98 net: Cleanup of neighbour code
7a9546e net: ib_net pointer should depends on CONFIG_NET_NS
8f424b5 net: Introduce read_pnet() and write_pnet() helpers
9eca0a4 dccp: Resolve dependencies of features on choice of CCID
d90ebcb dccp: Query supported CCIDs
e8ef967 dccp: Registration routines for changing feature values
f74e91b dccp: Limit feature negotiation to connection setup phase
6bb3ce2 net: remove struct dst_entry::entry_size
9b739ba net: remove struct neigh_table::pde
14d7ca5 x86: attempt reboot via port CF9 if we have standard PCI ports
7e452ba Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
3ac38c3 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
939b787 x86: 64 bits: shrink and align IRQ stubs
486936c Merge branch 'linux-2.6' into next
b7c6244 x86: 32 bits: shrink and align IRQ stubs
4687518 x86: 32 bit: interrupt stub consistency with 64 bit
3e89c7b ring-buffer: clean up warn ons
9ee670f x86/doc: spelling fix for grub
c280ea5 x86: fix documentation typo in arch/x86/Kconfig
a4c5279 x86, 64-bit: update address space documentation
9757d55 ath9k: Fix compilation failure when RFKILL is enabled
f83c9d0 ring-buffer: add reader lock
a98f8fd x86: apic reset counter on shutdown
d3ec5ca x86: call machine_shutdown and stop all CPUs in native_machine_halt
50ee917 sched/rt: removed unneeded defintion
934352f sched: add hierarchical accounting to cpu accounting controller
19b3e96 tracing: function return tracer, build fix
0667467 Currently SELinux jumps through some ugly hoops to not audit a
capbility
a2f2945 The oomkiller calculations make decisions based on capabilities.
Since
0611216 Add a new capable interface that will be used by systems that use
audit to
637d32d Capabilities: BUG when an invalid capability is requested
e68b75a When the capset syscall is used it is not possible for audit to
record the
3fc689e Any time fcaps or a setuid app under SECURE_NOROOT is used to result
in a
851f7ff This patch will print cap_permitted and cap_inheritable data in the
PATH
c0b0044 This patch add a generic cpu endian caps structure and externally
available
9d36be7 Document the order of arguments for cap_issubset. It's not instantly
clear
ff9b48c sched: include group statistics in /proc/sched_debug
a3d732f x86, UV: fix redundant creation of sgi_uv
867f7fb tracing, x86: function return tracer, fix assembly constraints
8587b33f [PATCH] nvram - convert PRINT_PROC to seq_file
971ddcf [PATCH] nvram - CodingStyle
f1c4be5 tracing, x86: clean up FUNCTION_RET_TRACER Kconfig
15e6cb3 tracing: add a tracer to catch execution time of kernel functions
caf4b32 tracing, x86: add low level support for ftrace return tracing
d844222 Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
f536aaf ring-buffer: replace most bug ons with warn on and disable buffer
5aa1ba6 ftrace: prevent ftrace_special from recursion
e0cb4eb Merge branch 'tracing/urgent' into tracing/ftrace
ae1e913 sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER =>
SCHED_OMIT_FRAME_POINTER
eb37b41 pktgen: add full reset functionality
9b1582d Phonet: use net_device built-in stats for GPRS
fb28ad3 net: struct device - replace bus_id with dev_name(), dev_set_name()
2377989 Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
c483246 rtl8187: Change TX power settings
b2e53b3 orinoco: Move sources to a subdirectory
5166ccd cfg80211: Add kdoc for struct regulatory_request
b219cee cfg80211: make use of reg macros on REG_RULE
9c96477 cfg80211: Add regulatory domain intersection capability
d71aaf6 cfg80211: a reg rule is invalid if freq diff is 0
fc6971d mac80211_hwsim: Add support for client PS mode
fbf1892 mac80211: Allow AP mode to be enabled
d61272c mac80211: fix basic rates setting from association response
ab1ef98 mac80211_hwsim: Make sure beacon_timer gets deleted
3188848 nl80211: Add TX queue parameter configuration
1e898ff mac80211_hwsim: Debug info for TX queue parameters
90c97a0 nl80211: Add basic rate configuration for AP mode
fe63bfa mac80211_hwsim: Debug info for BSS config changes
95f8e38 b43legacy: reindent misleading statement
ccf5dd1 libertas_tf: fix skb tail pointer
9483407 p54: initialize all deprecated fields
c8034c4 p54: don't report known but unhandled EEPROM codes as unknown
61780ee iwlwifi: do not call statistics from rfkill
eb48dca iwlwifi: iwl-agn-rs: initialize rs with valid antenna
6a63578 iwlwifi: rename double inclusion protection name in iwl-commands.h
5b9f8cd iwlwifi: rename generic iwlagn functions that had a HW specific name
60294de iwlwifi: fix priv->iw_mode setting when multiple vif are configured
eb4779c iwlwifi: trivial removal of some 4965 remaining from iwl-agn-rs.h
9c80c50 iwlwifi: reorganize flow handler bitology
c7ab5ef b43: implement short slot and basic rate handling
bd81525 wireless: implement basic rate helper function
743b97c rt2x00: Remove debugfs CSR access wrappers
f161796 ath9k: correct warning about unintialized variable 'tid'
74508b2 rtl8187: Reduce channel switch delay
94d4fe9 rtl8187: Remove primitive write delays
946d1c2 rtl8187: Remove msleep calls after calls to rtl8225_write
a3d67bc rtl8187: Remove CCK delays
35cc988 rtl8187: Remove OFDM delays
2f20596 rtl8187: Remove large delays
9344e86 rt2x00: Release rt2x00 2.2.2
3514a44 rt2x00: Improve interface_modes initialization
c3fd7b4 rt2x00: Remove ieee80211_bss_conf from rt2x00_intf
e4ea1c4 rt2x00: Optimize configuration handling
3f64b43 ath5k: update keycache to support TKIP handling
9ad9a26 ath5k: enable hardware encryption for WEP
2a941ec wireless: fix two bad print_ssid conversions
8469cde mac80211: Add a new event in ieee80211_ampdu_mlme_action
dca3edb ath9k: Remove internal RX A-MPDU processing
7f95903 ath9k: Clear HT info on starting the driver
ccc75c5 ath9k: Remove ath_tx_aggr_resp()
05a1e2d ath9k: Enable interrupts at the proper place
154662a ath9k: Remove unnecessary TSF reset
9c84b79 ath9k: Streamline attach/detach
50fdae2 ath9k: Remove unused function ath_get_currentCountry()
f1dc560 ath9k: Refactor hw.c
5640b08 ath9k: Revamp VAP management
a37c2c7 ath9k: Use bitfields to store tid's state in a single variable
102e057 ath9k: Ensure ath_node is not NULL when updating tx chainmask
43453b3 ath9k: Remove SM Power Save as it is not supported now
528f0c6 ath9k: Revamp transmit control block
c517016 ath9k: Simplify node attach/detach routines
b5aa9bf ath9k: Node cleanup
17683c6 ath5k: fix keytable type buglet in ath5k_hw_reset_key
f07a6c4 ath5k: Update PCU code
2c70600 don't use net/ieee80211.h
9b1fbae iwl3945: remove bogus comment
41bb73e mac80211: remove SSID driver code
b23f99b adm8211: remove SSID code
71c11fb b43/legacy: remove SSID code
4607816 iwlwifi: remove unused essid variable
a57a59f iwlwifi: remove implicit direct scan
430cfe9 iwl3945: remove dead code
e5704bf ath9k: remove useless NULL initialisers
2df7816 wireless: fix a few sparse warnings
1239cd5 wireless: move mesh config length constant
97c8b01 mac80211: print reason code for deauth/dissoc frames
db4186c p54: eliminate warning for uninitialized variable 'tim_len'
e5ea92a p54: AP & Ad-hoc testing
94585b0 p54: put broadcast frames into the right queues
9e7f3f8 p54: more definitions form lmac_longbow.h and pda.h
9a8675d p54: introduce new names for device firmwares
4ceb7b6 netdevice libertas: Fix directly reference of netdev->priv
f43aa02 ALSA: hda - Fix another cache list management
b402dff ASoC: Add Right-Justified mode and Codec clock master to davinci-i2s
53599bb ASoC: s3c24xx 8 bit sound fix
ba21ebb x86: apic - use pr_ macros for logging
4e03043 x86: apic - calibrate_APIC_clock remove redundant irq-enable-disable
4ecd33d Merge commit 'v2.6.28-rc4' into x86/apic
f4166c5 x86, bts: DS and BTS initialization
19f47c6 x86: x86_32 has its own irq_regs definition
87135d9 Merge commit 'v2.6.28-rc4' into x86/cleanups
4fcc50a x86: clean up vget_cycles()
39c9aed SELinux: Use unknown perm handling to handle unknown netlink msg types
cb9e35d x86: clean up rdtsc_barrier() use
895e031 Merge branch 'linus' into x86/cleanups
15002fa x86: signal: cosmetic unification of setup_sigcontext()
a309720 ftrace: display start of CPU buffer in trace output
769c48e ftrace: force pass of preemptoff selftest
7d5222a ftrace: align __mcount_loc sections
c76f069 ftrace: remove trace array ctrl
bbf5b1a ftrace: remove ctrl_update method
49833fc ftrace: enable trace_printk by default
4519317 ftrace: irqsoff tracer incorrect reset
e168e05 ftrace: fix sched_switch API
75f5c47 ftrace: fix boot trace sched startup
0183fb1 ftrace: fix set_ftrace_filter
a6b0786 Merge branches 'tracing/ftrace', 'tracing/fastboot',
'tracing/nmisafe' and 'tracing/urgent' into tracing/core
f574179 tipc: trivial endian annotation in debug statement
f400923 pkt_sched: Control group classifier
505d4f7 net: Guaranetee the proper ordering of the loopback device. v2
5d6d480 net: fib_rules ordering fixes.
3d8160b Revert "net: Guaranetee the proper ordering of the loopback device."
0edb945 ALSA: hda - Fix probe errors on Dell Studio Desktop
30cde0a ALSA: hda - Fix ALC260 hp3013 master switch
26df91c ASoC: TLV320AIC23B Support more sample rates
167c627 Merge branch 'davem-next' of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
6d21cd6 sched: clean up SCHED_CPUMASK_ALLOC
258594a Merge branch 'sched/urgent' into sched/core
f66fced ALSA: Document debug macros
a827206 fmvj18x_cs: write interrupt ack bit for lan and modem to work
simultaneously.
945eed0 ALSA: Evaluate condition in snd_BUG_ON() in non-debugging case
0774023 Merge branch 'topic/fix/hda' into topic/hda
63cf123 Merge branch 'topic/fix/misc' into topic/misc
5c7f033 phonet: sparse annotations of protocol, remove forward declaration
ca62059 ipvs: oldlen, newlen should be be16, not be32
76acfdb net: mark flow_cache_cpu_prepare() as __init
9eeda9a Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
ea2da6e ALSA: hda - Fix broken hash chain allocation
b910d9a ALSA: hda - Add max allocation check in array allocator
c217429 ALSA: hda - Add missing NULL check in amp hash allocation
a87d091 x86, sched: enable wchan config menu item on 64-bit
6a60dd1 ftrace: split out hardirq ftrace code into own header
cf7f869 sched, lockdep: inline double_unlock_balance()
6415483 ALSA: hda - Add lifebook model for Realtek ALC269
6ce4a3b ALSA: hda - Make codec-probing more robust
33fa35e ALSA: hda - simplify hda_bus ops callbacks
e18c94d ALSA: ASoC: TWL4030 codec - fix 256*Fs clock
fd51b2d x86: update CONFIG_NUMA description
90080bf sched, documentation: update scheduler header file paths
8735b7d x86: signal_64: make setup_sigcontext() similar
ee7d523 x86: signal_64: setup fpstate in setup_sigcontext()
99ea1b9 x86: ia32_signal: do save_i387_xstate_ia32 at get_sigframe()
4b33669 x86: signal_32: do save_i387_xstate() at get_sigframe()
3e03fb7 ring-buffer: convert to raw spinlocks
9036990 ftrace: restructure tracing start/stop infrastructure
0f04870 ftrace: soft tracing stop and start
60a7ecf ftrace: add quick function trace stop
79c81d2 Merge branch 'tracing/fastboot' into tracing/ftrace
fd9abb3 SMSC LAN911x and LAN921x vendor driver
c5916cf ehea: Fix some whitespace issues
739bb23 sfc: Do not reset when hardware monitor detects a fault
3e133c4 sfc: Use lm87 and lm90 drivers for board temperature/power monitoring
f415072 sfc: Expose flash region storing boot code as MTD
0a95f56 sfc: Clean up non-volatile memory partitioning
2883f55 sfc: Correct address of gPXE boot configuration in EEPROM
fd989c8 bonding: alternate agg selection policies for 802.3ad
6146b1a bonding: Fix ALB mode to balance traffic on VLANs
305d552 bonding: send IPv6 neighbor advertisement on failover
7d9d1f2 sgi-xp: support getting the address of a partition's reserved page
31de5ec sgi-xp: define xp_partition_id and xp_region_size
2525789 sgi-xp: create activate and notify gru message queues
6c1c325 sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect()
23c3570 x86: uv: Add UV reserved page bios call
e8929c8 x86: uv: Add UV memory protection bios call
64ccf2f x86: uv: Add UV watchlist bios call
61c9eaf pkt_sched: Fix qdisc len in qdisc_peek_dequeued()
0a36b34 net: Don't leak packets when a netns is going down
ae33bc4 net: Guaranetee the proper ordering of the loopback device.
d0c082c netns: Delete virtual interfaces during namespace cleanup
1c1b777 powerpc: Use the new byteorder headers
1f29fae file capabilities: add no_file_caps switch (v4)
e21e696 Merge branch 'master' into next
2f99db2 selinux: recognize netlink messages for 'ip addrlabel'
5b4d218 powerpc/boot: Allocate more memory for dtb
7d4320f powerpc: Hugetlb pgtable cache access cleanup
d4ad304 powerpc/ps3: Fix memory leak in device init
3cc6987 powerpc: Eliminate unused do_gtod variable
597bc5c powerpc: Improve resolution of VDSO clock_gettime
c73049f powerpc: Remove map_/unmap_single() from dma_mapping_ops
7eef440 powerpc/pci: Cosmetic cleanups of pci-common.c
fd6852c powerpc/pci: Fix various pseries PCI hotplug issues
b5ae5f9 powerpc/pci: Make pcibios_allocate_bus_resources more robust
57b066f powerpc/eeh: Make EEH device add/remove more robust
8b8da35 powerpc/pci: Split pcibios_fixup_bus() into bus setup and device setup
8dc840f ASoC: Add new parameter to s3c24xx_pcm_enqueue
ea91394 ASoC: Remove core version number
74e7220 ASoC: Add Palm/PXA27x unified ASoC audio driver
838e8bb x86: Implement change_bit with immediate operand as "lock xorb"
6834d7c ALSA: ice1724 - Re-fix IRQ mask initialization
c238b4f ALSA: hda - Split ALC268 acer model
ab56ced powerpc/pci: Remove pcibios_do_bus_setup()
5328032 powerpc/pci: Use common PHB resource hookup
b0494bc powerpc/pci: Cleanup debug printk's
25d6e2d powerpc: Update 64bit memcpy() using CPU_FTR_UNALIGNED_LD_STD
4ec577a powerpc: Add new CPU feature: CPU_FTR_UNALIGNED_LD_STD
4090019 powerpc: Update page-in counter for CMM
1ef8014 powerpc/pseries: Fix getting the server number size
691de57 powerpc: Remove device_type = "rtc" properties in .dts files
a6a8e00 powerpc: Silence software timebase sync
1fd0f52 powerpc: Fix domain numbers in /proc on 64-bit
270acef net: sk_free_datagram() should use sk_mem_reclaim_partial()
d99a7bd dccp: Cleanup routines for feature negotiation
ac75773 dccp: Per-socket initialisation of feature negotiation
61e6473 dccp: List management for new feature negotiation
7d43d1a dccp: Implement lookup table for feature-negotiation information
bd012f2 dccp: Basic data structure for feature negotiation
13c9474 ALSA: hda - Add ASUS V1Sn support
beb0b9c ALSA: hda - Fix unused function in patch_intelhdmi.c
9150487 ALSA: hda - Intel HDMI audio support
d5f6423 net: #ifdef ->sk_security
fd8cd7e x86: vmware: look for DMI string in the product serial key
41d9f9c SELinux: hold tasklist_lock and siglock while waking wait_chldexit
0ee4663 ALSA: ASoC - Remove unnecessary inclusion of linux/version.h
3865675 ALSA: ASoC codec: remove unused #include <version.h>
bfc5c26 ALSA: hda - Don't create empty PCM streams
79a9d46 tracing/ftrace: fix a bug when switch current tracer to sched tracer
efade6e tracing/ftrace: types and naming corrections for sched tracer
d7ad44b tracing/fastboot: use sched switch tracer from boot tracer
e55f605c tracing/ftrace: remove unused code in sched_switch tracer
07695fa tracing/ftrace: fix a race condition in sched_switch tracer
71566a0 tracing/fastboot: Enable boot tracing only during initcalls
6e3354c netfilter: nf_nat: remove warn_if_extra_mangle
249b620 netfilter: netns ebtables: br_nf_pre_routing_finish() fixup
b71b30a netfilter: netns ebtables: ebtable_nat in netns
4aad109 netfilter: netns ebtables: ebtable_filter in netns
8157e6d netfilter: netns ebtables: ebtable_broute in netns
dbcdf85 netfilter: netns ebtables: more cleanup during ebt_unregister_table()
6beceee netfilter: netns ebtables: part 2
511061e netfilter: netns ebtables: part 1
19223f2 netfilter: arptable_filter: merge forward hook
d4ec52b netfilter: netns-aware ipt_addrtype
5f7340e netfilter: xt_NFLOG: don't call nf_log_packet in NFLOG module.
3299b4d ftrace: sysctl typo
69f698a ftrace: sysrq-z to dump the buffers
6cf87ef x86 debug: mark early_printk.o as notrace
faa2f98 sched: add sanity check in partition_sched_domains()
a17e226 sched: remove redundant call to unregister_sched_domain_sysctl()
0a0db8f sched debug: remove NULL checking in print_cfs/rt_rq()
eefd796 sched debug: remove sd_level_to_string()
b2a866f ftrace: function tracer with irqs disabled
182e9f5 ftrace: insert in the ftrace_preempt_disable()/enable() functions
8f0a056 ftrace: introduce ftrace_preempt_disable()/enable()
124ffe1 x86: signal_64: remove unused code in __setup_rt_frame()
b91f080 ALSA: hda - Fix possible NULL dereference
dce908e ALSA: SOC: Fix setting codec register with debugfs filesystem merge
error
d2ad3ca net/: Kill now superfluous ->last_rx stores.
265eb67 netem: eliminate unneeded return values
babcda7 drivers/net: Kill now superfluous ->last_rx stores.
ab29109 net: remove two duplicated #include
6d9f239 net: '&' redux
6cf3f41 bonding, net: Move last_rx update into bonding recv logic
24f8b23 net: increase receive packet quantum
b9ac998 printk: ipv4 address digits printed in reverse order
4814893 IPVS: Remove supports_ipv6 scheduler flag
4454837 IPVS: Add IPv6 support to LBLC/LBLCR schedulers
fa228b3 tg3: Update version to 3.95
772638b broadcom: Add support for BCM50610
042a75b broadcom: Refine expansion register access routine
5e0c676 broadcom: Add flow control support
fcb389d tg3: 5785 enhancements
9c61d6b tg3: Refine phylib support
0a459aa tg3: Allow WOL for phylib controlled Broadcom phys
05ac4cb tg3: Refine power management and WOL code
df59c94 tg3: Move phylib report to end of tg3_init_one
b2b98d4 tg3: Do not enable APE on bcm5700
bcb37f6 tg3: Reclaim TG3_FLG3_5761_5784_AX_FIXES flag
3f00789 tg3: Preserve LAA when device control is released
b2aee15 tg3: Preserve DASH connectivity when WOL enabled
6353239 tg3: Use pci_ioremap_bar()
c88e668 tg3: Add 5761S support
6bdbfe9 x86: VMware: Fix vmware_get_tsc code
4ef0ef1 ALSA: hda - Fix missing ADC list in ALC260 auto-probe mode
26f5df2 ALSA: hda - Add ALC299 fujitsu preset model
67305eb pkt_sched: sch_generic: Kfree gso_skb in qdisc_reset()
5799de0 net: clean up net/ipv4/tcp_ipv4.c
539afed net: clean up net/ipv4/devinet.c
f4cca7f net: clean up net/ipv4/pararp.c
fd3f8c4 net: clean up net/ipv4/ip_fragment.c tcp_timer.c ip_input.c
e113a74 sched/rt: small optimization to update_curr_rt()
7e5e26a ftrace: fix hardirq header for non ftrace archs
7a895f5 Merge branches 'tracing/ftrace', 'tracing/markers',
'tracing/mmiotrace', 'tracing/nmisafe', 'tracing/tracepoints' and
'tracing/urgent' into tracing/core
127cafb tracepoint: introduce *_noupdate APIs.
19dba33 tracepoint: simplification for tracepoints using RCU
3555105 x86: add memory hotremove config option
c354e12 net: clean up net/ipv4/ipmr.c
09cb105 net: clean up net/ipv4/ip_sockglue.c tcp_output.c
a7e9ff7 net: clean up net/ipv4/igmp.c
6ed2533 net: clean up net/ipv4/fib_frontend.c fib_hash.c ip_gre.c
5a5f3a8 net: clean up net/ipv4/ipip.c raw.c tcp.c tcp_minisocks.c tcp_yeah.c
xfrm4_policy.c
d931910 net: clean up net/ipv4/ah4.c esp4.c fib_semantics.c
inet_connection_sock.c inetpeer.c ip_output.c
5b9a0e1 x86: nmi - nmi_watchdog boot param docs cleanup
d9e5407 ftrace: ftrace_dump_on_oops=[tracer]
3660946 Merge commit 'v2.6.28-rc3' into tracing/ftrace
8bb8c43 sched, ftrace: trace sched.c
db59350 Merge commit 'v2.6.28-rc3' into sched/core
e0db4a7 sunrpc: Fix build warning due to typo in %pI4 format changes.
20971a0 IPVS: Add IPv6 support to SH and DH schedulers
2a6cf35 Merge branch 'davem-next' of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
3f8b4b1 bonding: update docs to correctly reflect arp_ip_target behavior
237f3e1 smc91x: add __init markings to smc_drv_probe()
dccd547 forcdeth: increase max_interrupt_work
0befdb3 ixgbe: add device support for 82598AT (copper 10GbE) adapters
e053b62 atlx: timer cleanup
02e7173 atlx: use embedded net_device_stats
8ba25da sch_netem: Replace ->requeue() method with open code
0220146 sch_netem: Remove classful functionality
ae27e98 [TCP] CUBIC v2.3
e27dfce af_unix: clean up net/unix/af_unix.c garbage.c sysctl_net_unix.c
c37ccc0 udp: add a missing smp_wmb() in udp_lib_get_port()
7e3a42a xfrm6: handling fragment
395628e x86: Skip verification by the watchdog for TSC clocksource.
eca0cd0 x86: Add a synthetic TSC_RELIABLE feature bit.
88b094f x86: Hypervisor detection and get tsc_freq from hypervisor
49ab56a x86: add X86_FEATURE_HYPERVISOR feature bit
4074ea2 ALSA: ice1724 - Fix IRQ register initialization
e25cf4a mac80211: fix two kernel-doc warnings
4c24429 ath9k: use ETH_P_PAE
9371dd6 ath9k: remove useless conditional
4fb3078 orinoco: cache downloadable firmware image in memory for use during
resume
0df6cbb orinoco: reload firmware on resume
4c674c6 ath5k: Update interrupt masking code
84fa4f4 wireless regulatory: move ignore_request
2083c49 wireless: clean up regulatory ignore_request function
be3d481 wireless: remove struct regdom hinting
d2372b3 wireless: make regdom passing semantics simpler
7dddaf1 iwlwifi: Update reclaim flag
9fe1c50 iwl3945: iwl3945_mac_get_tsf() should not return zero
a96a27f iwlwifi: run through spell checker
127901a iwlwifi: refactor tx byte count table usage
951891c iwlwifi: clear scanning bits upon failure
60d3221 iwlwifi: convert correctly rate_n_flags to PLCP index for mimo3
packets
f69f42a iwlwifi: calibration command namespace renaming
0ef2ca6 iwlwifi: parametrize eeprom versions
ed7fafe iwlwifi: don't update TFD free counter for invalid station
3fd07a1 iwlwifi: refactor TX response flow
8b30b1f mac80211: Re-enable aggregation
4393dce mac80211: allow all interfaces types to handle RX action frames
f3e63db wireless: remove write-only 'granted' variable
a4510bf ath9k: Check if the STA supports HT when initializing rate control
075cbc9 mac80211: Change WARN_ON to WARN_ON_ONCE
5c020dc ath9k: Allow user to change tx power when asked
f97e400 ath9k: enable RX interrupt mitigation
b139a10 ath9k: remove pointless sc_txintrperiod and spin_lock_bh on tx prepare
d9d2925 mac80211: make use of regulatory tx power settings on change of tx
power
e2ef12d mac80211: check return value of dev_alloc_skb() in
ieee80211_sta_join_ibss().
7211801 wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts
9387b7c wireless: use individual buffers for printing ssid values
2819f8a wireless: escape_ssid should handle non-printables
c5d3dce wireless: remove NETWORK_EMPTY_ESSID flag
7e272fc wireless: consolidate on a single escape_essid implementation
ddf4ac5 mac80211: insert AP sta entry after filling it
cfa3fa4 Fix debugfs_create_*'s error checking method for wireless/rt2x00/
9b24001 Fix debugfs_create_bool's error checking method for wireless/iwlwifi/
ac9440a wireless: fix EU check
f6037d0 wireless: get rid of pointless request list
f3b407f wireless: remove cfg80211_reg_mutex
cf03268 wireless: don't publish __regulatory_hint
e37d4df mac80211: fix a few typos in mac80211 kernel doc
5588751 rt2x00: reduce checkpatch.pl errors
0bbac08 ath5k: reduce checkpatch.pl errors
93da9cc Add nl80211 commands to get and set o11s mesh networking parameters
4a68ec5 mac80211: inform userspace of probe/auth/assoc timeout
8216bfe hostap: Fix sparse warnings
50fb2e4 mac80211: remove rate_control_clear
65a0667 iwlwifi: protect headers from double inclusion
f4a8cd9 minstrel: improve performance for non-MRR drivers
0a9542e nl80211: fix monitor flags
27df605 p54: integrate parts of lmac_longbow.h and other parts of stlc45xx
5e73444 p54: borrow some setup code from stlc45xx
b92f30d p54: fix memory management
9de5776f p54: p54: refactor p54_rx_frame_sent
0f1be97 p54: refactor statistic timer code
0fdd7c5 p54: broken out edcf changes
b88b15d iwlwifi: tx command must run on same tfd as packet
499b188 iwlwifi: fix TX cmd dma unmapping
76eff18 iwlwifi: unify tx antenna toggling
961ba60 iwlwifi: add iwl_cmd_queue_free for readability
3257e5d iwlwifi: remove host commands structures from iwl_cmd
56e1261 iwlwifi: expand error lookup and align output
4e062f9 iwlwifi: define firmware file name once
4acf074 make ieee80211 invisible
5c7f9b7 ipw2x00: change default policy for auto-associate
c12abae p54: implement MRR
e6a9854 mac80211/drivers: rewrite the rate control API
cb121ba mac80211: add might_sleep to hw_config
faf3994 airo: Kill directly reference of netdev->priv
b706e65 ath5k: fix mesh point operation
6e0e0bf ath5k: correct ath5k signal quality
c49d154 ath9k: correct signal quality report
4fe0657 ath5k/ath9k: correct signal quality
f828831 rtl8187: add short slot handling for 8187B
6476107 rtl8187: adapt for deprecated IEEE80211_CONF_SHORT_SLOT_TIME flag
da966bc Ath5k: add AP mode
7eb27af p54/rtl8187: fix up the seqno patch
ae5eb02 mac80211: rewrite HT handling
bda3933 mac80211: move bss_conf into vif
9124b07 mac80211: make retry limits part of hw config
5251818 iwl3945: fix station stuff in RC algorithm
d51626d nl80211: export HT capabilities
9477828 mac80211: provide sequence numbers
2e20cc3 p54: Move rx_mtu to struct bootrec_desc
7823657 rfkill: rate-limit rfkill-input workqueue usage (v3)
1767079 rfkill: honour EPO state when resuming a rfkill controller
d003922 rfkill: add master_switch_mode and EPO lock to rfkill and rfkill-input
68d2413 rfkill: export global states to rfkill-input
cf4b4aa rfkill: use killable locks instead of interruptible
e897558 mac80211: introduce hw config change flags
0f4ac38 mac80211: kill hw.conf.antenna_sel_{rx,tx}
d9fe60d 802.11: clean up/fix HT support
40333e4 p54: honour bss_info_changed's short slot time settings
5d6924e mac80211: use HWSIM_STA_MAGIC in hwsim_check_sta_magic() and
hwsim_set_sta_magic().
3195c1f iwlwifi: refactor rxon time command
5d664a4 iwlwifi: take a valid antenna upon rate scale init
be5d56e iwlwifi: make initial calibration set configurable
1397dce mac80211: remove unused declaration of struct sta_attribute.
7a5158e mac80211: fix short slot handling
e87a2fe mac80211: remove max_antenna_gain config
d73782f mac80211: clean up ieee80211_hw_config errors
3db5943 mac80211: remove wiphy_to_hw
c6a1fa1 mac80211: minor code cleanups
36ff382 mac80211: remove writable debugs mesh parameters
804feeb mac80211: remove aggregation status write support from debugfs
b2bcc7b x86: add a synthetic TSC_RELIABLE feature bit
3c3e989 ALSA: hda - Re-add input-source control for Realtek
f9e336f ALSA: hda - Unify capture mixer creation in realtek codes
54cbc9a ALSA: hda - Unify capture callbacks in realtek codes
d88897e ALSA: hda - Use macros to check array overflow
afecd78c Merge branch 'topic/fix/hda' into topic/hda
7b3b6e4 Merge commit 'v2.6.28-rc2' into topic/asoc
04172c0 Merge branch 'topic/fix/asoc' into topic/asoc
5b99e6c ASoC: Add audio support for the Atmel AT91SAM9G20ek board(uing
wolfson 8731).
6c74250 ASoC: Merge AT91 and AVR32 support into a single atmel architecture
dc06102 ASoC: Add support for Beagleboard
4e20787 ASoC: Add support for Gumstix Overo
cc17557 ASoC: Add support for TWL4030 audio codec
a376f30 x86: avoid duplicate running of pud_offset and pmd_offset in
one_md_table_init()
a26a2a2 ftrace: nmi safe code clean ups
9868ee6 kexec/i386: setup kexec page table in C
92be3d6 kexec/i386: allocate page table pages dynamically
31498a0 kexec/i386: remove PAGE_SIZE alignment from relocate_kernel
3685f25 misc: replace NIPQUAD()
be85940 fs: replace NIPQUAD()
6377943 drivers: replace NIPQUAD()
21454aa net: replace NIPQUAD() in net/*/
14d5e83 net: replace NIPQUAD() in net/netfilter/
673d57e net: replace NIPQUAD() in net/ipv4/ net/ipv6/
cffee38 net: replace NIPQUAD() in net/ipv4/netfilter/
77be155 pkt_sched: Add peek emulation for non-work-conserving qdiscs.
03c05f0 pkt_sched: Use qdisc->ops->peek() instead of ->dequeue() & ->requeue()
8e3af97 pkt_sched: Add qdisc->ops->peek() implementation.
99c0db2 pkt_sched: sch_generic: Add generic qdisc->ops->peek() implementation.
48a8f51 pkt_sched: Add ->peek() methods for fifo, prio and SFQ qdiscs.
90d841f pkt_sched: sch_generic: Add Qdisc_ops peek() method.
cc0fe83 xfrm: remove unused struct xfrm_policy::next
d5917a3 xfrm: C99 for xfrm_dev_notifier
a1744d3 Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
57b4189 ALSA: ASoC - restore removed variable declaration
275f165 pci: use pci_ioremap_bar() in drivers/net
842e08b tc35815: Define more Rx status bits
04ecb07 cxgb3 - enable lro control through ethtool
bc79fc8 e100: adapt to the reworked PCI PM
6b1abba The overdue eepro100 removal.
5177b32 skge: adapt skge to use reworked PCI PM
b3acf29 ftrace, kbuild: condense recordmcount.pl parameter code
e1e302d Merge branch 'linus' into tracing/ftrace
c8db3fe udp: Should use spin_lock_bh()/spin_unlock_bh() in udp_lib_unhash()
b807c3d ftrace: nmi update statistics
17666f0 ftrace: nmi safe code modification
1cbd8b3 x86: add two missing unwind annotations
8a1c8eb x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2
b062f84 x86: nmi - add sensible names to nmi_watchdog boot param
7a52768 x86: simplify X86_MPPARSE config option
0763722 ALSA: ASoC - Fix a typo in Kconfig
0c235d1 ASoC: Disable automatic volume control in the CS4270 sound driver
ca53fb2 ASoC: Use finer grained dependencies in SND_SOC_ALL_CODECS
e775f6c ASoC: Do a warm reset after cold when resetting the WM9713
1b340bd ASoC: Add PXA SSP support
8b6a5a3 SELinux: check open perms in dentry_open not inode_permission
219b93f ASoC: Remove DAPM restriction on mixer control name lengths
f24368c ASoC: Convert core to use standard debug print macros
d45f621 ASoC: Fix handling of DAPM suspend work
12ef193 ASoC: Allow setting codec register with debugfs filesystem
5791775 x86: signal: cosmetic unification of NR_restart_syscall
cabf503 x86: signal: cosmetic unification of macros for setup_rt_frame()
96bf84b x86: signal: cosmetic unification of signr_convert()
34f3a81 sched: switch sched_features to seqfile
8cf14e3 net: easy removals of HIPQUAD using %pI4 format
9edb8bb macvlan: add support for ethtool get settings
6b9a106 printk: remove %p6 format specifier, fix up comments
5b095d9 net: replace %p6 with %pI6
4b7a427 net: replace %#p6 format specifier with %pi6
4aa9960 printk: add %I4, %I6, %i4, %i6 format specifiers
96631ed udp: introduce sk_for_each_rcu_safenext()
f52b505 udp: udp_get_next() should use spin_unlock_bh()
e78a37b ALSA: Fix a typo in Kconfig
9cbbb3a ALSA: Release v1.0.18
eab1722 sched: cleanup for alloc_rt/fair_sched_group()
8203efb udp: calculate udp_mem based on low memory instead of all memory
271b72c udp: RCU handling for Unicast packets.
645ca70 udp: introduce struct udp_table and multiple spinlocks
1b063c3 Merge branch 'topic/fix/hda' into topic/hda
d301fc3 ALSA: hda - Fix indentation in hda_local.h
b189db5 net: remove NIP6(), NIP6_FMT, NIP6_SEQFMT and final users
a20fd0a uwb: use the %pM formatting specifier in eda.c
8c165a8 infiniband: remove IPOIB_GID_RAW_ARG, IPOIB_GID_ARG, IPOIB_GID_FMT
fcace2f infiniband: ipoib replace IPOIB_GID_FMT with %p6
8867cd7 infiniband: use %p6 for printing message ids
b3020061 vlan: propogate ethtool speed values
3717746 veth: remove unused list
bb7bba3 veth: Remove useless veth field
fdb46ee net, misc: replace uses of NIP6_FMT with %p6
0c6ce78 net: replace uses of NIP6_FMT with %p6
38ff4fa netfilter: replace uses of NIP6_FMT with %p6
1afa67f misc: replace NIP6_FMT with %p6 format specifier
b071195 net: replace all current users of NIP6_SEQFMT with %#p6
689afa7 printk: add %p6 format specifier for IPv6 addresses
3a2dfbe xfrm: Notify changes in UDP encapsulation via netlink
93adcc8 net: don't use INIT_RCU_HEAD
def8b4f net: reduce structures when XFRM=n
b057efd netlink: constify struct nlattr * arg to parsing functions
ad38dab x86: use the new byteorder headers
d4f1b10 x86: clean up comments wrt. rd{msr|tsc|pmc}
2011a06 Merge commit 'v2.6.28-rc2' into x86/doc
30604bb x86: break up mtrr_cleanup() into several small functions.
7a9787e Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
163d4c5 Merge branch 'topic/fix/hda' into topic/hda
34c2535 ALSA: hda - Remove old codec-probe limitation
15ad9a5 Merge branch 'topic/fix/asoc' into topic/asoc
3891845 netns: Coexist with the sysfs limitations v2
7c510e4 net: convert more to %pM
e174961 net: convert print_mac to %pM
0c68ae2 mac80211: convert to %pM away from print_mac
dd45c9c printk: add %pM format specifier for MAC addresses
1080d70 net: implement emergency route cache rebulds when gc_elasticity is
exceeded
69a72a0 x86/uv: update SCIR driver to use the idle_cpu() function
878719e x86: unify appropriate bits from dumpstack_32 and dumpstack_64
7d5a78c x86, NMI watchdog: disable NMIs on LVT0 in case NMI watchdog is not
working
6f290b4 x86, NMI watchdog: add support to enable and disable IOAPIC NMI
b43d196 x86: corruption-check: some post-move cleanups
304e629 x86: corruption check: run the corruption checks from a work queue
6784f7d x86: corruption check: move the corruption checks into their own file
04d2aac x86: corruption-check: fix some style issues
944ac42 ftrace: ftrace dump on oops control
c63dfef x86: remove dead IRQBALANCE code
fd4a203 x86: signal_64.c: get_stack() doesn't need entire regs
709110b x86: signal: cosmetic unification of restore_sigcontext()
fd3fdf1 trace: add the MMIO-tracer to the tracer menu, cleanup
5d9881e markers: break the redundant loop in kernel/marker.c
4de6274 markers: let marker_table be close to its comments
505e371 markers: remove exported symbol marker_probe_cb_noarg()
0eec481 markers: simplify marker_set_format()
7f1baa0 x86/uv: provide a System Activity Indicator driver
5292ae1 Merge commit 'v2.6.28-rc2' into x86/uv
f4a2a0d ftrace: add a script to produce a hierarchical view of a function
trace
8479d94 x86, signals: remove duplicated register setup code in ia32 signal
delivery
4fc85e4 Merge branch 'topic/misc-next' into topic/misc
911fc25 Merge branch 'topic/asoc-next' into topic/asoc
42dc237 Merge branch 'topic/hda-next' into topic/hda
74aeaab ALSA: hda: add support for jack detection on IDT codecs.
50a9f79 ALSA: hda: add snd_hda_get_jack* functions
a53ccab ALSA: jack: lineout support to jack abstraction layer
282cd76 ALSA: hda: dynamic jack id
bbaf5e9 ALSA: Add hrtimer backend for ALSA timer interface
63fb708 x86: change OPTIMIZE_INLINING help to say enabling makes smaller
kernels
67679b1 ALSA: emu10k1: fix coding style for emu10k1_main.c
888dcb7 ALSA: aoa: clean up file names
871d377 i386, dumpstack: unify die()
e06ca43 i386, dumpstack: use oops_begin/oops_end in die_nmi
e4955cf i386, dumpstack: use x86_64's method to account die_nest_count
10b14cb x86, dumpstack: always call oops_exit from oops_end
0ed7a49 x86_64, dumpstack: move kexec_crash from __die to oops_end
874d93d x86, dumpstack: let signr=0 signal no do_exit
b4b8f87 i386, dumpstack: move crash_kexec before bust_spinlocks(0) in oops_end
9e89981 x86, mm: enable GBPAGES option by default
b0f2098 x86, uv: use consistent names for region size and conherence id on
x86 and ia64
718a259 ALSA: emu10k1: fix faulty commit 18c71092
18c7109 ALSA: emu10k1: fix device names for Live!/Audigy1/2/4/E-mu
1083206 ALSA: ice1724 - Fix TX IRQ lockup
c872e8c ALSA: Enable SPDIF output on ALC655
96c7d47 ALSA: pcsp - Fix locking messes in snd-pcsp
ebaa047 ALSA: hda - Release jack instance for dynamic reconfigure
dd125b2 Merge branch 'topic/hda-reconfig' into topic/hda-next
76a4d10 ALSA: Print function symbol in the error messages
6b93311 ALSA: ASoC: Remove snd_soc_dapm_connect_input()
8ae6a55 ALSA: ASoC: Convert wm8900 to a new-style i2c driver
17be552 ALSA: ASoC: Convert wm8580 to a new-style i2c driver
45a6ac1 ALSA: hda: add support for jack detection on IDT/Sigmatel
1e1be43 ALSA: hda - Add hints for reconfig
11aeff0 ALSA: hda - Add init_verbs entries
d7ffba1 ALSA: hda - Add sysfs entries to hwdep devices
6c1f45e ALSA: hda - Add codec reconfiguration feature
d13bd41 ALSA: hda - Manage kcontrol lists
f44ac83 ALSA: hda - Allocate name string of each codec
603c401 ALSA: hda - Use generic array helpers
b2e1859 ALSA: hda - Add generic arrays
176d533 ALSA: hda - Add infrastructure for dynamic stream allocation
41b9eb2 x86, pci: introduce config option for pci reroute quirks (was: [PATCH
0/3] Boot IRQ quirks for Broadcom and AMD/ATI)
3e370b2 Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
88d1dce PCI quirks: call boot IRQ quirks at end of device init and during
resume
542622d PCI quirks: disable AMD/ATI legacy boot interrupt generation
7725118 PCI quirks: add quirk to disable boot interrupt generation on
broadcom HT1000
dbbcfb2 Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
b0356cd pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent,
warning fix
33be833 x86: boot IRQ quirks and rerouting, fix
e1d3a90 pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent
426b3b8 pci: add quirk to disable boot interrupt generation on intel 6300ESB
9197979 x86, pci: introduce pci=ioapicreroute kernel cmdline option
a9322f6 x86, pci: introduce pci=noioapicquirk kernel cmdline option
747ada3 pci: add PCI IDs for devices that need boot irq quirks
from 3d44cc3e01ee1b40317f79ed54324e25c4f848df (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3c92ec8ae91ecf59d88c798301833d7cf83f2179
Merge: c4c9f0183b7c4e97836e8fecbb67898b06c47e78
ca9153a3a2a7556d091dfe080e42b0e67881fff6
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 16:54:33 2008 -0800
Merge branch 'next' of
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
(144 commits)
powerpc/44x: Support 16K/64K base page sizes on 44x
powerpc: Force memory size to be a multiple of PAGE_SIZE
powerpc/32: Wire up the trampoline code for kdump
powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
powerpc/32: Setup OF properties for kdump
powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
powerpc: Prepare xmon_save_regs for use with kdump
powerpc: Remove default kexec/crash_kernel ops assignments
powerpc: Make default kexec/crash_kernel ops implicit
powerpc: Setup OF properties for ppc32 kexec
powerpc/pseries: Fix cpu hotplug
powerpc: Fix KVM build on ppc440
powerpc/cell: add QPACE as a separate Cell platform
powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
powerpc/mpc5200: fix error paths in PSC UART probe function
powerpc/mpc5200: add rts/cts handling in PSC UART driver
powerpc/mpc5200: Make PSC UART driver update serial errors counters
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
...
Fix trivial conflict in drivers/char/Makefile as per Paul's directions
commit c4c9f0183b7c4e97836e8fecbb67898b06c47e78
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon Dec 29 10:46:13 2008 +1100
net: ehea NAPI interface cleanup fix
Commit 908a7a16b852ffd618a9127be8d62432182d81b4 ("net: Remove unused
netdev arg from some NAPI interfaces") missed two spots.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit bf66542bef3771a42ad3b1d5dc503c804bc22b33
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed Dec 3 13:49:23 2008 +1100
cifs: update for new IP4/6 address printing
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit d05a788f2279056a518d412c6391322ef11366e0
Merge: 96faec945f39cab38403f60f515bff43660b4dab
54d2f649a67109d877ca143c09cdeba61fe51bcf
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 15:15:08 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
smackfs: check for allocation failures in smk_set_access()
commit 96faec945f39cab38403f60f515bff43660b4dab
Merge: 2926328554fa740518e2a6585b2cefb01e5f65f3
9bb482476c6c9d1ae033306440c51ceac93ea80c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 15:13:48 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (25
commits)
allow stripping of generated symbols under CONFIG_KALLSYMS_ALL
kbuild: strip generated symbols from *.ko
kbuild: simplify use of genksyms
kernel-doc: check for extra kernel-doc notations
kbuild: add headerdep used to detect inclusion cycles in header files
kbuild: fix string equality testing in tags.sh
kbuild: fix make tags/cscope
kbuild: fix make incompatibility
kbuild: remove TAR_IGNORE
setlocalversion: add git-svn support
setlocalversion: print correct subversion revision
scripts: improve the decodecode script
scripts/package: allow custom options to rpm
genksyms: allow to ignore symbol checksum changes
genksyms: track symbol checksum changes
tags and cscope support really belongs in a shell script
kconfig: fix options to check-lxdialog.sh
kbuild: gen_init_cpio expands shell variables in file names
remove bashisms from scripts/extract-ikconfig
kbuild: teach mkmakfile to be silent
...
commit 2926328554fa740518e2a6585b2cefb01e5f65f3
Merge: 541ef5cbb8e68189d47272cea52a69abc30259bc
8587b33f4adee4e7614ea7f443346c3b6bb5427a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 15:12:35 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-nvram:
[PATCH] nvram - convert PRINT_PROC to seq_file
[PATCH] nvram - CodingStyle
commit 54d2f649a67109d877ca143c09cdeba61fe51bcf
Merge: 541ef5cbb8e68189d47272cea52a69abc30259bc
81ea714bf148fce35e931edcbdfd3aedda20d1dc
Author: James Morris <jmorris@xxxxxxxxx>
Date: Mon Dec 29 09:57:38 2008 +1100
Merge branch 'next' into for-linus
commit ca9153a3a2a7556d091dfe080e42b0e67881fff6
Author: Ilya Yanok <yanok@xxxxxxxxxxx>
Date: Thu Dec 11 04:55:41 2008 +0300
powerpc/44x: Support 16K/64K base page sizes on 44x
This adds support for 16k and 64k page sizes on PowerPC 44x processors.
The PGDIR table is much smaller than a page when using 16k or 64k
pages (512 and 32 bytes respectively) so we allocate the PGDIR with
kzalloc() instead of __get_free_pages().
One PTE table covers rather a large memory area when using 16k or 64k
pages (32MB or 512MB respectively), so we can easily put FIXMAP and
PKMAP in the area covered by one PTE table.
Signed-off-by: Yuri Tikhonov <yur@xxxxxxxxxxx>
Signed-off-by: Vladimir Panfilov <pvr@xxxxxxxxxxx>
Signed-off-by: Ilya Yanok <yanok@xxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6ca4f7494bde078b2b730e28e4ea1dc36a772f70
Author: Hollis Blanchard <hollisb@xxxxxxxxxx>
Date: Wed Nov 26 10:19:26 2008 -0600
powerpc: Force memory size to be a multiple of PAGE_SIZE
Ensure that total memory size is page-aligned, because otherwise
mark_bootmem() gets upset.
This error case was triggered by using 64 KiB pages in the kernel
while arch/powerpc/boot/4xx.c arbitrarily reduced the amount of memory
by 4096 (to work around a chip bug that affects the last 256 bytes of
physical memory).
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 541ef5cbb8e68189d47272cea52a69abc30259bc
Merge: 0191b625ca5a46206d2fb862bb08f36f2fcb3b31
aa6eeeef78263e9891185c6cfaaf64808460a54a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:54:07 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: use the new byteorder headers
fbcon: Protect free_irq() by MACH_IS_ATARI check
fbcon: remove broken mac vbl handler
m68k: fix trigraph ignored warning in setox.S
macfb annotations and compiler warning fix
m68k: mac baboon interrupt enable/disable
m68k: machw.h cleanup
m68k: Mac via cleanup and commentry
m68k: Reinstate mac rtc
commit 0191b625ca5a46206d2fb862bb08f36f2fcb3b31
Merge: 54a696bd07c14d3b1192d03ce7269bc59b45209a
eb56092fc168bf5af199d47af50c0d84a96db898
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:49:40 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429
commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising
bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
commit 54a696bd07c14d3b1192d03ce7269bc59b45209a
Merge: 1d248b2593e92db6c51ca07235985a95c625a93f
359d67d6ad054ae11ad459665fdfb883aca87782
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:37:14 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (31
commits)
[CIFS] Remove redundant test
[CIFS] make sure that DFS pathnames are properly formed
Remove an already-checked error condition in SendReceiveBlockingLock
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
[CIFS] Streamline SendReceive[2] by using "goto out:" in an error
condition
Slightly streamline SendReceive[2]
Check the return value of cifs_sign_smb[2]
[CIFS] Cleanup: Move the check for too large R/W requests
[CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary
"else" branch
Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
[CIFS] In SendReceive, move consistency check out of the mutexed region
cifs: store password in tcon
cifs: have calc_lanman_hash take more granular args
cifs: zero out session password before freeing it
cifs: fix wait_for_response to time out sleeping processes correctly
[CIFS] Can not mount with prefixpath if root directory of share is
inaccessible
[CIFS] various minor cleanups pointed out by checkpatch script
[CIFS] fix typo
[CIFS] remove sparse warning
...
Fix trivial conflict in fs/cifs/cifs_fs_sb.h due to comment changes for
the CIFS_MOUNT_xyz bit definitions between cifs updates and security
updates.
commit 1d248b2593e92db6c51ca07235985a95c625a93f
Merge: 1db2a5c11e495366bff35cf7445d494703f7febe
2a0d8366dde9c66d8f481bee56828b661e5c8bf1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:33:59 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
RDMA/nes: Remove tx_free_list
RDMA/cma: Add IPv6 support
RDMA/addr: Add support for translating IPv6 addresses
mlx4_core: Delete incorrect comment
mlx4_core: Add support for multiple completion event vectors
IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
IB/ehca: Remove redundant test of vpage
IB/ehca: Replace modulus operations in flush error completion path
IB/ipath: Add locking for interrupt use of ipath_pd contexts vs free
IB/ipath: Fix spi_pioindex value
IB/ipath: Only do 1X workaround on rev1 chips
IB/ipath: Don't count IB symbol and link errors unless link is UP
IB/ipath: Check return value of dma_map_single()
IB/ipath: Fix PSN of send WQEs after an RDMA read resend
RDMA/nes: Cleanup warnings
RDMA/nes: Add loopback check to make_cm_node()
RDMA/nes: Check cqp_avail_reqs is empty after locking the list
RDMA/nes: Fix TCP compliance test failures
RDMA/nes: Forward packets for a new connection with stale APBVT entry
...
commit 1db2a5c11e495366bff35cf7445d494703f7febe
Merge: a39b863342b8aba52390092be95db58f6ed56061
cef7125def4dd104769f400c941199614da0aca1
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:33:21 2008 -0800
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (85
commits)
[S390] provide documentation for hvc_iucv kernel parameter.
[S390] convert ctcm printks to dev_xxx and pr_xxx macros.
[S390] convert zfcp printks to pr_xxx macros.
[S390] convert vmlogrdr printks to pr_xxx macros.
[S390] convert zfcp dumper printks to pr_xxx macros.
[S390] convert cpu related printks to pr_xxx macros.
[S390] convert qeth printks to dev_xxx and pr_xxx macros.
[S390] convert sclp printks to pr_xxx macros.
[S390] convert iucv printks to dev_xxx and pr_xxx macros.
[S390] convert ap_bus printks to pr_xxx macros.
[S390] convert dcssblk and extmem printks messages to pr_xxx macros.
[S390] convert monwriter printks to pr_xxx macros.
[S390] convert s390 debug feature printks to pr_xxx macros.
[S390] convert monreader printks to pr_xxx macros.
[S390] convert appldata printks to pr_xxx macros.
[S390] convert setup printks to pr_xxx macros.
[S390] convert hypfs printks to pr_xxx macros.
[S390] convert time printks to pr_xxx macros.
[S390] convert cpacf printks to pr_xxx macros.
[S390] convert cio printks to pr_xxx macros.
...
commit a39b863342b8aba52390092be95db58f6ed56061
Merge: b0f4b285d7ed174804658539129a834270f4829a
4e202284e6ac1695df3eb4a0e549ea78addfb663
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:27:58 2008 -0800
Merge branch 'sched-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
sched: fix warning in fs/proc/base.c
schedstat: consolidate per-task cpu runtime stats
sched: use RCU variant of list traversal in for_each_leaf_rt_rq()
sched, cpuacct: export percpu cpuacct cgroup stats
sched, cpuacct: refactoring cpuusage_read / cpuusage_write
sched: optimize update_curr()
sched: fix wakeup preemption clock
sched: add missing arch_update_cpu_topology() call
sched: let arch_update_cpu_topology indicate if topology changed
sched: idle_balance() does not call load_balance_newidle()
sched: fix sd_parent_degenerate on non-numa smp machine
sched: add uid information to sched_debug for CONFIG_USER_SCHED
sched: move double_unlock_balance() higher
sched: update comment for move_task_off_dead_cpu
sched: fix inconsistency when redistribute per-cpu tg->cfs_rq shares
sched/rt: removed unneeded defintion
sched: add hierarchical accounting to cpu accounting controller
sched: include group statistics in /proc/sched_debug
sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER
sched: clean up SCHED_CPUMASK_ALLOC
...
commit b0f4b285d7ed174804658539129a834270f4829a
Merge: be9c5ae4eeec2e85527e95647348b8ea4eb25128
5250d329e38cdf7580faeb9c53c17d3588d7d19c
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:21:10 2008 -0800
Merge branch 'tracing-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (241 commits)
sched, trace: update trace_sched_wakeup()
tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
Revert "x86: disable X86_PTRACE_BTS"
ring-buffer: prevent false positive warning
ring-buffer: fix dangling commit race
ftrace: enable format arguments checking
x86, bts: memory accounting
x86, bts: add fork and exit handling
ftrace: introduce tracing_reset_online_cpus() helper
tracing: fix warnings in kernel/trace/trace_sched_switch.c
tracing: fix warning in kernel/trace/trace.c
tracing/ring-buffer: remove unused ring_buffer size
trace: fix task state printout
ftrace: add not to regex on filtering functions
trace: better use of stack_trace_enabled for boot up code
trace: add a way to enable or disable the stack tracer
x86: entry_64 - introduce FTRACE_ frame macro v2
tracing/ftrace: add the printk-msg-only option
tracing/ftrace: use preempt_enable_no_resched_notrace in
ring_buffer_time_stamp()
x86, bts: correctly report invalid bts records
...
Fixed up trivial conflict in scripts/recordmcount.pl due to SH bits
being already partly merged by the SH merge.
commit be9c5ae4eeec2e85527e95647348b8ea4eb25128
Merge: bb26c6c29b7cc9f39e491b074b09f3c284738d36
79a66b96c339626a3e4b226fefc0e45244cfe6ff
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 12:07:57 2008 -0800
Merge branch 'x86-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-core-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (246 commits)
x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
x86: PAT: fix address types in track_pfn_vma_new()
x86: prioritize the FPU traps for the error code
x86: PAT: pfnmap documentation update changes
x86: PAT: move track untrack pfnmap stubs to asm-generic
x86: PAT: remove follow_pfnmap_pte in favor of follow_phys
x86: PAT: modify follow_phys to return phys_addr prot and return value
x86: PAT: clarify is_linear_pfn_mapping() interface
x86: ia32_signal: remove unnecessary declaration
x86: common.c boot_cpu_stack and boot_exception_stacks should be static
x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies
x86: fix warning in arch/x86/kernel/microcode_amd.c
x86: ia32.h: remove unused struct sigfram32 and rt_sigframe32
x86: asm-offset_64: use rt_sigframe_ia32
x86: sigframe.h: include headers for dependency
x86: traps.c declare functions before they get used
x86: PAT: update documentation to cover pgprot and remap_pfn related
changes - v3
x86: PAT: add pgprot_writecombine() interface for drivers - v3
x86: PAT: change pgprot_noncached to uc_minus instead of strong uc - v3
x86: PAT: implement track/untrack of pfnmap regions for x86 - v3
...
commit bb26c6c29b7cc9f39e491b074b09f3c284738d36
Merge: e14e61e967f2b3bdf23f05e4ae5b9aa830151a44
cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:43:54 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
(105 commits)
SELinux: don't check permissions for kernel mounts
security: pass mount flags to security_sb_kern_mount()
SELinux: correctly detect proc filesystems of the form "proc/foo"
Audit: Log TIOCSTI
user namespaces: document CFS behavior
user namespaces: require cap_set{ug}id for CLONE_NEWUSER
user namespaces: let user_ns be cloned with fairsched
CRED: fix sparse warnings
User namespaces: use the current_user_ns() macro
User namespaces: set of cleanups (v2)
nfsctl: add headers for credentials
coda: fix creds reference
capabilities: define get_vfs_caps_from_disk when file caps are not enabled
CRED: Allow kernel services to override LSM settings for task actions
CRED: Add a kernel_service object class to SELinux
CRED: Differentiate objective and effective subjective credentials on a
task
CRED: Documentation
CRED: Use creds in file structs
CRED: Prettify commoncap.c
CRED: Make execve() take advantage of copy-on-write credentials
...
commit e14e61e967f2b3bdf23f05e4ae5b9aa830151a44
Merge: cb10ea549fdc0ab2dd8988adab5bf40b4fa642f3
0ee4a96902dd7858e65f378c86f428a0355bd841
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:43:22 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (57
commits)
crypto: aes - Precompute tables
crypto: talitos - Ack done interrupt in isr instead of tasklet
crypto: testmgr - Correct comment about deflate parameters
crypto: salsa20 - Remove private wrappers around various operations
crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
crypto: sha512 - Switch to shash
crypto: sha512 - Move message schedule W[80] to static percpu area
crypto: michael_mic - Switch to shash
crypto: wp512 - Switch to shash
crypto: tgr192 - Switch to shash
crypto: sha256 - Switch to shash
crypto: md5 - Switch to shash
crypto: md4 - Switch to shash
crypto: sha1 - Switch to shash
crypto: rmd320 - Switch to shash
crypto: rmd256 - Switch to shash
crypto: rmd160 - Switch to shash
crypto: rmd128 - Switch to shash
crypto: null - Switch to shash
crypto: hash - Make setkey optional
...
commit cb10ea549fdc0ab2dd8988adab5bf40b4fa642f3
Merge: 81d6e59dabb1ae0c782e9eb7e3d88f699d25b314
5ce442fe2c9423ec5451222aee6f9b2127bb8311
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:41:32 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (367 commits)
ALSA: ASoC: fix a typo in omp-pcm.c
ASoC: Fix DSP formats in SSM2602 audio codec
ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
ALSA: hda: fix incorrect mixer index values for 92hd83xx
ALSA: hda: dinput_mux check
ALSA: hda - Add quirk for another HP dv7
ALSA: ASoC - Add missing __devexit annotation to wm8350.c
ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
ALSA: ASoC: tlv320aic3x add dsp_a
ALSA: ASoC: DaVinci: document I2S limitations
ALSA: ASoC: DaVinci: davinci-i2s clean up
ALSA: ASoC: DaVinci: davinci-i2s clean up
ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
ALSA: ca0106 - disable 44.1kHz capture
ALSA: ca0106 - Add missing card->private_data initialization
ALSA: ca0106 - Check ac97 availability at PM
ALSA: hda - Power up always when no jack detection is available
ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
...
commit 81d6e59dabb1ae0c782e9eb7e3d88f699d25b314
Merge: 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
59de580af1c2fd671b0cb27c41ff958859ae5288
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 28 11:39:19 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (132 commits)
sh: oprofile: Fix up the module build.
sh: add UIO support for JPU on SH7722.
serial: sh-sci: Fix up port pinmux for SH7366.
sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
sh: mach-sh03: Fix up pata_platform build breakage.
sh: enable deferred io LCDC on Migo-R
video: sh_mobile_lcdcfb deferred io support
video: deferred io with physically contiguous memory
video: deferred io cleanup
video: fix deferred io fsync()
sh: add LCDC interrupt configuration to AP325 and Migo-R
sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
sh: split coherent pages
sh: dma: Kill off ISA DMA wrapper.
sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
sh: Kill off the unused SH_ALPHANUMERIC debug option.
sh: Enable skipping of bss on debug platforms for sh32 also.
doc: Update sh cpufreq documentation.
sh: mrshpc_setup_windows() needs to be inline.
serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL.
...
commit aa6eeeef78263e9891185c6cfaaf64808460a54a
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Tue Nov 18 20:45:23 2008 +0100
m68k: use the new byteorder headers
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 7f877ebb32ac9a4b0783e825cef84c6ace87fe90
Author: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:23 2008 +0100
fbcon: Protect free_irq() by MACH_IS_ATARI check
Add missing check for Atari in free_irq() call, which could cause problems
on
multi-platform m68k kernels.
Reported-by: Brad Boyer <flar@xxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 79f0c9a0479060e3a8607d93bc8d81ff962acc87
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:23 2008 +0100
fbcon: remove broken mac vbl handler
Remove the Mac VBL interrupt code as it doesn't work properly and
doesn't bring any benefit when fixed. Also remove unused
DEFAULT_CURSOR_BLINK_RATE macro and irqres variable.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 646819e86222cc06b85ed2a8dafbbb361a05ea2d
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:22 2008 +0100
m68k: fix trigraph ignored warning in setox.S
Fix the warning: trigraph ??/ ignored, use -trigraphs to enable
caused by the recent removal of -traditional option.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 3839d01d61195d76d53943ac36b603d7e7ca4b6e
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:22 2008 +0100
macfb annotations and compiler warning fix
Add some __iomem annotations. Remove some volatile qualifiers to fix
several compiler warnings: "passing arg 1 of `iounmap' discards qualifiers
from pointer target type".
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 746e8d3b223281f0e5472ab0ad8f59af2221ea9b
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:21 2008 +0100
m68k: mac baboon interrupt enable/disable
No-one seems to know how to mask individual baboon interrupts, so we just
mask the umbrella IRQ. This will work as long as only the IDE driver uses
the baboon chip (it can't deadlock). Use mac_enable_irq/mac_disable_irq
rather than enable_irq/disable_irq because the latter routines count the
depth of nested calls which triggers a warning and call trace because
IRQ_NUBUS_C is enabled twice in a row (once when the baboon handler is
registered, and once when the IDE IRQ is registered).
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 429dbf53bca49b110f1058f0d9417a59115c41b8
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:20 2008 +0100
m68k: machw.h cleanup
Remove some more cruft from machw.h and drop the #include where it isn't
needed.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 4a973592d67ccc240bca694e48ce88facd764043
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:20 2008 +0100
m68k: Mac via cleanup and commentry
No behavioural changes, just cleanups and better documentation.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit 40f7f9c1c22aef049ed7339d9e45624aa980a1a0
Author: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 18 20:45:20 2008 +0100
m68k: Reinstate mac rtc
Reinstate the Mac hardware clock for CUDA ADB and Mac II ADB models.
It doesn't work properly on Mac IIsi ADB and PMU ADB yet, so leave them
out.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
commit eb56092fc168bf5af199d47af50c0d84a96db898
Author: Dave Jones <davej@xxxxxxxxxx>
Date: Sat Dec 27 20:43:48 2008 -0800
net: Allow dependancies of FDDI & Tokenring to be modular.
I noticed it isn't possible to build token ring & fddi drivers
without causing LLC, and a bunch of other things to be forced
built-in. For distro kernels, this means carrying a chunk of
code in the vmlinuz, even if the user doesn't use those protocols.
Signed-off-by: Dave Jones <davej@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8d25332081d87491e3b12fa130539fe9e2ba4a94
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 26 15:13:55 2008 -0800
igb: Fix build warning when DCA is disabled.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2d5451d2614583de0c9aaf61cf5f77faf5694105
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Fri Dec 26 15:10:00 2008 -0800
net: Fix warning fallout from recent NAPI interface changes.
When we removed the network device argument from several
NAPI interfaces in 908a7a16b852ffd618a9127be8d62432182d81b4
("net: Remove unused netdev arg from some NAPI interfaces.")
several drivers now started getting unused variable warnings.
This fixes those up.
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0da2afd59653d2edf5c8e0f09b23f367ab5bc80f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 26 14:57:42 2008 -0800
gro: Fix potential use after free
The initial skb may have been freed after napi_gro_complete in
napi_gro_receive if it was merged into an existing packet. Thus
we cannot check same_flow (which indicates whether it was merged)
after calling napi_gro_complete.
This patch fixes this by saving the same_flow status before the
call to napi_gro_complete.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 843813453f52e3378fc988c8364063fd4cb9d0e3
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:49:25 2008 -0800
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
When AN is enabled and the link is down the speed/duplex control bits
will not be meaningful. Use the advertising bits instead, and mask
them with the LPA bits if and only if AN is complete (as before).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4bd954e7c24063b15fa9abc8b4b1242772928ed
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:48:51 2008 -0800
sfc: When disabling the NIC, close the device rather than unregistering it
This should reduce user confusion and may also aid recovery (ioctls
will still be available).
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 307505e9a4ce0b13b2f996385669039806e07390
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:48:00 2008 -0800
sfc: SFT9001: Add cable diagnostics
The SFT9001 firmware implements cable diagnostics; run those and
include their results in a self-test. In case of a cable fault, do
not fail the self-test as a whole; only faults in the NIC should cause
that.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1796721a5a691a5d392abf8070ad40a0b787b667
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:47:25 2008 -0800
sfc: Add support for multiple PHY self-tests
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2ef3068e6c40ec44d27f6f8027616e284d1b0466
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:47:04 2008 -0800
sfc: Merge top-level functions for self-tests
Pass in ethtool test flags to determine which tests to run.
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a5692e49cd9e6512c48ebf61e52991cbe643c12d
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:46:38 2008 -0800
sfc: Clean up PHY mode management in loopback self-test
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit caa8d8bbddc9157cb8f34465be98fc83faf37155
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:46:12 2008 -0800
sfc: Fix unreliable link detection in some loopback modes
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6977dc6309ea8bbcb24c0a1356c33969e4a07410
Author: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Date: Fri Dec 26 13:44:39 2008 -0800
sfc: Generate unique names for per-NIC workqueues
Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e727149e26b08550269a7786fda977aed65578f6
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:41:53 2008 -0800
802.3ad: use standard ethhdr instead of ad_header
802.3ad has its own ethhdr-like structure in the form of an ad_header,
which is at the start of both the LACPDU and marker PDU. Both are
the same from the struct values, both are packed as well.
It's therefore perfectly fine to replace the ad_header by the ethhdr
and to remove its definition.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4ac43200fd6b8b8de3b487e74e74d3742f70d79
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:40:48 2008 -0800
802.3ad: generalize out mac address initializer
Generalize out mac address initializer for the LACPDU multicast
address and use in two places. Remove the now unused
AD_MULTICAST_LACPDU_ADDR.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7addeef6b15c9b7cffaaf40ec5b5b0940145ec16
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:28:33 2008 -0800
802.3ad: initialize ports LACPDU from const initializer
Save some text by initializing ports LACPDU from const initializer,
then get rid of ad_initialize_lacpdu().
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 87f422f8618c541db0f96194cca9465817f76b89
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:27:57 2008 -0800
802.3ad: remove typedef around ad_system
As typedefs are considered a bad thing most of the time remove the
typedef around ad_system.
Signed-off-by: Holger Eitzenberger <heitzenberger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 1624db7be0d9f77f5494efe1b066d1d44b46c96c
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:27:21 2008 -0800
802.3ad: turn ports is_individual into a bool
Turn ports is_individual into a bool. There is no functional change.
Signed-off-by: Holger Eitzenberger <heitzenberger@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f48127b6f3270cf7234a7a9f770533332e85e8ae
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 13:26:54 2008 -0800
802.3ad: turn ports is_enabled into a bool
Turn ports is_enabled into a bool. There is no functional change.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d238d458a70ad134cb421c3ffc66242277f30dda
Author: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Date: Fri Dec 26 11:18:15 2008 -0800
802.3ad: make ntt bool
Turn Need-To-Transmit port variable into a bool. There is no
functional change.
Signed-off-by: Holger Eitzenberger <holger@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d3fa4721456226d77475181a4bfbe5b3d899d65c
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Fri Dec 26 01:36:33 2008 -0800
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
The adapter rings are kcalloc()'d, but in set_ringparam() in ixgbe_ethtool,
we replace that memory from the vmalloc() pool. This can result in a NULL
pointer reference when trying to modify the rings at a later time, or on
device removal.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7adf1525befb5606462431eb1a4ea40ded5baef4
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Fri Dec 26 01:36:05 2008 -0800
ixgbe: Fix NAPI enable/disable path when using DCB
This change allows DCB mode to change the number of queues, and presumably
the number of NAPI instances, safely.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d7b06636be162d3f74c9ce5d6d0d9ea4e5d362c8
Author: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Date: Fri Dec 26 01:35:35 2008 -0800
net: Init NAPI dev_list on napi_del
The recent GRO patches introduced the NAPI removal of devices in
free_netdev. For drivers that can change the number of queues during
driver operation, the NAPI infrastructure doesn't allow the freeing and
re-addition of NAPI entities without reloading the driver.
This change reinitializes the dev_list in each NAPI struct on delete,
instead of just deleting it (and assigning the list pointers to POISON).
Drivers that wish to remove/re-add NAPI will need to re-initialize the
netdev napi_list after removing all NAPI instances, before re-adding NAPI
devices again.
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 26bc19ecf6c077c926827c25631340fd2e8fb16e
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Fri Dec 26 01:34:11 2008 -0800
igb: re-order queues to support cleaner use of ivar on 82576
The 82576 adapter orders the queues in pairs when virtualization is in use.
The queue ordering previously conflicted with the ordering when sr-iov was
enabled. This new ordering allows a PF to allocate 2 queues without using
any VF resources.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e014cb16234c3797aa518d46fe7e1fe91ebcca9
Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Date: Fri Dec 26 01:33:18 2008 -0800
igb: defeature tx head writeback
This patch removes tx head writeback as it was found to not provide a
significant improvement in tx performance and on some systems has been seen
to cause a performance degredation due to partial cache line writes.
Signed-off-by: Alexander Duyck <alexander.h.duyck@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f2712fd0b4097e8385bdb75c0ebd285a057fe299
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Dec 26 01:31:18 2008 -0800
ipsec: Remove useless ret variable
This patch removes a useless ret variable from the IPv4 ESP/UDP
decapsulation code.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fdb614c28487df41f7bf2c98e85f29f31885561e
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 23 06:59:25 2008 +0000
ucc_geth: Eliminate the need for forward references
This patch simply reorders some functions to eliminate the need for
forward references. No other changes than that.
Suggested-by: Timur Tabi <timur@xxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9c54004ea717116a10886e254e26502ffb1136e9
Author: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Date: Tue Dec 23 04:09:02 2008 +0000
atm: Driver for Solos PCI ADSL2+ card.
This adds basic support for the 'Solos' PCI ADSL2+ cards being developed
by Traverse Technologies and Xrio Ltd:
http://www.traverse.com.au/productview.php?product_id=116
Signed-off-by: Nathan Williams <nathan@xxxxxxxxxxxxxxx>
Signed-off-by: David Woodhouse <David.Woodhouse@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 236b87c29953a87a6817e96e311b0efd00e95dc7
Author: Tilman Schmidt <tilman@xxxxxxx>
Date: Fri Dec 26 01:22:03 2008 -0800
gigaset: ifdef cleanup
Remove unnecessary #ifdef-s and #if-0-ed code sections.
Signed-off-by: Tilman Schmidt <tilman@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c8770dcabd6a615b155c25dc4d57251d3e7f151c
Author: Tilman Schmidt <tilman@xxxxxxx>
Date: Fri Dec 26 01:21:29 2008 -0800
gigaset: use pr_err() and pr_info()
Switch from private printk wrapper macros to using pr_err() and
pr_info() from linux/kernel.h, at the same time unifying a few
error messages.
Signed-off-by: Tilman Schmidt <tilman@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4d8cd002602987ddc9507b5390800343f820ac92
Author: Divy Le Ray <divy@xxxxxxxxxxx>
Date: Fri Dec 26 01:16:39 2008 -0800
cxgb3: add control to access embedded images
Update contol path between cxgb3 and ULP modules (iWARP, iSCSI)
to provide access to firware and protocol engine info.
Signed-off-by: Divy Le Ray <divy@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 6dd014808f91ad99d4d794cf7c7c69610c10f904
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:15:03 2008 -0800
drivers/net/wireless/prism54: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/prism54/islpci_hotplug.c:97:1: warning: symbol
'prism54_probe' was not declared. Should it be static?
drivers/net/wireless/prism54/islpci_hotplug.c:220:1: warning: symbol
'prism54_remove' was not declared. Should it be static?
drivers/net/wireless/prism54/islpci_hotplug.c:263:1: warning: symbol
'prism54_suspend' was not declared. Should it be static?
drivers/net/wireless/prism54/islpci_hotplug.c:286:1: warning: symbol
'prism54_resume' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a3d1fd23e1ff2deeda0415805cf9a044dda7f55c
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:14:41 2008 -0800
drivers/net/wireless/ipw2x00: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/ipw2x00/ipw2100.c:5271:6: warning: symbol
'ipw2100_queues_initialize' was not declared. Should it be static?
drivers/net/wireless/ipw2x00/ipw2100.c:5278:6: warning: symbol
'ipw2100_queues_free' was not declared. Should it be static?
drivers/net/wireless/ipw2x00/ipw2100.c:5285:5: warning: symbol
'ipw2100_queues_allocate' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 11ab72a7c94f3ccac05b85928875fdc4f1ed5e9b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:13:46 2008 -0800
drivers/net/wireless/b43: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/b43/phy_a.c:80:6: warning: symbol
'b43_radio_set_tx_iq' was not declared. Should it be static?
drivers/net/wireless/b43/phy_a.c:150:6: warning: symbol
'b43_radio_init2060' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:57:10: warning: symbol
'b43_radio_channel_codes_bg' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:218:6: warning: symbol
'b43_set_txpower_g' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:386:6: warning: symbol
'b43_nrssi_hw_write' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:393:5: warning: symbol
'b43_nrssi_hw_read' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:404:6: warning: symbol
'b43_nrssi_hw_update' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:418:6: warning: symbol
'b43_nrssi_mem_update' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:592:6: warning: symbol
'b43_calc_nrssi_slope' was not declared. Should it be static?
drivers/net/wireless/b43/phy_g.c:1357:5: warning: symbol
'b43_radio_init2050' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bf512bc827c84f77553538834fffe71604079f23
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:13:29 2008 -0800
drivers/net/wireless/ath9k: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/ath9k/eeprom.c:195:6: warning: symbol
'ath9k_fill_eeprom' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:463:5: warning: symbol
'ath9k_check_eeprom' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:1219:6: warning: symbol
'ath9k_hw_set_def_power_per_rate_table' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:1510:6: warning: symbol
'ath9k_hw_set_4k_power_per_rate_table' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2007:5: warning: symbol
'ath9k_set_txpower' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2106:6: warning: symbol
'ath9k_set_addac' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2543:6: warning: symbol
'ath9k_eeprom_set_board_values' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2606:5: warning: symbol
'ath9k_get_eeprom_antenna_cfg' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2622:4: warning: symbol
'ath9k_hw_get_4k_num_ant_config' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2628:4: warning: symbol
'ath9k_hw_get_def_num_ant_config' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2647:4: warning: symbol
'ath9k_get_num_ant_config' was not declared. Should it be static?
drivers/net/wireless/ath9k/eeprom.c:2790:5: warning: symbol
'ath9k_get_eeprom' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2ed5ba890e1e8dda89557e4ea233a26ab8bf3d58
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:12:59 2008 -0800
drivers/net/wireless: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/wireless/airo.c:3610:6: warning: symbol 'mpi_receive_802_11'
was not declared. Should it be static?
drivers/net/wireless/atmel.c:3183:6: warning: symbol 'atmel_join_bss' was
not declared. Should it be static?
drivers/net/wireless/ray_cs.c:831:5: warning: symbol 'ray_dev_init' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 62c5345db704c912b485f6b60dab381c9cebf268
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:12:08 2008 -0800
drivers/net/wan/z85230.c: fix sparse warnings: un-EXPORT symbols
The symbols are only references within the translation unit they are
defined in, so un-EXPORT them und make them 'static'.
Fix this sparse warnings:
drivers/net/wan/z85230.c:604:25: warning: symbol 'z8530_dma_sync' was not
declared. Should it be static?
drivers/net/wan/z85230.c:613:25: warning: symbol 'z8530_txdma_sync' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7b3dfa11cdef38bda07b99991f2f88c86df67ed2
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:11:21 2008 -0800
drivers/net/wan: fix sparse warning: make symbol static
Fix this sparse warning:
drivers/net/wan/x25_asy.c:623:5: warning: symbol 'x25_asy_esc' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d157e0230f205f5dd646c4e0985030367de7aa4c
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Mon Dec 22 09:17:55 2008 +0000
drivers/net/wan: fix sparse warnings: make do-while a compound statement
Fix this sparse warnings:
drivers/net/wan/wanxl.c:414:3: warning: do-while statement is not a
compound statement
drivers/net/wan/wanxl.c:441:3: warning: do-while statement is not a
compound statement
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ec1d1ebbb3bdc9807474be28c29efa155d15b850
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:07:45 2008 -0800
drivers/net/tulip: fix sparse warnings: make do-while a compound statement
Fix this sparse warnings:
drivers/net/tulip/de2104x.c:1695:4: warning: do-while statement is not a
compound statement
drivers/net/tulip/tulip_core.c:1433:5: warning: do-while statement is not
a compound statement
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 27cd6ae5619084f363630683e77d70be38075afe
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:07:15 2008 -0800
drivers/net/tokenring: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/tokenring/ibmtr.c:1840:6: warning: symbol 'tok_rerun' was not
declared. Should it be static?
drivers/net/tokenring/madgemc.c:469:16: warning: symbol
'madgemc_setnselout_pins' was not declared. Should it be static?
drivers/net/tokenring/proteon.c:286:16: warning: symbol
'proteon_setnselout_pins' was not declared. Should it be static?
drivers/net/tokenring/skisa.c:303:16: warning: symbol
'sk_isa_setnselout_pins' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 409b204435b85f7e159230c216f334a862cb3b95
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:06:28 2008 -0800
drivers/net/skfp: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/skfp/skfddi.c:620:13: warning: symbol 'skfp_interrupt' was
not declared. Should it be static?
drivers/net/skfp/skfddi.c:687:25: warning: symbol 'skfp_ctl_get_stats'
was not declared. Should it be static?
drivers/net/skfp/skfddi.c:1232:6: warning: symbol 'CheckSourceAddress'
was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2f22d22ea7e95d45353b790ac52975a42e3a8558
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:04:53 2008 -0800
drivers/net/qlge: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/qlge/qlge_ethtool.c:100:6: warning: symbol 'ql_update_stats'
was not declared. Should it be static?
drivers/net/qlge/qlge_mpi.c:22:5: warning: symbol 'ql_get_mb_sts' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f8057b7fefea1daca6928cbb95751d01fc934a41
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:04:26 2008 -0800
drivers/net/netxen: fix sparse warnings: use NULL pointer instead of plain
integer
Fix this sparse warnings:
drivers/net/netxen/netxen_nic_hw.c:1462:18: warning: Using plain integer
as NULL pointer
drivers/net/netxen/netxen_nic_hw.c:1536:18: warning: Using plain integer
as NULL pointer
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e855aac805dd9c68b6fabe395cbc8e05f0eda6e4
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:03:59 2008 -0800
drivers/net/ixgbe: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/ixgbe/ixgbe_82598.c:180:5: warning: symbol
'ixgbe_get_copper_link_capabilities_82598' was not declared. Should it be
static?
drivers/net/ixgbe/ixgbe_82598.c:245:5: warning: symbol
'ixgbe_setup_fc_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:729:5: warning: symbol
'ixgbe_set_vmdq_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:773:5: warning: symbol
'ixgbe_set_vfta_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:897:5: warning: symbol
'ixgbe_read_analog_reg8_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:919:5: warning: symbol
'ixgbe_write_analog_reg8_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:940:5: warning: symbol
'ixgbe_read_i2c_eeprom_82598' was not declared. Should it be static?
drivers/net/ixgbe/ixgbe_82598.c:1000:5: warning: symbol
'ixgbe_get_supported_physical_layer_82598' was not declared. Should it be
static?
drivers/net/ixgbe/ixgbe_dcb_82598.c:100:5: warning: symbol
'ixgbe_dcb_config_packet_buffers_82598' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 0e49e64526ccd8cb78d7c4b4a732024ff221d4d0
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:03:19 2008 -0800
drivers/net/irda: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/irda/ma600-sir.c:239:5: warning: symbol 'ma600_reset' was not
declared. Should it be static?
drivers/net/irda/smsc-ircc2.c:875:5: warning: symbol
'smsc_ircc_hard_xmit_sir' was not declared. Should it be static?
drivers/net/irda/smsc-ircc2.c:1131:6: warning: symbol
'smsc_ircc_set_sir_speed' was not declared. Should it be static?
drivers/net/irda/smsc-ircc2.c:1897:6: warning: symbol
'smsc_ircc_sir_start' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:150:5: warning: symbol 'w83977af_open' was
not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:313:5: warning: symbol 'w83977af_probe'
was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:412:6: warning: symbol
'w83977af_change_speed' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:492:5: warning: symbol
'w83977af_hard_xmit' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:734:5: warning: symbol
'w83977af_dma_receive' was not declared. Should it be static?
drivers/net/irda/w83977af_ir.c:806:5: warning: symbol
'w83977af_dma_receive_complete' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 678c610b5a069a0a76c3189dd9aa801e5d5cd7e0
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:02:49 2008 -0800
drivers/net/igb: remove dead code (function 'igb_read_pci_cfg')
Fix this warning:
drivers/net/igb/e1000_mac.c:54: warning: 'igb_read_pci_cfg' defined but
not used
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5e4232ee5d7a1d2b2399e9080bf2f1a28444c80b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Fri Dec 26 00:01:18 2008 -0800
drivers/net/enic: fix sparse warning: make symbol static
Fix this sparse warning:
drivers/net/enic/vnic_dev.c:288:5: warning: symbol 'vnic_dev_capable' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit fa4c16da738952882d51b265adbef1d8d329d50f
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Mon Dec 22 09:16:13 2008 +0000
drivers/net/e1000e: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/e1000e/es2lan.c:1265:5: warning: symbol
'e1000_read_kmrn_reg_80003es2lan' was not declared. Should it be static?
drivers/net/e1000e/es2lan.c:1298:5: warning: symbol
'e1000_write_kmrn_reg_80003es2lan' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit af8eca5cbbc8f991ec14c8d7e3350bbe2ea49655
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:59:28 2008 -0800
drivers/net/cxgb3: comment out dead code
The function 'vsc8211_set_speed_duplex' is not used, so comment it
out. For 'vsc8211_set_automdi' the function 'vsc8211_set_speed_duplex'
is the only caller, so comment it out as well.
Fix this (sparse) warning:
drivers/net/cxgb3/vsc8211.c:269: warning: 'vsc8211_set_automdi' defined
but not used
drivers/net/cxgb3/vsc8211.c:295:5: warning: symbol
'vsc8211_set_speed_duplex' was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b06715b7a3db551dcf4706f05e8d2285a66fe05f
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:58:57 2008 -0800
drivers/net/bonding: fix sparse warnings: move decls to header file
Fix this sparse warnings:
drivers/net/bonding/bond_main.c:104:20: warning: symbol
'bonding_defaults' was not declared. Should it be static?
drivers/net/bonding/bond_main.c:204:22: warning: symbol 'ad_select_tbl'
was not declared. Should it be static?
drivers/net/bonding/bond_sysfs.c:60:21: warning: symbol 'bonding_rwsem'
was not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9dc20f553f8cb548feaba9dae0cb4905327ecbac
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:58:35 2008 -0800
drivers/net/atlx: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/atlx/atl1.c:198:16: warning: symbol 'atl1_check_options' was
not declared. Should it be static?
drivers/net/atlx/atl1.c:526:5: warning: symbol 'atl1_read_mac_addr' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 888432f6720bec93ddae93c4d1483a18198a1b3b
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:57:21 2008 -0800
drivers/net/arcnet: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/arcnet/capmode.c:64:6: warning: symbol 'arcnet_cap_init' was
not declared. Should it be static?
drivers/net/arcnet/com90xx.c:586:5: warning: symbol 'com90xx_reset' was
not declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dac499f912abd5838fa3501efdcd0f23d5f4fc29
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:56:45 2008 -0800
drivers/net: fix sparse warnings: make symbols static
Fix this sparse warnings:
drivers/net/3c523.c:350:6: warning: symbol 'alloc586' was not declared.
Should it be static?
drivers/net/cs89x0.c:1029:14: warning: symbol 'reset_chip' was not
declared. Should it be static?
drivers/net/eepro.c:1399:1: warning: symbol 'read_eeprom' was not
declared. Should it be static?
drivers/net/plip.c:1020:5: warning: symbol 'plip_hard_header_cache' was
not declared. Should it be static?
drivers/net/s2io.c:5116:6: warning: symbol 'do_s2io_store_unicast_mc' was
not declared. Should it be static?
drivers/net/smc9194.c:767:12: warning: symbol 'smc_findirq' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit a08b32df1417146b1a4c43e641ec1177da51896c
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:56:04 2008 -0800
drivers/net: fix sparse warning: returning void-valued expression
Fix this sparse warning:
drivers/net/niu.c:8850:2: warning: returning void-valued expression
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e4c3c13cb4c4985cb62cf28677fc0ace69a8d69f
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:55:35 2008 -0800
drivers/net: fix sparse warnings: make do-while a compound statement
While at it insert some extra curly braces and fix formatting.
Fix this sparse warnings:
drivers/net/atp.c:811:8: warning: do-while statement is not a compound
statement
drivers/net/atp.c:813:8: warning: do-while statement is not a compound
statement
drivers/net/atp.c:815:11: warning: do-while statement is not a compound
statement
drivers/net/atp.c:817:11: warning: do-while statement is not a compound
statement
drivers/net/plip.c:642:4: warning: do-while statement is not a compound
statement
drivers/net/plip.c:647:4: warning: do-while statement is not a compound
statement
drivers/net/plip.c:820:4: warning: do-while statement is not a compound
statement
drivers/net/plip.c:825:4: warning: do-while statement is not a compound
statement
drivers/net/starfire.c:886:3: warning: do-while statement is not a
compound statement
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2705d4f87c068552f45e5d6feaa5c468a312f761
Author: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Date: Thu Dec 25 23:52:57 2008 -0800
drivers/net: fix sparse warning: use ANSI-style function declaration
Fix this sparse warning:
drivers/net/ne.c:932:24: warning: non-ANSI function declaration of
function 'init_module'
Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d76e56b4c620c959fa8346c08d24ee4b2783a564
Author: Nathan Lynch <ntl@xxxxxxxxx>
Date: Mon Dec 22 08:42:11 2008 +0000
ehea: use get_zeroed_page for alignment-sensitive allocation
With slub debug enabled, I see the following errors and crash with
2.6.28-rc9:
IBM eHEA ethernet device driver (Release EHEA_0095)
ehea: Error in ehea_h_register_rpage_mr: not on pageboundary
ehea: Error in ehea_reg_mr_section: register_rpage_mr failed
ehea: Error in ehea_reg_kernel_mr: registering mr failed
ehea: Error in ehea_setup_ports: creating MR failed
ehea 23c00100.lhea: setup_ports failed
Unable to handle kernel paging request for data at address
0x6b6b6b6b6b6bbdcb
Faulting instruction address: 0xd000000000064a24
cpu 0x0: Vector: 300 (Data Access) at [c0000000740e7190]
pc: d000000000064a24: .ehea_update_firmware_handles+0x84/0x47c [ehea]
lr: d00000000006df34: .ehea_probe_adapter+0x35c/0x39c [ehea]
sp: c0000000740e7410
msr: 8000000000009032
dar: 6b6b6b6b6b6bbdcb
dsisr: 40000000
current = 0xc000000074233780
paca = 0xc0000000008a3300
pid = 2046, comm = modprobe
enter ? for help
[c0000000740e74f0] d00000000006df34 .ehea_probe_adapter+0x35c/0x39c [ehea]
[c0000000740e75a0] c00000000041d5a4 .of_platform_device_probe+0x78/0xb0
[c0000000740e7630] c0000000002d8b38 .driver_probe_device+0x13c/0x200
[c0000000740e76c0] c0000000002d8c90 .__driver_attach+0x94/0xd8
[c0000000740e7750] c0000000002d7d64 .bus_for_each_dev+0x80/0xd8
[c0000000740e7800] c0000000002d889c .driver_attach+0x28/0x40
[c0000000740e7880] c0000000002d8340 .bus_add_driver+0xd4/0x284
[c0000000740e7920] c0000000002d90a0 .driver_register+0xc4/0x198
[c0000000740e79d0] c00000000041d45c .of_register_driver+0x4c/0x60
[c0000000740e7a50] c000000000020ef8 .ibmebus_register_driver+0x30/0x4c
[c0000000740e7ae0] d00000000006e108 .ehea_module_init+0x194/0x208c [ehea]
[c0000000740e7b90] c000000000009028 .do_one_initcall+0x90/0x1ac
[c0000000740e7d90] c00000000008619c .sys_init_module+0xc4/0x200
[c0000000740e7e30] c0000000000084ac syscall_exit+0x0/0x40
(When slub debug is disabled it works fine.)
PAGE_SIZE allocations via slab are not guaranteed to be page-aligned;
use get_zeroed_page for the 'pt' buffer (I don't really know what this
is, only that it is passed to firmware and that the first error
message complains about its alignment). This allows the system to
boot.
Signed-off-by: Nathan Lynch <ntl@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 359d67d6ad054ae11ad459665fdfb883aca87782
Author: Julia Lawall <julia@xxxxxxx>
Date: Mon Dec 22 21:53:40 2008 +0000
[CIFS] Remove redundant test
In fs/cifs/cifssmb.c, pLockData is tested for being NULL at the beginning
of the function, and not reassigned subsequently.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit c6fbba0546d3ead18d4a623e76e28bcbaa66a325
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Thu Dec 18 01:41:20 2008 +0000
[CIFS] make sure that DFS pathnames are properly formed
The paths in a DFS request are supposed to only have a single preceding
backslash, but we are sending them with a double backslash. This is
exposing a bug in Windows where it also sends a path in the response
that has a double backslash.
The existing code that builds the mount option string however expects a
double backslash prefix in a couple of places when it tries to use the
path returned by build_path_from_dentry. Fix compose_mount_options to
expect properly formed DFS paths (single backslash at front).
Also clean up error handling in that function. There was a possible
NULL pointer dereference and situations where a partially built option
string would be returned.
Tested against Samba 3.0.28-ish server and Samba 3.3 and Win2k8.
CC: Stable <stable@xxxxxxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit ac6a3ef405f314c206906463ca9913a826a577ee
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:40:40 2008 +0100
Remove an already-checked error condition in SendReceiveBlockingLock
Remove an already-checked error condition in SendReceiveBlockingLock
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 698e96a826939bb24063f6a61801c174e19c32b1
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:39:31 2008 +0100
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 17c8bfed8abbbed82937a751abfc40d2866e3196
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:38:19 2008 +0100
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Streamline SendReceiveBlockingLock: Use "goto out:" in an error condition
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 2b2bdfba7a3679f67b7c3aca4a4b08b24bb675a8
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Thu Dec 11 17:26:54 2008 +0000
[CIFS] Streamline SendReceive[2] by using "goto out:" in an error condition
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8e4f2e8a1e5cfa07c5b2731accee0e6eb4c64575
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:22:15 2008 +0100
Slightly streamline SendReceive[2]
Slightly streamline SendReceive[2]
Remove an else branch by naming the error condition what it is
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 829049cbb1d2ddda2be17ea008b6b3c457808d91
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 16:00:53 2008 +0100
Check the return value of cifs_sign_smb[2]
Check the return value of cifs_sign_smb[2]
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 4c3130efda1ef4f28d5f26819fae2e58c3945f0b
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 9 00:28:16 2008 +0000
[CIFS] Cleanup: Move the check for too large R/W requests
This avoids an unnecessary else branch
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 27a97a613b96688e59dd116cae3f0c94107b434c
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Mon Dec 8 20:59:39 2008 +0000
[CIFS] Slightly simplify wait_for_free_request(), remove an unnecessary
"else" branch
This is no functional change, because in the "if" branch we do an early
"return 0;".
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8fbbd365cc700e288fb6f9780b092c5afa4946e5
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Sat Dec 6 13:12:34 2008 +0100
Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
Simplify allocate_mid() slightly: Remove some unnecessary "else" branches
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 6d9c6d543165d1d492602c1371cb019040093584
Author: Volker Lendecke <vl@xxxxxxxxx>
Date: Mon Dec 8 20:50:24 2008 +0000
[CIFS] In SendReceive, move consistency check out of the mutexed region
inbuf->smb_buf_length does not change in in wait_for_free_request() or in
allocate_mid(), so we can check it early.
Signed-off-by: Volker Lendecke <vl@xxxxxxxxx>
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 00e485b0198ea4f509341373f1d9adb0a5977a2f
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: store password in tcon
cifs: store password in tcon
Each tcon has its own password for share-level security. Store it in
the tcon and wipe it clean and free it when freeing the tcon. When
doing the tree connect with share-level security, use the tcon password
instead of the session password.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 4e53a3fb98d3d5c2941d2e7199dab317a9d4ead3
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: have calc_lanman_hash take more granular args
cifs: have calc_lanman_hash take more granular args
We need to use this routine to encrypt passwords associated with the
tcon too. Don't assume that the password will be attached to the
smb_session.
Also, make some of the values in the lower encryption functions
const since they aren't changed.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 55162dec9371a6f6ac63ff546c182cc6144a649e
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: zero out session password before freeing it
cifs: zero out session password before freeing it
...just to be on the safe side.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 85705524258f93a6086c3247a58f34a661b82b3d
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Fri Dec 5 20:41:21 2008 -0500
cifs: fix wait_for_response to time out sleeping processes correctly
cifs: fix wait_for_response to time out sleeping processes correctly
The current scheme that CIFS uses to sleep and wait for a response is
not quite what we want. After sending a request, wait_for_response puts
the task to sleep with wait_event(). One of the conditions for
wait_event is a timeout (using time_after()).
The problem with this is that there is no guarantee that the process
will ever be woken back up. If the server stops sending data, then
cifs_demultiplex_thread will leave its response queue sleeping.
I think the only thing that saves us here is the fact that
cifs_dnotify_thread periodically (every 15s) wakes up sleeping processes
on all response_q's that have calls in flight. This makes for
unnecessary wakeups of some processes. It also means large variability
in the timeouts since they're all woken up at once.
Instead of this, put the tasks to sleep with wait_event_timeout. This
makes them wake up on their own if they time out. With this change,
cifs_dnotify_thread should no longer be needed.
I've been testing this in conjunction with some other patches that I'm
working on. It doesn't seem to affect performance at all with with heavy
I/O. Identical iozone -ac runs complete in almost exactly the same time
(<1% difference in times).
Thanks to Wasrshi Nimara for initially pointing this out. Wasrshi, it
would be nice to know whether this patch also helps your testcase.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Cc: Wasrshi Nimara <warshinimara@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8be0ed44c2fa4afcf2c6d2fb3102c926e9f989df
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Fri Dec 5 19:14:12 2008 +0000
[CIFS] Can not mount with prefixpath if root directory of share is
inaccessible
Windows allows you to deny access to the top of a share, but permit access
to
a directory lower in the path. With the prefixpath feature of cifs
(ie mounting \\server\share\directory\subdirectory\etc.) this should have
worked if the user specified a prefixpath which put the root of the mount
at a directory to which he had access, but we still were doing a lookup
on the root of the share (null path) when we should have been doing it on
the prefixpath subdirectory.
This fixes Samba bug # 5925
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 61e748015866e48aff91284e3d300c6e3035a87a
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Wed Dec 3 00:57:54 2008 +0000
[CIFS] various minor cleanups pointed out by checkpatch script
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 3de2091ac722e7dbc37d87d9112ab19ec6a871de
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 2 20:52:28 2008 +0000
[CIFS] fix typo
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit acc18aa1e643519035abdab5e72dc75e534b5198
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 2 18:53:55 2008 +0000
[CIFS] remove sparse warning
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 13a6e42af8d90e2e8eb7fa50adf862a525b70518
Author: Steve French <sfrench@xxxxxxxxxx>
Date: Tue Dec 2 17:24:33 2008 +0000
[CIFS] add mount option to send mandatory rather than advisory locks
Some applications/subsystems require mandatory byte range locks
(as is used for Windows/DOS/OS2 etc). Sending advisory (posix style)
byte range lock requests (instead of mandatory byte range locks) can
lead to problems for these applications (which expect that other
clients be prevented from writing to portions of the file which
they have locked and are updating). This mount option allows
mounting cifs with the new mount option "forcemand" (or
"forcemandatorylock") in order to have the cifs client use mandatory
byte range locks (ie SMB/CIFS/Windows/NTFS style locks) rather than
posix byte range lock requests, even if the server would support
posix byte range lock requests. This has no effect if the server
does not support the CIFS Unix Extensions (since posix style locks
require support for the CIFS Unix Extensions), but for mounts
to Samba servers this can be helpful for Wine and applications
that require mandatory byte range locks.
Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
CC: Alexander Bokovoy <ab@xxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit d5c5605c27c92dac6de1a7a658af5b030847f949
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:42:33 2008 -0500
cifs: make ipv6_connect take a TCP_Server_Info arg
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit bcf4b1063db246a90b9e09e0556f635d632eef36
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:42:15 2008 -0500
cifs: make ipv4_connect take a TCP_Server_Info arg
In order to unify the smb_send routines, we need to reorganize the
routines that connect the sockets. Have ipv4_connect take a
TCP_Server_Info pointer and get the necessary fields from that.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 7586b76585d15db767c19255ba0ecfb164df99f7
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:41:49 2008 -0500
cifs: don't declare smb_vol info on the stack
struct smb_vol is fairly large, it's probably best to kzalloc it...
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 63c038c29774476c5dae759e348c269342b4dbef
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 18:41:46 2008 -0500
cifs: move allocation of new TCP_Server_Info into separate function
Clean up cifs_mount a bit by moving the code that creates new TCP
sessions into a separate function. Have that function search for an
existing socket and then create a new one if one isn't found.
Also reorganize the initializion of TCP_Server_Info a bit to prepare
for cleanup of the socket connection code.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 8ecaf67a8ea58c8f131ff045475c74e9538d6b7a
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 15:23:50 2008 -0500
cifs: account for IPv6 in ses->serverName and clean up netbios name handling
The current code for setting the session serverName is IPv4-specific.
Allow it to be an IPv6 address as well. Use NIP* macros to set the
format.
This also entails increasing the length of the serverName field, so
declare a new macro for RFC1001 name length and use it in the
appropriate places.
Finally, drop the unicode_server_Name field from TCP_Server_Info since
it's not used. We can add it back later if needed, but for now it just
wastes memory.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 954d7a1cf12158fed23dd8b0f3f563d5a5c97f28
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 15:23:50 2008 -0500
cifs: make dnotify thread experimental code
Now that tasks sleeping in wait_for_response will time out on their own,
we're not reliant on the dnotify thread to do this. Mark it as
experimental code for now.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 72ca545b2d83ac7de671bf66d2dbc214528b4c0c
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:36 2008 -0500
cifs: convert tcpSem to a mutex
Mutexes are preferred for single-holder semaphores...
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 0468a2cf914e79442b8309ce62e3f861599d8cab
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:35 2008 -0500
cifs: take module reference when starting cifsd
cifsd can outlive the last cifs mount. We need to hold a module
reference until it exits to prevent someone from unplugging
the module until we're ready.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 80909022ce966191e6140fcc15d8aff57a7df32e
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:35 2008 -0500
cifs: display addr and prefixpath options in /proc/mounts
Have cifs_show_options display the addr and prefixpath options in
/proc/mounts. Reduce struct dereferencing by adding some local
variables.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 24b9b06ba7ea53aa0c4d0b1c8c1e93aa1bd9fe72
Author: Jeff Layton <jlayton@xxxxxxxxxx>
Date: Mon Dec 1 07:09:34 2008 -0500
cifs: remove unused SMB session pointer from struct mid_q_entry
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Steve French <sfrench@xxxxxxxxxx>
commit 26c743bed9b0dc83dc736c68d2a3e7494a9790ad
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:20:13 2008 -0800
mlx4_en: Remove pauses module parameters.
They are controlled through Ethtool interface.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 60b9f9e5588a9e37c35abc2051d57ef12171f916
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:19:47 2008 -0800
mlx4_en: Removed Interrupt moderation module parameters
They are controlled through Ethtool interface, no need to have two
ways to modify them.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c03ea21fcf549eed42de7aaa965ced8bee17aa76
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:14:04 2008 -0800
mlx4_en: Removed redundant cq->armed flag
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 48374ddce72e278e29080e3177e74a13c034d8b4
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:13:45 2008 -0800
mlx4_en: Removed TX locking when polling TX cq
There is no need to synchronize the polling with the transmit
function. The only place to synchronize is when we process
the cq from the transmit function. Also removed spin_lock_irq,
and using spin_trylock, if somebody else is already processing the cq,
no need to wait for it to finish.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b51968d676db1c4e541b4c84de7ce7af812c9e9f
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Thu Dec 25 18:13:20 2008 -0800
mlx4_en: Memory leak on completion queue free
If port is being destroyed without being activated before,
CQ resources are not freed.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e74b3f7d568a62d21a76885438d7351948e7355a
Merge: 13e620e0e6c609ccc9882ea280f4f077500d51a0
59f8500efb05096484a55263109acab6a6df89d5
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Thu Dec 25 18:10:12 2008 -0800
Merge branch 'for-david' of
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
commit 13e620e0e6c609ccc9882ea280f4f077500d51a0
Author: Brice Goglin <brice@xxxxxxxx>
Date: Thu Dec 25 18:09:16 2008 -0800
myri10ge: update driver version to 1.4.4-1.395
Update myri10ge driver version to 1.4.4-1.395.
Signed-off-by: Brice Goglin <brice@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e92df2820d2d8de4be3dcbad96eb144ce6fd550d
Author: Brice Goglin <brice@xxxxxxxx>
Date: Thu Dec 25 18:08:59 2008 -0800
myri10ge: update firmware headers to 1.4.37
Update myri10ge firmware headers to 1.4.37:
* Make each member of the error/cmd enum an initialized one, so there
is a convenient numerical reference to look for reverse conversion.
* Add new MXGEFW_CMD_RELAX_RXBUFFER_ALIGNMENT command.
* Add new "features" field to mcp_header.
Signed-off-by: Brice Goglin <brice@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 36994a0a7004fd4777cd93a4b658b5f84bf4c93e
Author: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Date: Thu Dec 25 18:07:50 2008 -0800
forcedeth: don't poll NV event 36
Polling doesn't seem to be necessary on my hardware, at
least I haven't seen any bad effects testing it a while.
Remove the polling so the CPU doesn't have to wake up a
hundred times per second.
Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 88a44e51e9a5202f8856f72400fc87a39205186d
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:04:51 2008 -0800
net/appletalk: Remove redundant test
atif is tested for being NULL twice, with the same effect in each case. I
have kept the second test, as it seems to fit well with the comment above
it.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c14ea0ca659d378dd377e417162ebd908d1da4ce
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:03:44 2008 -0800
drivers/net/wan: Remove redundant test
arg is checked not to be NULL a few lines before.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 90f5dfcc6afafcc3e1c18298143c1213b071990d
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:03:28 2008 -0800
drivers/net: Remove redundant test
In each case, ap is checked not to be NULL a few lines before.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 662f44af635f6bde366d44abacaeec7916d9f168
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:03:09 2008 -0800
drivers/net/ehea: Remove redundant test
In each case, vpage is checked not to be NULL just after it is initialized
at the beginning of each loop iteration.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b0fd0d235df2b3cf8e5e244e301614092a9c317c
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 18:02:49 2008 -0800
drivers/net/au1000_eth.c: Remove redundant test
phydev is checked to be not NULL a few lines above.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c062076cc999795af19ff61d8c76f33e5ceb9ca0
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Thu Dec 25 17:23:50 2008 -0800
qlge: ql_adapter_down() typo
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Ron Mercer <ron.mercer@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 619e803d3c1b7bcc17c45e81f309d0b9b3df2d5d
Author: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Date: Thu Dec 25 17:21:17 2008 -0800
netlink: fix (theoretical) overrun in message iteration
See commit 1045b03e07d85f3545118510a587035536030c1c ("netlink: fix
overrun in attribute iteration") for a detailed explanation of why
this patch is necessary.
In short, nlmsg_next() can make "remaining" go negative, and the
remaining >= sizeof(...) comparison will promote "remaining" to an
unsigned type, which means that the expression will evaluate to
true for negative numbers, even though it was not intended.
I put "theoretical" in the title because I have no evidence that
this can actually happen, but I suspect that a crafted netlink
packet can trigger some badness.
Note that the last test, which seemingly has the exact same
problem (also true for nla_ok()), is perfectly OK, since we
already know that remaining is positive.
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 64ff3b938ec6782e6585a83d5459b98b0c3f6eb8
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 17:12:58 2008 -0800
tcp: Always set urgent pointer if it's beyond snd_nxt
Our TCP stack does not set the urgent flag if the urgent pointer
does not fit in 16 bits, i.e., if it is more than 64K from the
sequence number of a packet.
This behaviour is different from the BSDs, and clearly contradicts
the purpose of urgent mode, which is to send the notification
(though not necessarily the associated data) as soon as possible.
Our current behaviour may in fact delay the urgent notification
indefinitely if the receiver window does not open up.
Simply matching BSD however may break legacy applications which
incorrectly rely on the out-of-band delivery of urgent data, and
conversely the in-band delivery of non-urgent data.
Alexey Kuznetsov suggested a safe solution of following BSD only
if the urgent pointer itself has not yet been transmitted. This
way we guarantee that when the remote end sees the packet with
non-urgent data marked as urgent due to wrap-around we would have
advanced the urgent pointer beyond, either to the actual urgent
data or to an as-yet untransmitted packet.
The only potential downside is that applications on the remote
end may see multiple SIGURG notifications. However, this would
occur anyway with other TCP stacks. More importantly, the outcome
of such a duplicate notification is likely to be harmless since
the signal itself does not carry any information other than the
fact that we're in urgent mode.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 8510b937ae1e23583abdeb828cad5c518295c61d
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:59:03 2008 -0800
sctp: Add validity check for SCTP_PARTIAL_DELIVERY_POINT socket option
The latest ietf socket extensions API draft said:
8.1.21. Set or Get the SCTP Partial Delivery Point
Note also that the call will fail if the user attempts to set
this value larger than the socket receive buffer size.
This patch add this validity check for SCTP_PARTIAL_DELIVERY_POINT
socket option.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 9fcb95a105758b81ef0131cd18e2db5149f13e95
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:58:11 2008 -0800
sctp: Avoid memory overflow while FWD-TSN chunk is received with bad stream
ID
If FWD-TSN chunk is received with bad stream ID, the sctp will not do the
validity check, this may cause memory overflow when overwrite the TSN of
the stream ID.
The FORWARD-TSN chunk is like this:
FORWARD-TSN chunk
Type = 192
Flags = 0
Length = 172
NewTSN = 99
Stream = 10000
StreamSequence = 0xFFFF
This patch fix this problem by discard the chunk if stream ID is not
less than MIS.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aea3c5c05d2c409e93bfa80dcedc06af7da6c13b
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:57:24 2008 -0800
sctp: Implement socket option SCTP_GET_ASSOC_NUMBER
Implement socket option SCTP_GET_ASSOC_NUMBER of the latest ietf socket
extensions API draft.
8.2.5. Get the Current Number of Associations (SCTP_GET_ASSOC_NUMBER)
This option gets the current number of associations that are attached
to a one-to-many style socket. The option value is an uint32_t.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit ea686a2653c5586b1c7192958b9d521abde66e92
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:56:45 2008 -0800
sctp: Fix a typo in socket.c
Just fix a typo in socket.c.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit e89c2095815d82eaa9fb85eff42f8b65b67a59cf
Author: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Date: Thu Dec 25 16:54:58 2008 -0800
sctp: Bring SCTP_MAXSEG socket option into ietf API extension compliance
Brings maxseg socket option set/get into line with the latest ietf socket
extensions API draft, while maintaining backwards compatibility.
Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@xxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 161c8d2f50109b44b664eaf23831ea1587979a61
Author: Krzysztof Halasa <khc@xxxxxxxxx>
Date: Thu Dec 25 16:50:41 2008 -0800
net: PHYLIB mdio fixes #2
The PHYLIB mdio code has more problems in error paths:
- mdiobus_release can be called before bus->state is set to
MDIOBUS_REGISTERED
- mdiobus_scan allocates resources which need to be freed
- the comment is wrong, the resistors used are actually pull-ups.
Signed-off-by: Krzysztof Halasa <khc@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f7d1b9f5aafa371d7f51f644aa3c38bc914e9205
Author: Eric Dumazet <dada1@xxxxxxxxxxxxx>
Date: Thu Dec 25 16:45:19 2008 -0800
vlan: fix convertion to net_device_ops
commit 656299f706e52e0409733d704c2761f1b12d6954
(vlan: convert to net_device_ops) added a net_device_ops
with a NULL ndo_start_xmit field.
This gives a crash in dev_hard_start_xmit()
Fix it using two net_device_ops structures, one for hwaccel vlan,
one for non hwaccel vlan.
Signed-off-by: Eric Dumazet <dada1@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit d45227391c70ea12ec129ebfa97841e9b7ff34fd
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:44:01 2008 -0800
smsc911x: fix platform resource call during module unload
This patch fixes a typo, the platform_get_resource calls in
smsc911x_drv_remove are supposed to look the same as those in
smsc911x_drv_probe.
Reported and fixed by dfoley@xxxxxxxxxx
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dc26977f77dd3486b59516d2cc03627009c0d4c6
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:43:34 2008 -0800
smsc911x: don't clobber driver_data
smsc911x uses driver_data to store our net_device, don't overwrite this
with the mii_bus.
Reported and fixed by dfoley@xxxxxxxxxx
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7091e728c570157496e52296d2dbe816a6916836
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Thu Dec 25 16:42:51 2008 -0800
netns: igmp: make /proc/net/{igmp,mcfilter} per netns
This patch makes the followinf proc entries per-netns:
/proc/net/igmp
/proc/net/mcfilter
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Acked-by: Daniel Lezcano <dlezcano@xxxxxxxxxx>
Acked-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit b4ee07df3d8121060200dbe1c6686a4e0682bee2
Author: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Thu Dec 25 16:42:23 2008 -0800
netns: igmp: allow IPPROTO_IGMP sockets in netns
Looks like everything is already ready.
Required for ebtables(8) for one thing.
Also, required for ipmr per-netns (coming soon). (Benjamin)
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Acked-by: Benjamin Thery <benjamin.thery@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit cb5b04fe14394a93eb9a3523f5af9f77480a5a04
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:41:09 2008 -0800
smsc911x: make smsc911x_ethtool_ops constant
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 631b7568c7d8f0222773e1beb2460a86541ae394
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:40:47 2008 -0800
smsc911x: convert driver to use net_device_ops
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit dd0451938815d8b901488b1058f52023892c6cde
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Thu Dec 25 16:40:19 2008 -0800
smsc911x: fix BUG if module is removed while interface is up
If the module is removed while its interface is up, smsc911x_stop is not
called until after smsc911x_drv_remove has disposed of phy_dev. This
patch changes the stop method to handle this situation.
This is a different problem to the one reported by dfoley@xxxxxxxxxx
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4e202284e6ac1695df3eb4a0e549ea78addfb663
Merge: 826e08b0157c0ce8a80dfe3c0a6c5a1540dd0b1d
80f40ee4a07530cc3acbc239a9299ec47025825b
4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 13:42:23 2008 +0100
Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core
commit cef7125def4dd104769f400c941199614da0aca1
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:55 2008 +0100
[S390] provide documentation for hvc_iucv kernel parameter.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2a7c6f2c39d1291e55403676b25fcfbff78fc5fb
Author: Peter Tiedemann <ptiedem@xxxxxxxxxx>
Date: Thu Dec 25 13:39:54 2008 +0100
[S390] convert ctcm printks to dev_xxx and pr_xxx macros.
Signed-off-by: Peter Tiedemann <ptiedem@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ecf39d42129767c0b4b4a6cf4997c1219c860934
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Dec 25 13:39:53 2008 +0100
[S390] convert zfcp printks to pr_xxx macros.
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5466c2e43e78068cfe634b07fe36dd7a6a7af535
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:52 2008 +0100
[S390] convert vmlogrdr printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 17159dc6fb8769e52edb23d138c2b6bc634397a3
Author: Michael Holzheu <holzheu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:51 2008 +0100
[S390] convert zfcp dumper printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 395d31d40cc38270dd7c024691404e2eddf0678d
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:50 2008 +0100
[S390] convert cpu related printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 74eacdb9c2bf9fc6e8c6785013b5dd0e551a9dfa
Author: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Date: Thu Dec 25 13:39:49 2008 +0100
[S390] convert qeth printks to dev_xxx and pr_xxx macros.
Signed-off-by: Frank Blaschka <frank.blaschka@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b3ff088b3025c3583194edd7576215b61333111f
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:48 2008 +0100
[S390] convert sclp printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 8f7c502c267c0e5e2dbbbdea9f3e7e85bbc95694
Author: Ursula Braun <braunu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:47 2008 +0100
[S390] convert iucv printks to dev_xxx and pr_xxx macros.
Signed-off-by: Ursula Braun <braunu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 136f7a1c4239be91e3e0f53532944b9aab7b58f8
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:46 2008 +0100
[S390] convert ap_bus printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 93098bf01578763bb84b627fe893f219cc44b995
Author: Hongjie Yang <hongjie@xxxxxxxxxx>
Date: Thu Dec 25 13:39:45 2008 +0100
[S390] convert dcssblk and extmem printks messages to pr_xxx macros.
Signed-off-by: Hongjie Yang <hongjie@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 1519c0c6ebd2bfd29bae762a1741963a1d06bca2
Author: Melissa Howland <melissah@xxxxxxxxxx>
Date: Thu Dec 25 13:39:44 2008 +0100
[S390] convert monwriter printks to pr_xxx macros.
Signed-off-by: Melissa Howland <melissah@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c5612c1956597687e4bdf59f2649d20d60f5a2b6
Author: Michael Holzheu <holzheu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:43 2008 +0100
[S390] convert s390 debug feature printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit a4f5a299cf8468619dc17f0711017c6d72d6ab94
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Thu Dec 25 13:39:42 2008 +0100
[S390] convert monreader printks to pr_xxx macros.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e7534b0ec9a28c53a7bcc874e818a24d3b49680f
Author: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Date: Thu Dec 25 13:39:41 2008 +0100
[S390] convert appldata printks to pr_xxx macros.
Signed-off-by: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 3b6ed4ab48be2110aa93d9828783bfe86193331d
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:40 2008 +0100
[S390] convert setup printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f55495ba1a56adba57ea7d3164a766d83a631c58
Author: Michael Holzheu <holzheu@xxxxxxxxxx>
Date: Thu Dec 25 13:39:39 2008 +0100
[S390] convert hypfs printks to pr_xxx macros.
Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit feab6501d84f7e2f75cf0f5c7d43341431904374
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:38 2008 +0100
[S390] convert time printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 39f09392498d8ee876bea3ad34f26c447924c818
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:37 2008 +0100
[S390] convert cpacf printks to pr_xxx macros.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e6d5a428e01b1387852f17b3dd7934239a0be0d4
Author: Michael Ernst <mernst@xxxxxxxxxx>
Date: Thu Dec 25 13:39:36 2008 +0100
[S390] convert cio printks to pr_xxx macros.
Signed-off-by: Michael Ernst <mernst@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 80a5c36d1dae15520aa0df0eff713c6c41c46035
Author: Frank Munzert <munzert@xxxxxxxxxx>
Date: Thu Dec 25 13:39:35 2008 +0100
[S390] convert vmur printks to pr_xxx macros.
Signed-off-by: Frank Munzert <munzert@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2f526e5acbf1179d30bc9fa1d20b69ec4c0bb689
Author: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Date: Thu Dec 25 13:39:34 2008 +0100
[S390] convert cpcmd printks to pr_xxx macros.
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c99fc5dadcd87e8b97613f50c48407678b731cfb
Author: Klaus-D. Wacker <kdwacker@xxxxxxxxxx>
Date: Thu Dec 25 13:39:33 2008 +0100
[S390] convert lcs printks to dev_xxx and pr_xxx macros.
Signed-off-by: Klaus-D. Wacker <kdwacker@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 8988e58f8b7d4b5e8b64435bedf84e4b3987a63d
Author: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Date: Thu Dec 25 13:39:32 2008 +0100
[S390] convert vmcp printks to pr_xxx macros.
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d1c2f8928a2feab56a181bb7e9afe8f804fd26cd
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:31 2008 +0100
[S390] convert xpram printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit acfa922c5a00eca0abac0e2b6d6666c606c27345
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 13:39:30 2008 +0100
[S390] s390: Remove redundant test
The loop above the modified code only terminates when rc is a valid pointer.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0946100f566d04cc93e86654f3ba588ee94b3f4c
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:29 2008 +0100
[S390] s390/setup: set default preferred console device "ttyS"
This patch sets the default console device for s390.
The console= kernel parameter can be still used to switch the preferred
console to some other device. In that case, console messages are also
printed on the default console device (ttyS0).
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 21e7b2c4d59e5d6631b25e71e777cb0160997d6a
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Dec 25 13:39:28 2008 +0100
[S390] drivers/s390/crypto: Move dereference to after IS_ERR test
If reply is ERR_PTR(...), then it should not be dereferenced, so I have
moved the dereference from the declaration to after the IS_ERR test.
The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@match exists@
expression x, E;
identifier fld;
position p1,p2;
@@
(
x = E;
|
x = E
|
x@p1->fld
... when != x = E
IS_ERR(x@p2)
... when any
)
@other_match exists@
expression match.x, E1, E2;
position match.p1,match.p2;
@@
x = E1
... when != x = E2
when != x@p1
x@p2
@ script:python depends on !other_match@
p1 << match.p1;
p2 << match.p2;
@@
print "* file %s dereference %s test %s" %
(p1[0].file,p1[0].line,p2[0].line)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 33b1d09ef317d64c58b135c2e811bb55b3f15b19
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:27 2008 +0100
[S390] panic_stack leak in smp_alloc_lowcore
Fix freeing of the panic_stack if the allocation of async_stack failed.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 4f7e90d6d61fa0e56821787521c12f8a626c4037
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:26 2008 +0100
[S390] clear_table inline assembly contraints
Tell the compile that the clear_table inline assembly writes to the
memory referenced by *s.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c185b783b0993c294ca22ad0a55e6cdf8df4f9d3
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:25 2008 +0100
[S390] Remove config options.
On s390 we always want to run with precise cputime accounting.
Remove the config options VIRT_TIMER and VIRT_CPU_ACCOUNTING.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 349f1b671a4b2612c1355612bedadc81f86d26f1
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:24 2008 +0100
[S390] cpu topology: remove dead code
Interrupts haven't been implemented. So remove the dead code.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2b1a61f0a8c714c96277bf16a823a84bafa1397d
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:23 2008 +0100
[S390] cpu topology: introduce kernel parameter
Introduce a topology=[on|off] kernel parameter which allows to switch
cpu topology on/off. Default will be off, since it looks like that for
some workloards this doesn't behave very well (on s390).
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9fee8db222a344b9ee407fad9c652ed823690788
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:22 2008 +0100
[S390] add new machine types to setup_hwcaps.
Add the machine types for z9-bc, z10-ec and z10-bc to the elf_platform
detection in setup_hwcaps.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c58d92b233a41b81fbbea6add4ba1b512784f837
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:21 2008 +0100
[S390] Remove initial kernel stack backchain initialization.
Early init code clears the backchain of the initial kernel stack frame.
This is not necessary since it is pre initialized with zeros. Plus it
was broken on 64 bit since it cleared only four of eight bytes.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 64253acbf189085fb0ceb9a3fbe43b40f4a0a932
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Thu Dec 25 13:39:20 2008 +0100
[S390] s390: use the new byteorder headers
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit e37f50e1811d68170e4d58a087cf634b2bf1cef9
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:19 2008 +0100
[S390] Add processor type march=z10 and a processor type safety check.
This patch adds the code generation option for IBM System z10 and
adds a check in head[31,64].S to prevents the execution of a kernel
compiled for a new processor type on an old machine.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b3b59d3339c907b1dec3ce19f62b2a7f120d142d
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:18 2008 +0100
[S390] sclp vt220: fix compile warning
get rid of this one:
CC drivers/s390/char/sclp_vt220.o
drivers/s390/char/sclp_vt220.c:588: warning: '__sclp_vt220_flush_buffer'
defined but not used
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2d6cd2a5908adecd06c8cee2a73814463ed71493
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:17 2008 +0100
[S390] remove warnings with functions ending in BUG
Functions which end in a BUG() statement and skip the return statement
cause compile warnings on s390, e.g.:
mm/bootmem.c: In function 'mark_bootmem':
mm/bootmem.c:321: warning: control reaches end of non-void function
To avoid the warning add an endless loop to the BUG() macro.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit edd5378740fe7717b1377ee04e593cfad8d29650
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:16 2008 +0100
[S390] mark disabled_wait as noreturn function
disabled_wait() won't return, so add an __attribute__((noreturn)).
This will remove a false positive finding which our internal code
checker reports.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d36f0c66389eb5e4dbd9b095eea252230ba3273e
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:15 2008 +0100
[S390] cio: use pim to check for multipath.
To check if multipath is available we count the bits set in lpm,
which could change over time (via configure [on|off] of a path).
The following patch uses the pim (which is persistent) for this
decision.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f444cc0e52523560a8dfc12f5374e5d5ecf5375b
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:14 2008 +0100
[S390] cio: commit all pmcw changes.
Sometimes we change the pmcw configuration but don't call msch
to transmit these changes to the channel subsystem.
The patch fixes this by calling cio_commit_config in such cases.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 13952ec12dfeea793ff83c2a96139ed57eb0b897
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:13 2008 +0100
[S390] cio: introduce cio_commit_config
To change the configuration of a subchannel we alter the modifiable
bits of the subchannel's schib field and issue a modify subchannel.
There can be the case that not all changes were applied -or worse-
quietly overwritten by the hardware. With the next store subchannel
we obtain the current state of the hardware but lose our target
configuration.
With this patch we introduce a subchannel_config structure which
contains the target subchannel configuration. Additionally the msch
wrapper cio_modify is replaced with cio_commit_config which
copies the desired changes to a temporary schib. msch is then
called with the temporary schib. This schib is only written back
to the subchannel if all changes were applied.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit cdb912a40df8b8507ab60b3d52f9980c0ba1f44d
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:12 2008 +0100
[S390] cio: introduce cio_update_schib
There is the chance that we get condition code 0 for a stsch but
the resulting schib is not vaild. In the current code there are
2 cases:
* we do a check for validity of the schib after stsch, but at this
time we have already stored the invaild schib in the subchannel
structure. This may lead to problems.
* we don't do a check for validity, which is not that good either.
The patch addresses both issues by introducing the stsch wrapper
cio_update_schib which performs stsch on a local schib. This schib
is only written back to the subchannel if it's valid.
side note: For some functions (chp_events) the return codes are
different now (-ENXIO vs -ENODEV) but this shouldn't do harm
since the caller doesn't check for _specific_ errors.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d6a30761d8116b8de8a5b5e79e68cce81d36414b
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:11 2008 +0100
[S390] cio: Use device_is_registered().
Check if a ccw device is registered via device_is_registered()
and not via the old kludge of checking the membership in driver
core internal klists.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 283fdd0b8ab102080dbffe4bcaae245f9ceda184
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:10 2008 +0100
[S390] cio: Dont call ->release directly.
Just put the cdev's reference count to give up our reference.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 90ed2b692fa75272d7395c4e4c2de4423d52f506
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:09 2008 +0100
[S390] cio: Dont fail probe for I/O subchannels.
If we fail the probe for an I/O subchannel, we won't be able
to unregister it again since there are no sch_event()
callbacks for unbound subchannels. Just succeed the probe in
any case and schedule unregistering the subchannel.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5fb6b8544d9ccd2ed478af777f9e99e342eb8886
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:08 2008 +0100
[S390] cio: Only register ccw_device for registered subchannel.
There is a race between io_subchannel_register() and
io_subchannel_sch_event() which may cause a subchannel to be
unregistered because it is no longer operational before
io_subchannel_register() had run. We need to check whether the
subchannel is still registered before the ccw device can be
registered and just bail out if it is not.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6eff208f479d6fe99fd92c0e6bf7e930bb45cd30
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:07 2008 +0100
[S390] cio: Fix I/O subchannel refcounting.
Subchannel refcounting was incorrect in some places, especially
a refcount was missing when ccw_device_call_sch_unregister()
was called and the refcount was not correctly switched after
moving devices.
Fix this by establishing the following rules:
- The ccw_device obtains a reference on its parent subchannel
when dev.parent is set and gives it up in its release
function. This is needed because we need a parent reference
for correct refcounting even before the ccw device is (if at
all) registered.
- When calling device_move(), obtain a reference on the new
subchannel before moving the ccw device and give up the
reference on the old parent after moving. This brings the
refcount in line with the first rule.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9cd67421977a701272820987ff9e6f197b1b97b7
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:06 2008 +0100
[S390] cio: Fix reference counting for online/offline.
The current code attempts to get an extra reference count
for online devices by doing a get_device() in ccw_device_online()
and a put_device() in ccw_device_done(). However, this
- incorrectly obtains an extra reference for disconnected
devices becoming available again (since they are already
online)
- needs special checks for css_init_done in order to handle
the console device
- is not obvious and
- may incorretly drop a reference count in ccw_device_done() if
that function is called after path verification for a device
that just became not operational.
So let's just get the reference in ccw_device_set_online() and
drop it in ccw_device_set_offline(). (Unfortunately, we still
need the special case in io_subchannel_probe().)
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 97166f52fc84c0bc49c7dbba2a26720110acb458
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:39:05 2008 +0100
[S390] cio: Put referernce on correct device after moving.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit c619d4223eaa063dd15ce44235b04487235f8cb7
Author: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Date: Thu Dec 25 13:39:04 2008 +0100
[S390] cio: fix ccwgroup online vs. ungroup race condition
Ensure atomicity of ungroup operation to prevent concurrent ungroup
and online processing which may lead to use-after-release situations.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 111e95a4cae01d6dadbbd1d8ab28dcd10fa5619c
Author: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:39:03 2008 +0100
[S390] cio: move irritating comment.
Due to former patches a comment and device id initialization were
split from the addressed function call in io_subchannel_probe.
Move it back to where it belongs.
Signed-off-by: Sebastian Ott <sebott@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit d7b604891b7ce7de93e3758ec6b3b7b7964e1884
Author: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Date: Thu Dec 25 13:39:02 2008 +0100
[S390] cio: update sac values
Values for the sac field have changed - update code accordingly.
Signed-off-by: Peter Oberparleiter <peter.oberparleiter@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 191fd44c11e10daf9d2cabd16935952e9c735949
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:39:01 2008 +0100
[S390] cio: get rid of compile warning
Move cio_tpi() to the rest of the CONFIG_CCW_CONSOLE functions to
get rid of this one:
drivers/s390/cio/cio.c:115: warning: 'cio_tpi' defined but not used
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 547e3cec4f7a4846707db19cba43aa58eb07f48f
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:39:00 2008 +0100
[S390] remove ptrace warning on 31 bit.
A kernel compile on 31 bit gives the following warnings in ptrace.c:
arch/s390/kernel/ptrace.c: In function 'peek_user':
arch/s390/kernel/ptrace.c:207: warning: unused variable 'dummy'
arch/s390/kernel/ptrace.c: In function 'poke_user':
arch/s390/kernel/ptrace.c:315: warning: unused variable 'dummy'
Getting rid of the dummy variables removes the warnings.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 32272a26974d2027384fd4010cd1780fca425d94
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:59 2008 +0100
[S390] __page_to_pfn warnings
For CONFIG_SPARSEMEM_VMEMMAP=y on s390 I get warnings like
init/main.c: In function 'start_kernel':
init/main.c:641: warning: format '%08lx' expects type 'long unsigned int',
but argument 2 has type 'int'
The warning can be suppressed with a cast to unsigned long in the
CONFIG_SPARSEMEM_VMEMMAP=y version of __page_to_pfn.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 91d5d45ee0a8978870fd12e5c3fe394a530ec2ed
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:58 2008 +0100
[S390] iucv: Locking free version of iucv_message_(receive|send)
Provide a locking free version of iucv_message_receive and iucv_message_send
that do not call local_bh_enable in a spin_lock_(bh|irqsave)() context.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
commit 44a01d5ba8a4d543694461cd3e178cfa6b3f221b
Author: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:57 2008 +0100
[S390] s390/hvc_console: z/VM IUCV hypervisor console support
This patch introduces a new hypervisor console (HVC) back-end that provides
terminal access over the z/VM inter-user communication vehicle (IUCV).
The z/VM IUCV communication is independent of the regular tcp/ip network
and allows access even if there is no network connection between two
z/VM guest virtual machines.
The z/VM IUCV hypervisor console back-end helps the user to access a
z/VM guest virtual machine that lacks of network connectivity; and thus,
provides a "full-screen" terminal alternative to 3215/3270 terminal
sessions.
Use the hvc_iucv=[0..8] kernel boot parameter to specify the number of
HVC terminals using a z/VM IUCV back-end.
A recent version of the s390-tools package is required to establish a
terminal connection to a z/VM IUCV hypervisor console back-end.
Signed-off-by: Hendrik Brueckner <brueckner@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5d360a75f87f288e9a25d56cca503a7c7939e490
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:56 2008 +0100
[S390] ftrace: function tracer backend for s390
This implements just the basic function tracer (_mcount) backend for s390.
The dynamic variant will come later.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 98df67b324a2a986987ce29986e44ae9156b6698
Author: Kay Sievers <kay.sievers@xxxxxxxx>
Date: Thu Dec 25 13:38:55 2008 +0100
[S390] struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
Signed-off-by: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0cd4bd4754d51bdc8f9cd880c29910d0d52337bb
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Thu Dec 25 13:38:54 2008 +0100
[S390] dasd: call cleanup_cqr with request_queue_lock
__dasd_cleanup_cqr should be called with request_queue_lock held and
__dasd_block_process_erp with queue_lock
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 50afd20f8c3ce23994a21c389e7250e54a93bf55
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Thu Dec 25 13:38:53 2008 +0100
[S390] dasd: correct sense byte condition for SIM
SIM sense data are always 32 bit sense data so sense byte 27 bit 0
has not to be set.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit faf16aa9b368d48a0efbd0920718d68ec7a72542
Author: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Date: Thu Dec 25 13:38:52 2008 +0100
[S390] dasd: Use accessors instead of using driver_data directly.
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 2bf373b3e3691d5cb57089a3897316a1b7d5ffa7
Author: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Date: Thu Dec 25 13:38:51 2008 +0100
[S390] dasd: improve dasd statistics proc interface
For a large number of I/O requests the values were shifted binary.
The shift was not transparent for the user because the shift value
was not displayed. To make this interface more human readable the
values are shifted decimal and the scale factor is displayed.
Signed-off-by: Stefan Haberland <stefan.haberland@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit bd43a42b7e9880f426ed715f18bb4f963b7352af
Author: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Date: Thu Dec 25 13:38:50 2008 +0100
[S390] zfcp: Report microcode level through service level interface
Register zfcp with the new /proc/service_level interface to report the
FCP microcode level. When the adapter goes offline or a channel path
disappears, zfcp unregisters, since the microcode version might change
and zfcp does not know about it.
Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 6bcac508fbebdca52f5a55d69a4316997ecb5391
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:49 2008 +0100
[S390] service level interface.
Add a new proc interface /proc/service_levels that allows any code
to report a relevant service level, e.g. the microcode level of
devices, the service level of the hypervisor, etc.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 7a0b4cbc7d7d99763511b488b08bbc2607ddd1e3
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:48 2008 +0100
[S390] qdio: fix error reporting for hipersockets
Hipersocket connections can encounter temporary busy conditions.
In case of the busy bit set we retry the SIGA operation immediatelly.
If the busy condition still persists after 100 ms we fail and report
the error to the upper layer. The second stage retry logic is removed.
In case of ongoing busy conditions the upper layer needs to reset the
connection.
The reporting of a SIGA error is now done synchronously to allow the
network driver to requeue the buffers. Also no error trace is created
for the temporary SIGA errors so the error message view is not flooded.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 50f769df1c4bea766c4eb927eae35728fb93e305
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:47 2008 +0100
[S390] qdio: improve inbound buffer acknowledgement
- Use automatic acknowledgement of incoming buffers in QEBSM mode
- Move ACK for non-QEBSM mode always to the newest buffer to prevent
a race with qdio_stop_polling
- Remove the polling spinlock, the upper layer drivers return new buffers
in the same code path and could not run in parallel
- Don't flood the error log in case of no-target-buffer-empty
- In handle_inbound we check if we would overwrite an ACK'ed buffer, if so
advance the pointer to the oldest ACK'ed buffer so we don't overwrite an
empty buffer in qdio_stop_polling
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 22f9934767f49012ffbae753b28b8055bd28348f
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:46 2008 +0100
[S390] qdio: rework debug feature logging
- make qdio_trace a per device view
- remove s390dbf exceptions
- remove CONFIG_QDIO_DEBUG, not needed anymore if we check for the level
before calling sprintf
- use snprintf for dbf entries
- add start markers to see if the dbf view wrapped
- add a global error view for all queues
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 9a1ce28aeb7a8b1666eaa9f104c1a2f5a149f9df
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:45 2008 +0100
[S390] qdio: fix compile warning under 31 bit
The QEBSM instructions are only available for CONFIG_64BIT, they are not
used under 31 bit. Make compiler happy about the false positive:
drivers/s390/cio/qdio_main.c: In function ?qdio_inbound_q_done?:
drivers/s390/cio/qdio_main.c:532: warning: ?state? may be used
uninitialized in this function
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 23589d057ac2da81e456d4a9dcdd9135fd96f493
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:44 2008 +0100
[S390] qdio: add eqbs/sqbs instruction counters
Add counters for the eqbs and sqbs instructions that indicate how often
we issued the instructions and how often the instructions returned with
less buffers than specified.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit bbd50e172f75b1d12ef9b1bcf593b51a44199016
Author: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:38:43 2008 +0100
[S390] qdio: fix qeth port count detection
qeth needs to get the port count information before
qdio has allocated a page for the chsc operation.
Extend qdio_get_ssqd_desc() to store the data in the
specified structure.
Signed-off-by: Jan Glauber <jang@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 43c207e6e5b7e591b59294ee4fc9860b0e3de3b8
Author: Christian Maaser <cmaaser@xxxxxxxxxx>
Date: Thu Dec 25 13:38:42 2008 +0100
[S390] ap: Minor code beautification.
Changed some symbol names for a better and clearer code.
Signed-off-by: Christian Maaser <cmaaser@xxxxxxxxxx>
Signed-off-by: Felix Beck <beckf@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit cb17a6364a29b4dfe5bbb00696032fb63d780157
Author: Felix Beck <felix.beck@xxxxxxxxxx>
Date: Thu Dec 25 13:38:41 2008 +0100
[S390] zcrypt: Use of Thin Interrupts
When the machine supports AP adapter interrupts polling will be
switched off at module initialization and the driver will work in
interrupt mode.
Signed-off-by: Felix Beck <felix.beck@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 320c04c068c62b71fe9ea55e06e4968b4edc9e48
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:40 2008 +0100
[S390] Move stfle to header file.
stfle will be needed by the ap_bus module to figure out wether the AP
queue adapter interruption facility is installed.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit ca9fc75a68ee98812bb6d212405fea039421910b
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:39 2008 +0100
[S390] convert s390 to generic IPI infrastructure
Since etr/stp don't need the old smp_call_function semantics anymore
we can convert s390 to the generic IPI infrastructure.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 0b3016b781abeabc502042c942cbc611e31250c7
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:38 2008 +0100
[S390] serialize stp/etr work
The work function dispatched with schedule_work() can be run twice
on different cpus because run_workqueue clears the WORK_STRUCT_PENDING
bit and then executes the function. Another cpu can call schedule_work()
again and run the work function a second time before the first call
is completed. This patch serialized the etr and stp work function with
a mutex.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 750887dedc088d28198b170bcae83695247797d1
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:38:37 2008 +0100
[S390] convert etr/stp to stop_machine interface
This converts the etr and stp code to the new stop_machine interface
which allows to synchronize all cpus without allocating any memory.
This way we get rid of the only reason why we haven't converted s390
to the generic IPI interface yet.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit b020632e40c3ed5e8c0c066d022672907e8401cf
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:36 2008 +0100
[S390] introduce vdso on s390
Add a vdso to speed up gettimeofday and clock_getres/clock_gettime for
CLOCK_REALTIME/CLOCK_MONOTONIC.
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit fc5243d98ac2575ad14a974b3c097e9ba874c03d
Author: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Date: Thu Dec 25 13:38:35 2008 +0100
[S390] arch_setup_additional_pages arguments
arch_setup_additional_pages currently gets two arguments, the binary
format descripton and an indication if the process uses an executable
stack or not. The second argument is not used by anybody, it could
be removed without replacement.
What actually does make sense is to pass an indication if the process
uses the elf interpreter or not. The glibc code will not use anything
from the vdso if the process does not use the dynamic linker, so for
statically linked binaries the architecture backend can choose not
to map the vdso.
Acked-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit a114a9d69d1362546b9dda651028acb311ddb7af
Author: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Date: Thu Dec 25 13:38:34 2008 +0100
[S390] vmcp: remove BKL
The vmcp driver uses the session->mutex for concurrent access of the data
structures. Therefore, the BKL in vmcp_open does not protect against any
other function in the driver.
The BLK in vmcp_open would protect concurrent access to the module init
but all necessary steps ave finished before misc_register is called.
We can safely remove the lock_kernel from vcmp.
Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit f414f5f15376764d68a31dc568d9e814d3fcb58a
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:37:59 2008 +0100
[S390] cpu topology: dont destroy cpu sets on topology change
Call rebuild_sched_domains instead of arch_reinit_sched_domains if
cpu topology changes. This leaves cpu sets alone which otherwise would
be destroyed.
If and how it makes sense to define cpu sets on a virtualized
architecture is another question.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 8f2961c39eacd5d450048d8a3e91675486f3a015
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 13:37:58 2008 +0100
[S390] audit: get s390 ret_from_fork in sync with other architectures
On s390 we have ret_from_fork jump not to the "do all work we
normally do on return from syscall" as on x86, ppc, etc., but to the
"do all such work except audit". Historical reasons - the codepath
triggered when we have AUDIT process flag set is separated from the
normall one and they converge at sysc_return, which is the common
part of post-syscall work. And does not include calling
audit_syscall_exit() -
that's done in the end of sysc_tracesys path, just before that path jumps
to sysc_return.
IOW, the child returning from fork()/clone()/vfork() doesn't
call audit_syscall_exit() at all, so no matter what we do with its
audit context, we are not going to see the audit entry.
The fix is simple: have ret_from_fork go to the point just past
the call of sys_.... in the 'we have AUDIT flag set' path. There we
have (64bit variant; for 31bit the situation is the same):
sysc_tracenogo:
tm __TI_flags+7(%r9),(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT)
jz sysc_return
la %r2,SP_PTREGS(%r15) # load pt_regs
larl %r14,sysc_return # return point is sysc_return
jg do_syscall_trace_exit
which is precisely what we need - check the flag, bugger off to sysc_return
if not set, otherwise call do_syscall_trace_exit() and bugger off to
sysc_return. r9 has just been properly set by ret_from_fork itself,
so we are fine.
Tested on s390x, seems to work fine. WARNING: it's been about
16 years since my last contact with 3X0 assembler[1], so additional
review would be very welcome. I don't think I've managed to screw it
up, but...
[1] that *was* in another country and besides, the box is dead...
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5439050f9f1aa92381ab9beccbea6ddf0c687c2b
Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Date: Thu Dec 25 13:37:57 2008 +0100
[S390] cpu topology: fix cpu_core_map initialization
Common code doesn't call arch_update_cpu_topology() anymore on
cpu hotplug. But our architecture backend relied on that in order to
update the cpu_core_map. For machines without cpu topology support
this leads uninitialized cpu_core_maps for later on added cpus.
To solve this just initialize the maps with cpu_possible_map, since
that will be always valid for machines without topology support.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
commit 5250d329e38cdf7580faeb9c53c17d3588d7d19c
Merge: a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
468a15bb4cc61694495cc5ed7ffca29e87c79b69
67be403d897f818b1a5ecc201967b0ee6a0332f9
98db8df777438e16ad0f44a0fba05ebbdb73db8d
4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 13:11:00 2008 +0100
Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and
'tracing/ring-buffer'; commit 'v2.6.28' into tracing/core
commit 468a15bb4cc61694495cc5ed7ffca29e87c79b69
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Date: Tue Dec 16 08:07:03 2008 +0100
sched, trace: update trace_sched_wakeup()
Impact: extend the wakeup tracepoint with the info whether the wakeup was
real
Add the information needed to distinguish 'real' wakeups from 'false'
wakeups.
Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
Merge: 30cd324e9787ccc9a5ede59742d5409857550692
7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 12:48:18 2008 +0100
Merge branch 'x86/tsc' into tracing/core
Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:
Conflicts:
arch/x86/kernel/cpu/intel.c
commit 79a66b96c339626a3e4b226fefc0e45244cfe6ff
Merge: bed4f13065b520e564adffbfcd1c1a764a9c887e
c1c15b65ec30275575dac9322aae607075769fbc
1fcccb008be12ea823aaa392758e1e41fb82de9a
4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu Dec 25 11:50:41 2008 +0100
Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core
commit 1fcccb008be12ea823aaa392758e1e41fb82de9a
Author: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Date: Tue Dec 23 21:50:11 2008 +0530
x86: traps.c replace #if CONFIG_X86_32 with #ifdef CONFIG_X86_32
Impact: cleanup, avoid warning on X86_64
Fixes this warning on X86_64:
CC arch/x86/kernel/traps.o
arch/x86/kernel/traps.c:695:5: warning: "CONFIG_X86_32" is not defined
Signed-off-by: Jaswinder Singh <jaswinder@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 5ce442fe2c9423ec5451222aee6f9b2127bb8311
Merge: 60cda2b53a7826d273198f668cd124f0eeda0e4a
2af752936b311a846622668f8b0f1893d8eccade
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:34 2008 +0100
Merge branch 'topic/udev-id-rename' into to-push
commit 60cda2b53a7826d273198f668cd124f0eeda0e4a
Merge: 9649745c8670eacc671e9cff72c5c1e346e13036
3d1ee379bd576c0830050c2d313e77b9f98a8013
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:33 2008 +0100
Merge branch 'topic/sound-core-fix' into to-push
commit 9649745c8670eacc671e9cff72c5c1e346e13036
Merge: a9c3c7e04b9a744eafb2e87c770e7300bbffa375
5e03c54eeb016cf1b066e9e48d30116814ca2459
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:32 2008 +0100
Merge branch 'topic/snd-hrtimer' into to-push
commit a9c3c7e04b9a744eafb2e87c770e7300bbffa375
Merge: cc4910850f93a8bb1cbafad038fd40f6da68c783
ade9b2fb9bf8114f77eefc70b9042417e62acf72
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:31 2008 +0100
Merge branch 'topic/pcxhr-update' into to-push
commit cc4910850f93a8bb1cbafad038fd40f6da68c783
Merge: a8022697811c3f2271df5ec14fa6f518b731b46a
de04b102bfc9a13e96f0892305b394077ffb6514
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:30 2008 +0100
Merge branch 'topic/oxygen' into to-push
commit a8022697811c3f2271df5ec14fa6f518b731b46a
Merge: a65056205cdf7efb96fb2558e4f1ec6bae2582ed
cdc693643271b2e6a693cf8f6afb258cce01f058
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:29 2008 +0100
Merge branch 'topic/jack-mechanical' into to-push
commit a65056205cdf7efb96fb2558e4f1ec6bae2582ed
Merge: 313769d9edb1bbd59d2e94f5069950eecfe6fa44
7645c4bfbb36f357f03815f5729c46ce8d89f008
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:28 2008 +0100
Merge branch 'topic/hda' into to-push
commit 313769d9edb1bbd59d2e94f5069950eecfe6fa44
Merge: 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5
f144b7f6679d9833bd3b94b91e452592b6d0e502
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:28 2008 +0100
Merge branch 'topic/cs5535audio' into to-push
commit 8afabfa74bbe81ac496e66f7f0ed8943dff5fdb5
Merge: 86b3aa390b4b9925f16a21b98441fd7abdb9fff2
1f04128a3db7c0f0e8b5d25323eba70ac342f47f
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:27 2008 +0100
Merge branch 'topic/convert-tasklet' into to-push
commit 86b3aa390b4b9925f16a21b98441fd7abdb9fff2
Merge: e4456e71618ec2c98084c15824d93e997955b60c
ebef7cfc81942686a994ca6239b195040f5d1e4d
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:26 2008 +0100
Merge branch 'topic/ca0106' into to-push
commit e4456e71618ec2c98084c15824d93e997955b60c
Merge: 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57
16950e09cf07b54abb78dd09f8ef3c85c6bdc9de
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:26 2008 +0100
Merge branch 'topic/audigy-capture-boost' into to-push
commit 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57
Merge: facef8685b3ff95c01c33d9d836401d0dd26211d
472346da9cc4231bec03ff2032e0d5fd4037232c
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:25 2008 +0100
Merge branch 'topic/asoc' into to-push
commit facef8685b3ff95c01c33d9d836401d0dd26211d
Merge: 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
888dcb7cb26fb85dfe3486d28a2431d69d3e8148
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu Dec 25 11:40:24 2008 +0100
Merge branch 'topic/aoa' into to-push
commit 0ca59dd948a51c95d5a366d35f897bc5ef9df55d
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Date: Wed Dec 24 23:30:02 2008 +0100
tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3
Impact: fix a crash/hard-reboot on certain configs while enabling cpu
runtime
On some archs, the boot of a secondary cpu can have an early fragile state.
On x86-64, the pda is not initialized on the first stage of a cpu boot but
it is needed to get the cpu number and the current task pointer. This data
is needed during tracing. As they were dereferenced at this stage, we got a
crash while tracing a cpu being enabled at runtime.
Some other archs like ia64 can have such kind of issue too.
Changes on v2:
We dropped the previous solution of a per-arch called function to guess the
current state of a cpu. That could slow down the tracing.
This patch removes the -pg flag on arch/x86/kernel/cpu/common.c where
the low level cpu boot functions exist, on start_secondary() and a helper
function used at this stage.
Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 2a0d8366dde9c66d8f481bee56828b661e5c8bf1
Merge: 1f5175adeaa1d161f603ef351785a19814dfe900
139cdab0a2af6f5eaee47cc0144608e53b65279d
3d0890985ac4dff781b7feba19fedda547314749
bba7ebba3b17f4fe8c5907a32e16d9bd3fcf5192
7798dbf40ad9d295aa3a02eca700168e4327239a
e189062a8ca55b0a1843f0346c3fae1a47297c34
Author: Roland Dreier <rolandd@xxxxxxxxx>
Date: Wed Dec 24 20:35:42 2008 -0800
Merge branches 'cma', 'ehca', 'ipath', 'iser', 'mlx4' and 'nes' into
for-next
commit 7798dbf40ad9d295aa3a02eca700168e4327239a
Author: Jack Morgenstein <jackm@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 20:32:42 2008 -0800
IB/mlx4: Set ownership bit correctly when copying CQEs during CQ resize
When resizing a CQ, when copying over unpolled CQEs from the old CQE
buffer to the new buffer, the ownership bit must be set appropriately
for the new buffer, or the ownership bit in the new buffer gets
corrupted.
Signed-off-by: Jack Morgenstein <jackm@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit e189062a8ca55b0a1843f0346c3fae1a47297c34
Author: Faisal Latif <faisal.latif@xxxxxxxxx>
Date: Wed Dec 24 20:30:04 2008 -0800
RDMA/nes: Remove tx_free_list
There is no lock protecting tx_free_list thus causing a system crash
when skb_dequeue() is called and the list is empty. Since it did not give
any performance boost under heavy load, remove it to simplify the code.
Replace get_free_pkt() with dev_alloc_skb() to allocate MAX_CM_BUFFER skb
for connection establishment/teardown as well as MPA request/response.
Signed-off-by: Faisal Latif <faisal.latif@xxxxxxxxx>
Signed-off-by: Chien Tung <chien.tin.tung@xxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 81ea714bf148fce35e931edcbdfd3aedda20d1dc
Author: Sergio Luis <sergio@xxxxxxxxxxxxxx>
Date: Mon Dec 22 01:16:15 2008 -0300
smackfs: check for allocation failures in smk_set_access()
smackfs: check for allocation failures in smk_set_access()
While adding a new subject/object pair to smack_list, smk_set_access()
didn't check the return of kzalloc().
This patch changes smk_set_access() to return 0 or -ENOMEM, based on
kzalloc()'s return. It also updates its caller, smk_write_load(), to
check for smk_set_access()'s return, given it is no longer a void
return function.
Signed-off-by: Sergio Luis <sergio@xxxxxxxxxxxxxx>
To: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Cc: Ahmed S. Darwish <darwish.07@xxxxxxxxx>
Cc: LSM <linux-security-module@xxxxxxxxxxxxxxx>
Cc: LKLM <linux-kernel@xxxxxxxxxxxxxxx>
Acked-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
commit cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db
Merge: 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
74192246910ff4fb95309ba1a683215644beeb62
Author: James Morris <jmorris@xxxxxxxxx>
Date: Thu Dec 25 11:40:09 2008 +1100
Merge branch 'next' into for-linus
commit 0ee4a96902dd7858e65f378c86f428a0355bd841
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 25 11:05:13 2008 +1100
crypto: aes - Precompute tables
The tables used by the various AES algorithms are currently
computed at run-time. This has created an init ordering problem
because some AES algorithms may be registered before the tables
have been initialised.
This patch gets around this whole thing by precomputing the tables.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit ca38a814c6f86db0aa58884a31093d4f096e20aa
Author: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Date: Sat Dec 20 17:09:25 2008 +1100
crypto: talitos - Ack done interrupt in isr instead of tasklet
Previous commit for interrupt mitigation moved the done interrupt
acknowlegement from the isr to the talitos_done tasklet.
This patch moves the done interrupt acknowledgement back
into the isr so that done interrupts will always be acknowledged.
This covers the case for acknowledging interrupts for channel done
processing
that has actually already been completed by the tasklet prior to fielding
a pending interrupt.
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit bcf84a38f05c55180bc1225901950c7e715c0d55
Author: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Date: Thu Dec 18 17:17:46 2008 +1100
crypto: testmgr - Correct comment about deflate parameters
The comment for the deflate test vectors says the winbits parameter is 11,
while the deflate module actually uses -11 (a negative window bits parameter
enables the raw deflate format instead of the zlib format).
Correct this, to avoid confusion about the format used.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit f0d1ec3a227e01a27ce20719bf7b58de86d44f0f
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Wed Dec 17 16:53:49 2008 +1100
crypto: salsa20 - Remove private wrappers around various operations
ROTATE -> rol32
XOR was always used with the same destination, use ^=
PLUS/PLUSONE use ++ or +=
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit ad79cdd77fc1466e45cf923890f66bcfe7c43f12
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Wed Dec 17 16:51:13 2008 +1100
crypto: des3_ede - permit weak keys unless REQ_WEAK_KEY set
While its a slightly insane to bypass the key1 == key2 ||
key2 == key3 check in triple-des, since it reduces it to the
same strength as des, some folks do need to do this from time
to time for backwards compatibility with des.
My own case is FIPS CAVS test vectors. Many triple-des test
vectors use a single key, replicated 3x. In order to get the
expected results, des3_ede_setkey() needs to only reject weak
keys if the CRYPTO_TFM_REQ_WEAK_KEY flag is set.
Also sets a more appropriate RES flag when a weak key is found.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit bd9d20dba182ce4541b16b083eccd30fb252b9f4
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 17 16:49:02 2008 +1100
crypto: sha512 - Switch to shash
This patch changes sha512 and sha384 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit f9e2bca6c22d75a289a349f869701214d63b5060
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 17 16:47:52 2008 +1100
crypto: sha512 - Move message schedule W[80] to static percpu area
The message schedule W (u64[80]) is too big for the stack. In order
for this algorithm to be used with shash it is moved to a static
percpu area.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 19e2bf146759aea38fd6c2daea08cb7a6367149b
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Sun Dec 7 19:35:38 2008 +0800
crypto: michael_mic - Switch to shash
This patch changes michael_mic to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4946510baac6aaa8658528e3deefc7e9ba2951a9
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Sun Dec 7 19:34:37 2008 +0800
crypto: wp512 - Switch to shash
This patch changes wp512, wp384 and wp256 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit f63fbd3d501b4283e1551e195cb74434a838064f
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:58:32 2008 +0800
crypto: tgr192 - Switch to shash
This patch changes tgr192, tgr160 and tgr128 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 50e109b5b9c1f734e91a6e9b557bce48c9a88654
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:57:49 2008 +0800
crypto: sha256 - Switch to shash
This patch changes sha256 and sha224 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 14b75ba70da925a9f040a7575cb46ad7d394b117
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:57:12 2008 +0800
crypto: md5 - Switch to shash
This patch changes md5 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 808a1763cef93bf0f740d7e10dd9a2dfc4065b1a
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Wed Dec 3 19:55:27 2008 +0800
crypto: md4 - Switch to shash
This patch changes md4 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 54ccb36776eb7e03b592bfab60393c7800851a0b
Author: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Date: Tue Dec 2 21:08:20 2008 +0800
crypto: sha1 - Switch to shash
This patch changes sha1 to the new shash interface.
Signed-off-by: Adrian-Ken Rueegsegger <ken@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3b8efb4c4147094652570d7791a516d07b7df8c2
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 10:11:09 2008 +0800
crypto: rmd320 - Switch to shash
This patch changes rmd320 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d8a5e2e9f4e70ade136c67ce8242f0db4c2cddc7
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 09:58:10 2008 +0800
crypto: rmd256 - Switch to shash
This patch changes rmd256 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit e5835fba0206a331bdefdf5d805d1a384af37c44
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 09:18:51 2008 +0800
crypto: rmd160 - Switch to shash
This patch changes rmd160 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 7c4468bc011131e77d0a872d6d9942390f8217ea
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 09:10:40 2008 +0800
crypto: rmd128 - Switch to shash
This patch changes rmd128 to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d35d2454ce2175be77d2a366c2648597fd33a98f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 08:09:56 2008 +0800
crypto: null - Switch to shash
This patch changes digest_null to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3751f402e099893c34089ed303dca6f5f92dbfd1
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Nov 8 08:56:57 2008 +0800
crypto: hash - Make setkey optional
Since most cryptographic hash algorithms have no keys, this patch
makes the setkey function optional for ahash and shash.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit b812eb0076235743872b5c9d18714d2324cc668d
Author: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Date: Fri Nov 28 20:51:28 2008 +0800
crypto: testmgr - Validate output length in (de)compression tests
When self-testing (de)compression algorithms, make sure the actual size of
the (de)compressed output data matches the expected output size.
Otherwise, in case the actual output size would be smaller than the expected
output size, the subsequent buffer compare test would still succeed, and no
error would be reported.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit dad3df2044b78ba68a92bf78e38a408bab80ff61
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Fri Nov 28 20:49:19 2008 +0800
crypto: remove uses of __constant_{endian} helpers
Base versions handle constant folding just fine.
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 664134d2916109be76648977705a2bea3ff76427
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Nov 25 23:19:24 2008 +0800
crypto: testmgr - Fix error flow of test_comp
This warning:
crypto/testmgr.c: In function â??test_compâ??:
crypto/testmgr.c:829: warning: â??retâ?? may be used uninitialized in
this function
triggers because GCC correctly notices that in the ctcount == 0 &&
dtcount != 0 input condition case this function can return an undefined
value, if the second loop fails.
Remove the shadowed 'ret' variable from the second loop that was probably
unintended.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 5f459f0adc7581da01cdd9b7f84db14a4559a390
Author: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Date: Tue Nov 25 23:17:10 2008 +0800
crypto: hifn_795x - Use softirq kernel mapping in bh context
Use KM_SOFTIRQ instead of KM_IRQ in tasklet context.
Added bug_on on input no-page condition.
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d6a10c84a2a2b08bdd637852c9cc42c41e109b25
Author: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Date: Mon Nov 24 22:04:39 2008 +0800
crypto: hifn_795x - Fix queue management
Fix queue management. Change ring size and perform its check not
one after another descriptor, but using stored pointers to the last
checked descriptors.
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3ec858de6468e810953e41b8c154a0d605b25d68
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:03:37 2008 +0800
crypto: hifn_795x - Remove some unused cruft
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit ed4f92e3723a7d73bcd179ba09529094752063b2
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:02:55 2008 +0800
crypto: hifn_795x - Fix queue processing
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 5df4c0c671bbb425e4a77dde5f51869aeebebd67
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:01:42 2008 +0800
crypto: hifn_795x - Fix request context corruption
HIFN uses the transform context to store per-request data, which breaks
when more than one request is outstanding. Move per request members from
struct hifn_context to a new struct hifn_request_context and convert
the code to use this.
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3416158680d5ba6fdb939e5bb52a8eba1ad5c027
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 22:00:49 2008 +0800
crypto: hifn_795x - Don't copy src sg list
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 75741a034024f146ba5431602f3ad33a5df8363c
Author: Patrick McHardy <kaber@xxxxxxxxx>
Date: Mon Nov 24 21:59:25 2008 +0800
crypto: hifn_795x - Fix DMA setup
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 09fbf7c0f24176ef3b450c590f220ed8033dd2c3
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Mon Nov 24 21:20:13 2008 +0800
crypto: ansi_cprng - fix inverted DT increment routine
The ANSI X9.31 PRNG docs aren't particularly clear on how to increment DT,
but empirical testing shows we're incrementing from the wrong end. A 10,000
iteration Monte Carlo RNG test currently winds up not getting the expected
result.
From http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf :
# CAVS 4.3
# ANSI931 MCT
[X9.31]
[AES 128-Key]
COUNT = 0
Key = 9f5b51200bf334b5d82be8c37255c848
DT = 6376bbe52902ba3b67c925fa701f11ac
V = 572c8e76872647977e74fbddc49501d1
R = 48e9bd0d06ee18fbe45790d5c3fc9b73
Currently, we get 0dd08496c4f7178bfa70a2161a79459a after 10000 loops.
Inverting the DT increment routine results in us obtaining the expected
result
of 48e9bd0d06ee18fbe45790d5c3fc9b73. Verified on both x86_64 and ppc64.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 93027354d6e8a66a12dedb89d59b21cf7c2d35ed
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 13 22:05:13 2008 +0800
libcrc32c: Select CRYPTO in Kconfig
Selecting CRYPTO_CRC32C is not enough as CRYPTO which CRYPTO_CRC32C
depends on may be disabled. This patch adds the select on CRYPTO.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit aa1a85dbd1d3265ca36f684026fe7689b7836bed
Author: Jarod Wilson <jarod@xxxxxxxxxx>
Date: Thu Nov 13 22:03:20 2008 +0800
crypto: ansi_cprng - Avoid incorrect extra call to _get_more_prng_bytes
While working with some FIPS RNGVS test vectors yesterday, I discovered a
little bug in the way the ansi_cprng code works right now.
For example, the following test vector (complete with expected result)
from http://csrc.nist.gov/groups/STM/cavp/documents/rng/RNGVS.pdf ...
Key = f3b1666d13607242ed061cabb8d46202
DT = e6b3be782a23fa62d71d4afbb0e922fc
V = f0000000000000000000000000000000
R = 88dda456302423e5f69da57e7b95c73a
...when run through ansi_cprng, yields an incorrect R value
of e2afe0d794120103d6e86a2b503bdfaa.
If I load up ansi_cprng w/dbg=1 though, it was fairly obvious what was
going wrong:
----8<----
getting 16 random bytes for context ffff810033fb2b10
Calling _get_more_prng_bytes for context ffff810033fb2b10
Input DT: 00000000: e6 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Input I: 00000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Input V: 00000000: f0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
tmp stage 0: 00000000: e6 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
tmp stage 1: 00000000: f4 8e cb 25 94 3e 8c 31 d6 14 cd 8a 23 f1 3f 84
tmp stage 2: 00000000: 8c 53 6f 73 a4 1a af d4 20 89 68 f4 58 64 f8 be
Returning new block for context ffff810033fb2b10
Output DT: 00000000: e7 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Output I: 00000000: 04 8e cb 25 94 3e 8c 31 d6 14 cd 8a 23 f1 3f 84
Output V: 00000000: 48 89 3b 71 bc e4 00 b6 5e 21 ba 37 8a 0a d5 70
New Random Data: 00000000: 88 dd a4 56 30 24 23 e5 f6 9d a5 7e 7b 95 c7 3a
Calling _get_more_prng_bytes for context ffff810033fb2b10
Input DT: 00000000: e7 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Input I: 00000000: 04 8e cb 25 94 3e 8c 31 d6 14 cd 8a 23 f1 3f 84
Input V: 00000000: 48 89 3b 71 bc e4 00 b6 5e 21 ba 37 8a 0a d5 70
tmp stage 0: 00000000: e7 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
tmp stage 1: 00000000: 80 6b 3a 8c 23 ae 8f 53 be 71 4c 16 fc 13 b2 ea
tmp stage 2: 00000000: 2a 4d e1 2a 0b 58 8e e6 36 b8 9c 0a 26 22 b8 30
Returning new block for context ffff810033fb2b10
Output DT: 00000000: e8 b3 be 78 2a 23 fa 62 d7 1d 4a fb b0 e9 22 fc
Output I: 00000000: c8 e2 01 fd 9f 4a 8f e5 e0 50 f6 21 76 19 67 9a
Output V: 00000000: ba 98 e3 75 c0 1b 81 8d 03 d6 f8 e2 0c c6 54 4b
New Random Data: 00000000: e2 af e0 d7 94 12 01 03 d6 e8 6a 2b 50 3b df aa
returning 16 from get_prng_bytes in context ffff810033fb2b10
----8<----
The expected result is there, in the first "New Random Data", but we're
incorrectly making a second call to _get_more_prng_bytes, due to some checks
that are slightly off, which resulted in our original bytes never being
returned anywhere.
One approach to fixing this would be to alter some byte_count checks in
get_prng_bytes, but it would mean the last DEFAULT_BLK_SZ bytes would be
copied a byte at a time, rather than in a single memcpy, so a slightly more
involved, equally functional, and ultimately more efficient way of fixing
this
was suggested to me by Neil, which I'm submitting here. All of the RNGVS
ANSI
X9.31 AES128 VST test vectors I've passed through ansi_cprng are now
returning
the expected results with this change.
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Acked-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 31a61bfc6e415fbd871317cbee7b8a4158d8ac5b
Author: Julia Lawall <julia@xxxxxxx>
Date: Thu Nov 13 21:19:04 2008 +0800
crypto: md4 - Use ARRAY_SIZE
ARRAY_SIZE is more concise to use when the size of an array is divided by
the size of its type or the size of its first element.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@i@
@@
#include <linux/kernel.h>
@depends on i using "paren.iso"@
type T;
T[] E;
@@
- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 0426c166424ea6d3d0412f47879c8ba268f874c4
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Tue Nov 11 12:20:06 2008 +0800
libcrc32c: Add crc32c_le macro
The bnx2x driver actually uses the crc32c_le name so this patch
restores the crc32c_le symbol through a macro.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 53b146ae598268edbe2bf7ea7dfec721d51adddd
Author: Adrian-Ken Rueegsegger <rueegsegger@xxxxxxxxxxx>
Date: Tue Nov 11 12:14:00 2008 +0800
libcrc32c: Fix "crc32c undefined" compilation error
The latest shash changes leave crc32c undefined:
[...]
Building modules, stage 2.
MODPOST 1381 modules
ERROR: "crc32c" [net/sctp/sctp.ko] undefined!
ERROR: "crc32c" [net/ipv4/netfilter/nf_nat_proto_sctp.ko] undefined!
Adding EXPORT_SYMBOL(crc32c) to lib/libcrc32c.c fixes the compile error.
This patch has been compile-tested only.
Signed-off-by: Adrian-Ken Rueegsegger <rueegsegger@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 69c35efcf1576ab5f00cba83e8ca740923afb6c9
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 7 15:11:47 2008 +0800
libcrc32c: Move implementation to crypto crc32c
This patch swaps the role of libcrc32c and crc32c. Previously
the implementation was in libcrc32c and crc32c was a wrapper.
Now the code is in crc32c and libcrc32c just calls the crypto
layer.
The reason for the change is to tap into the algorithm selection
capability of the crypto API so that optimised implementations
such as the one utilising Intel's CRC32C instruction can be
used where available.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 8e3ee85e68c5d5c95451afd3e8f0997eec6f99e5
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Fri Nov 7 14:58:52 2008 +0800
crypto: crc32c - Test descriptor context format
This patch adds a test for the requirement that all crc32c algorithms
shall store the partial result in the first four bytes of the descriptor
context.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit b7e8bdadce6317eb13c13b9451d7114614aa1450
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 6 16:56:41 2008 +0800
crypto: crc32c-intel - Switch to shash
This patch changes crc32c-intel to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit faccc4bba160784e834b758f23d598e500ac7108
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Tue Sep 9 17:23:07 2008 +1000
crypto: crc32c - Switch to shash
This patch changes crc32c to the new shash interface.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 5f7082ed4f482f05db01d84dbf58190492ebf0ad
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 22:21:09 2008 +1000
crypto: hash - Export shash through hash
This patch allows shash algorithms to be used through the old hash
interface. This is a transitional measure so we can convert the
underlying algorithms to shash before converting the users across.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 67cd080c5070b4f17520c1385f7684206f4987b3
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Thu Nov 6 14:39:16 2008 +0800
crypto: api - Call type show function before legacy for proc
This patch makes /proc/crypto call the type-specific show function
if one is present before calling the legacy show functions for
cipher/digest/compress. This allows us to reuse the type values
for those legacy types. In particular, hash and digest will share
one type value while shash is phased in as the default hash type.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit dec8b78606ebd5f309c38f2fb10196ce996dd18d
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Nov 2 21:38:11 2008 +0800
crypto: hash - Add import/export interface
It is often useful to save the partial state of a hash function
so that it can be used as a base for two or more computations.
The most prominent example is HMAC where all hashes start from
a base determined by the key. Having an import/export interface
means that we only have to compute that base once rather than
for each message.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 3b2f6df08258e2875f42bd630eece7e7241a053b
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 18:52:18 2008 +1000
crypto: hash - Export shash through ahash
This patch allows shash algorithms to be used through the ahash
interface. This is required before we can convert digest algorithms
over to shash.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 7b5a080b3c46f0cac71c0d0262634c6517d4ee4f
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 15:47:27 2008 +1000
crypto: hash - Add shash interface
The shash interface replaces the current synchronous hash interface.
It improves over hash in two ways. Firstly shash is reentrant,
meaning that the same tfm may be used by two threads simultaneously
as all hashing state is stored in a local descriptor.
The other enhancement is that shash no longer takes scatter list
entries. This is because shash is specifically designed for
synchronous algorithms and as such scatter lists are unnecessary.
All existing hash users will be converted to shash once the
algorithms have been completely converted.
There is also a new finup function that combines update with final.
This will be extended to ahash once the algorithm conversion is
done.
This is also the first time that an algorithm type has their own
registration function. Existing algorithm types will be converted
to this way in due course.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 7b0bac64cd5b74d6f1147524c26216de13a501fd
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Sep 21 06:52:53 2008 +0900
crypto: api - Rebirth of crypto_alloc_tfm
This patch reintroduces a completely revamped crypto_alloc_tfm.
The biggest change is that we now take two crypto_type objects
when allocating a tfm, a frontend and a backend. In fact this
simply formalises what we've been doing behind the API's back.
For example, as it stands crypto_alloc_ahash may use an
actual ahash algorithm or a crypto_hash algorithm. Putting
this in the API allows us to do this much more cleanly.
The existing types will be converted across gradually.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4a7794860ba2b56693b1d89fd485fd08cdc763e3
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sat Sep 13 18:19:03 2008 -0700
crypto: api - Move type exit function into crypto_tfm
The type exit function needs to undo any allocations done by the type
init function. However, the type init function may differ depending
on the upper-level type of the transform (e.g., a crypto_blkcipher
instantiated as a crypto_ablkcipher).
So we need to move the exit function out of the lower-level
structure and into crypto_tfm itself.
As it stands this is a no-op since nobody uses exit functions at
all. However, all cases where a lower-level type is instantiated
as a different upper-level type (such as blkcipher as ablkcipher)
will be converted such that they allocate the underlying transform
and use that instead of casting (e.g., crypto_ablkcipher casted
into crypto_blkcipher). That will need to use a different exit
function depending on the upper-level type.
This patch also allows the type init/exit functions to call (or not)
cra_init/cra_exit instead of always calling them from the top level.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 2566578a6feb9d9e39da41326afe8ed6022db3c5
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Wed Nov 5 12:13:14 2008 +0800
crypto: ansi_cprng - Allow resetting of DT value
This is a patch that was sent to me by Jarod Wilson, marking off my
outstanding todo to allow the ansi cprng to set/reset the DT counter value
in a
cprng instance. Currently crytpo_rng_reset accepts a seed byte array which
is
interpreted by the ansi_cprng as a {V key} tuple. This patch extends that
tuple
to now be {V key DT}, with DT an optional value during reset. This patch
also
fixes a bug we noticed in which the offset of the key area of the seed is
started at DEFAULT_PRNG_KSZ rather than DEFAULT_BLK_SZ as it should be.
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Jarod Wilson <jarod@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 420a4b20c504e4674bf253601f793bdb254f99fa
Author: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Date: Sun Aug 31 15:58:45 2008 +1000
crypto: padlock - Avoid resetting cword on successive operations
Resetting the control word is quite expensive. Fortunately this
isn't an issue for the common operations such as CBC and ECB as
the whole operation is done through a single call. However, modes
such as LRW and XTS have to call padlock over and over again for
one operation which really hurts if each call resets the control
word.
This patch uses an idea by Sebastian Siewior to store the last
control word used on a CPU and only reset the control word if
that changes.
Note that any task switch automatically resets the control word
so we only need to be accurate with regard to the stored control
word when no task switches occur.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 1c06da81a5d042d5fba67c4c533b16ae62a174ab
Author: Kent Liu <kent.liu@xxxxxxxxx>
Date: Fri Oct 31 16:52:58 2008 +0800
crypto: crc32c-intel - Update copyright head
The original copyright head for crc32c-intel.c is incorrect. Please merge
the patch to update it.
Signed-Off-By: Kent Liu <kent.liu@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4b24ea971a93f5d0bec34bf7bfd0939f70cfaae6
Author: Vishnu Suresh <Vishnu@xxxxxxxxxxxxx>
Date: Mon Oct 20 21:06:18 2008 +0800
crypto: talitos - Preempt overflow interrupts off-by-one fix
In commit ec6644d6325b5a38525f1d5b20fd4bf7db05cf2a "crypto: talitos -
Preempt
overflow interrupts", the test in atomic_inc_not_zero was interpreted by the
author to be applied after the increment operation (not before). This
off-by-one
fix prevents overflow error interrupts from occurring when requests are
frequent
and large enough to do so.
Signed-off-by: Vishnu Suresh <Vishnu@xxxxxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 32bd78e0a5d34cd8e34046502bddcf31aeb38e64
Author: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Date: Sun Oct 12 20:40:12 2008 +0800
crypto: camellia - use kernel-provided bitops, unaligned access
Remove the private implementation of 32-bit rotation and unaligned
access with byteswapping.
As a bonus, fixes sparse warnings:
crypto/camellia.c:602:2: warning: cast to restricted __be32
crypto/camellia.c:603:2: warning: cast to restricted __be32
crypto/camellia.c:604:2: warning: cast to restricted __be32
crypto/camellia.c:605:2: warning: cast to restricted __be32
crypto/camellia.c:710:2: warning: cast to restricted __be32
crypto/camellia.c:711:2: warning: cast to restricted __be32
crypto/camellia.c:712:2: warning: cast to restricted __be32
crypto/camellia.c:713:2: warning: cast to restricted __be32
crypto/camellia.c:714:2: warning: cast to restricted __be32
crypto/camellia.c:715:2: warning: cast to restricted __be32
crypto/camellia.c:716:2: warning: cast to restricted __be32
crypto/camellia.c:717:2: warning: cast to restricted __be32
[Thanks to Tomoyuki Okazaki for spotting the typo]
Tested-by: Carlo E. Prelz <fluido@xxxxxxxxx>
Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit d12d6b6d37cad766b390467e770eb0ab81345d78
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:36:51 2008 +0800
crypto: testmgr - Trigger a panic when self test fails in FIPS mode
The FIPS specification requires that should self test for any supported
crypto algorithm fail during operation in fips mode, we need to prevent
the use of any crypto functionality until such time as the system can
be re-initialized. Seems like the best way to handle that would be
to panic the system if we were in fips mode and failed a self test.
This patch implements that functionality. I've built and run it
successfully.
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit fe5720e2b7c1e8ff95d4bf18329517cf64ad1d70
Author: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:33:14 2008 +0800
crypto: talitos - Perform auth check in h/w if on sec 2.1 and above
SEC version 2.1 and above adds the capability to do the IPSec ICV
memcmp in h/w. Results of the cmp are written back in the descriptor
header, along with the done status. A new callback is added that
checks these ICCR bits instead of performing the memcmp on the core,
and is enabled by h/w capability.
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
After testing on different parts, another condition was added
before using h/w auth check because different
SEC revisions require different handling.
The SEC 3.0 allows a more flexible link table where
the auth data can span separate link table entries.
The SEC 2.4/2.1 does not support this case.
So a test was added in the decrypt routine
for a fragmented case; the h/w auth check is disallowed for
revisions not having the extent in the link table;
in this case the hw auth check is done by software.
A portion of a previous change for SEC 3.0 link table handling
was removed since it became dead code with the hw auth check supported.
This seems to be the best compromise for using hw auth check
on supporting SEC revisions; it keeps the link table logic
simpler for the fragmented cases.
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 1c2e8811eea5f0c5da3213ea206c2864fa4614fd
Author: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:29:34 2008 +0800
crypto: talitos - Implement done interrupt mitigation
In talitos_interrupt, upon one done interrupt, mask further done interrupts,
and ack only any error interrupt.
In talitos_done, unmask done interrupts after completing processing.
In flush_channel, ack each done channel processed.
Keep done overflow interrupts masked because even though each pkt
is ack'ed, a few done overflows still occur.
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 40405f10b853ef404b395c6febca71b0de185490
Author: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Date: Sun Oct 12 20:19:35 2008 +0800
crypto: talitos - Pass correct interrupt status to error handler
Since we ack early, the re-read interrupt status in talitos_error
may be already updated with a new value. Pass the error ISR value
directly in order to report and handle the error based on the correct
error status.
Also remove unused error tasklet.
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxxxxxxxx>
Signed-off-by: Lee Nipper <lee.nipper@xxxxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit a44b56cc69a5b017f396ed1daeaef6a63e086656
Author: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Date: Sun Oct 12 20:14:15 2008 +0800
crypto: hifn - Disable driver when physical size exceeds 32 bits
On Tue, Sep 23, 2008 at 08:06:32PM +0200, Dimitri Puzin (max@xxxxxxxxxx)
wrote:
> With this patch applied it still doesn't work as expected. The overflow
> messages are gone however syslog shows
> [ 120.924266] hifn0: abort: c: 0, s: 1, d: 0, r: 0.
> when doing cryptsetup luksFormat as in original e-mail. At this point
> cryptsetup hangs and can't be killed with -SIGKILL. I've attached
> SysRq-t dump of this condition.
Yes, I was wrong with the patch: HIFN does not support 64-bit addresses
afaics.
Attached patch should not allow HIFN to be registered on 64-bit arch, so
crypto layer will fallback to the software algorithms.
Signed-off-by: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
commit 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 15:26:37 2008 -0800
Linux 2.6.28
Happy holidays..
commit 67be403d897f818b1a5ecc201967b0ee6a0332f9
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 24 21:08:37 2008 +0100
Revert "x86: disable X86_PTRACE_BTS"
This reverts commit 40f15ad8aadff5ebb621b17a6f303ad2cd3f847d.
The CONFIG_X86_PTRACE_BTS bugs have been fixed via:
c5dee61: x86, bts: memory accounting
bf53de9: x86, bts: add fork and exit handling
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit db8862eafe8a5d030a3b02e81b8bb47447c315e3
Merge: c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9
c20137fc5329eaf24093fc48c52608dc66be8e5c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 24 21:08:26 2008 +0100
Merge branch 'linus' into tracing/hw-branch-tracing
commit c20137fc5329eaf24093fc48c52608dc66be8e5c
Merge: 1806f826554efd206cebacc7f9f213c8e6493a5d
231ffc9c07021afcfb1afa229aa4935730e5163b
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 10:24:52 2008 -0800
Merge branch 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to
VIDIOC_INT_RESET command
V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button
commit 1806f826554efd206cebacc7f9f213c8e6493a5d
Merge: 2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f
40f15ad8aadff5ebb621b17a6f303ad2cd3f847d
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 10:24:14 2008 -0800
Merge branch 'x86-fixes-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: disable X86_PTRACE_BTS
commit 2523659ded0cb261a3e1fda82fe7e4ddb6e86b6f
Merge: 5289f46b9de04bde181d833d48df9671b69c4b08
574f3c4f5c55e99ea60f71fd98cc54931d4b2eae
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Wed Dec 24 10:23:21 2008 -0800
Merge branch 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Add missing terminators in patch_sigmatel.c
commit 1f5175adeaa1d161f603ef351785a19814dfe900
Author: Aleksey Senin <alekseys@xxxxxxxxxxxx>
Date: Wed Dec 24 10:16:45 2008 -0800
RDMA/cma: Add IPv6 support
Handle AF_INET6 cases where required, and use struct sockaddr_storage
wherever an IPv6 address might be stored.
Signed-off-by: Aleksey Senin <aleksey@alst60.(none)>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 38617c64bf9a10bf20e41d95b69bb81e8560fe9d
Author: Aleksey Senin <alekseys@xxxxxxxxxxxx>
Date: Wed Dec 24 10:16:37 2008 -0800
RDMA/addr: Add support for translating IPv6 addresses
Add support for translating AF_INET6 addresses to the IB address
translation service. This requires using struct sockaddr_storage
instead of struct sockaddr wherever an IPv6 address might be stored,
and adding cases to handle IPv6 in addition to IPv4 to the various
translation functions.
Signed-off-by: Aleksey Senin <aleksey@alst60.(none)>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 7645c4bfbb36f357f03815f5729c46ce8d89f008
Merge: 74b7ff48a93f44198ac03cc4e628d713f53d4668
574f3c4f5c55e99ea60f71fd98cc54931d4b2eae
Author: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed Dec 24 11:04:08 2008 +0100
Merge branch 'fix/hda' into topic/hda
commit 574f3c4f5c55e99ea60f71fd98cc54931d4b2eae
Author: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Date: Tue Dec 23 16:53:00 2008 -0200
ALSA: hda - Add missing terminators in patch_sigmatel.c
Signed-off-by: Herton Ronaldo Krzesinski <herton@xxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit 40f15ad8aadff5ebb621b17a6f303ad2cd3f847d
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Wed Dec 24 10:49:51 2008 +0100
x86: disable X86_PTRACE_BTS
there's a new ptrace arch level feature in .28:
config X86_PTRACE_BTS
bool "Branch Trace Store"
it has broken fork() handling: the old DS area gets copied over into
a new task without clearing it.
Fixes exist but they came too late:
c5dee61: x86, bts: memory accounting
bf53de9: x86, bts: add fork and exit handling
and are queued up for v2.6.29. This shows that the facility is still not
tested well enough to release into a stable kernel - disable it for now and
reactivate in .29. In .29 the hardware-branch-tracer will use the DS/BTS
facilities too - hopefully resulting in better code.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit c1c15b65ec30275575dac9322aae607075769fbc
Author: H. Peter Anvin <hpa@xxxxxxxxx>
Date: Tue Dec 23 10:10:40 2008 -0800
x86: PAT: fix address types in track_pfn_vma_new()
Impact: cleanup, fix warning
This warning:
arch/x86/mm/pat.c: In function track_pfn_vma_copy:
arch/x86/mm/pat.c:701: warning: passing argument 5 of follow_phys from
incompatible pointer type
Triggers because physical addresses are resource_size_t, not u64.
This really matters when calling an interface like follow_phys() which
takes a pointer to a physical address -- although on x86, being
littleendian, it would generally work anyway as long as the memory region
wasn't completely uninitialized.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 6332178d91ca1a9dbd99bd97cabbcf965d178e9f
Merge: 908a7a16b852ffd618a9127be8d62432182d81b4
739840d529eb7505d3cbfe9d468bf1440c9a8e27
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Tue Dec 23 17:56:23 2008 -0800
Merge branch 'master' of
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ppp_generic.c
commit 5289f46b9de04bde181d833d48df9671b69c4b08
Author: Kyle McMartin <kyle@xxxxxxxxxxxxx>
Date: Tue Dec 23 08:44:30 2008 -0500
parisc: disable UP-optimized flush_tlb_mm
flush_tlb_mm's "optimized" uniprocessor case of allocating a new
context for userspace is exposing a race where we can suddely return
to a syscall with the protection id and space id out of sync, trapping
on the next userspace access.
Debugged-by: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
Tested-by: Helge Deller <deller@xxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 8960223d5973b3eaf8cbc1984969bb6c7661e7b9
Merge: d519c8d9ccb7956e61a55ce3a0fd6a25f42cbb33
077ebed54fe66612f58b076628a72eca2be8df90
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Tue Dec 23 17:01:40 2008 -0800
Merge branch 'drm-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: fix correctness of irq_enabled check for radeon.
commit d519c8d9ccb7956e61a55ce3a0fd6a25f42cbb33
Author: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx>
Date: Tue Dec 23 13:57:16 2008 -0800
edac: fix edac core deadlock when removing a device
When deleting an edac device, we have to wait for its edac_dev.work to be
completed before deleting the whole edac_dev structure. Since we have no
idea which work in current edac_poller's workqueue is the work we are
conerned about, we wait for all work in the edac_poller's workqueue to be
proceseed. This is done via flush_cpu_workqueue() which inserts a
wq_barrier into the tail of the workqueue and then sleeping on the
completion of this wq_barrier. The edac_poller will wake up sleepers when
it is found.
EDAC core creates only one kernel worker thread, edac_poller, to run the
works of all current edac devices. They share the same callback function
of edac_device_workq_function(), which would grab the mutex of
device_ctls_mutex first before it checks the device. This is exactly
where edac_poller and rmmod would have a great chance to deadlock.
In below call trace of rmmod > ... >
edac_device_del_device >
edac_device_workq_teardown > flush_workqueue > flush_cpu_workqueue,
device_ctls_mutex would have already been grabbed by
edac_device_del_device(). So, on one hand rmmod would sleep on the
completion of a wq_barrier, holding device_ctls_mutex; on the other hand
edac_poller would be blocked on the same mutex when it's running any one
of works of existing edac evices(Note, this edac_dev.work is likely to be
totally irrelevant to the one that is being removed right now)and never
would have a chance to run the work of above wq_barrier to wake rmmod up.
edac_device_workq_teardown() should not be called within the critical
region of device_ctls_mutex. Just like is done in edac_pci_del_device()
and edac_mc_del_mc(), where edac_pci_workq_teardown() and
edac_mc_workq_teardown() are called after related mutex are released.
Moreover, an edac_dev.work should check first if it is being removed. If
this is the case, then it should bail out immediately. Since not all of
existing edac devices are to be removed, this "shutting flag" should be
contained to edac device being removed. The current edac_dev.op_state can
be used to serve this purpose.
The original deadlock problem and the solution have been witnessed and
tested on actual hardware. Without the solution, rmmod an edac driver
would result in below deadlock:
root@localhost:/root> rmmod mv64x60_edac
EDAC DEBUG: mv64x60_dma_err_remove()
EDAC DEBUG: edac_device_del_device()
EDAC DEBUG: find_edac_device_by_dev()
(hang for a moment)
INFO: task edac-poller:2030 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
edac-poller D 00000000 0 2030 2
Call Trace:
[df159dc0] [c0071e3c] free_hot_cold_page+0x17c/0x304 (unreliable)
[df159e80] [c000a024] __switch_to+0x6c/0xa0
[df159ea0] [c03587d8] schedule+0x2f4/0x4d8
[df159f00] [c03598a8] __mutex_lock_slowpath+0xa0/0x174
[df159f40] [e1030434] edac_device_workq_function+0x28/0xd8 [edac_core]
[df159f60] [c003beb4] run_workqueue+0x114/0x218
[df159f90] [c003c674] worker_thread+0x5c/0xc8
[df159fd0] [c004106c] kthread+0x5c/0xa0
[df159ff0] [c0013538] original_kernel_thread+0x44/0x60
INFO: task rmmod:2062 blocked for more than 120 seconds.
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
rmmod D 0ff2c9fc 0 2062 1839
Call Trace:
[df119c00] [c0437a74] 0xc0437a74 (unreliable)
[df119cc0] [c000a024] __switch_to+0x6c/0xa0
[df119ce0] [c03587d8] schedule+0x2f4/0x4d8
[df119d40] [c03591dc] schedule_timeout+0xb0/0xf4
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 20ca9b3f4c6dfa0af8dd5b18a64df17eb994b54d
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
Date: Tue Dec 23 13:57:14 2008 -0800
cgroups: avoid accessing uninitialized data in failure path
If cgroup_get_rootdir() failed, free_cg_links() will be called in the
failure path, but tmp_cg_links hasn't been initialized at that time.
I introduced this bug in the 2.6.27 merge window.
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
Acked-by: Serge Hallyn <serue@xxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit e368d3a836797ddf193b1ec18c97407a791d2451
Author: Sharyathi Nagesh <sharyath@xxxxxxxxxx>
Date: Tue Dec 23 13:57:12 2008 -0800
cgroups: suppress bogus warning messages
Remove spurious warning messages that are thrown onto the console during
cgroup operations.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Sharyathi Nagesh <sharyathi@xxxxxxxxxx>
Acked-by: Serge E. Hallyn <serge@xxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit f00a189257836e5237ace3265f6991ef66a16c86
Author: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Date: Tue Dec 23 13:57:12 2008 -0800
w1: fix slave selection on big-endian systems
During test of the w1-gpio driver i found that in "w1.c:679
w1_slave_found()" the device id is converted to little-endian with
"cpu_to_le64()", but its not converted back to cpu format in "w1_io.c:293
w1_reset_select_slave()".
Based on a patch created by Andreas Hummel.
[akpm@xxxxxxxxxxxxxxxxxxxx: remove unneeded cast]
Reported-by: Andreas Hummel <andi_hummel@xxxxxx>
Signed-off-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit cc6c2ca30074a0274c05dd3212c741a550f0d3c2
Author: Chris Elston <celston@xxxxxxxxxxx>
Date: Tue Dec 23 13:57:10 2008 -0800
rtc: rtc-isl1208: reject invalid dates
This patch for the rtc-isl1208 driver makes it reject invalid dates.
Signed-off-by: Chris Elston <celston@xxxxxxxxxxx>
[a.zummo@xxxxxxxxxxxx: added comment explaining the check]
Signed-off-by: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Hebert Valerio Riedel <hvr@xxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit 98db8df777438e16ad0f44a0fba05ebbdb73db8d
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 23 11:32:25 2008 -0500
ring-buffer: prevent false positive warning
Impact: eliminate false WARN_ON message
If an interrupt goes off after the setting of the local variable
tail_page and before incrementing the write index of that page,
the interrupt could push the commit forward to the next page.
Later a check is made to see if interrupts pushed the buffer around
the entire ring buffer by comparing the next page to the last commited
page. This can produce a false positive if the interrupt had pushed
the commit page forward as stated above.
Thanks to Jiaying Zhang for finding this race.
Reported-by: Jiaying Zhang <jiayingz@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit a8ccf1d6f60e3e6ae63122e02378cd4d40dd4aac
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
Date: Tue Dec 23 11:32:24 2008 -0500
ring-buffer: fix dangling commit race
Impact: fix stuck trace-buffers
If an interrupt comes in during the rb_set_commit_to_write and
pushes the tail page forward just at the right time, the commit
updates will miss the adding of the interrupt data. This will
cause the commit pointer to cease from moving forward.
Thanks to Jiaying Zhang for finding this race.
Reported-by: Jiaying Zhang <jiayingz@xxxxxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit bed4f13065b520e564adffbfcd1c1a764a9c887e
Merge: 3e5621edb3392b28efb260ac99b2d26fb8b44e73
bf8bd66d0580f296f257d371ee41a0a137b541c7
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:30:31 2008 +0100
Merge branch 'x86/irq' into x86/core
commit 3e5621edb3392b28efb260ac99b2d26fb8b44e73
Merge: be9a1d3c2e559b267983bcf8b003997b83befb49
181de82ee3ffda1175f89d50c991dae31b79280c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:30:27 2008 +0100
Merge branch 'x86/iommu' into x86/core
commit be9a1d3c2e559b267983bcf8b003997b83befb49
Merge: fa623d1b0222adbe8f822e53c08003b9679a410c
7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:30:20 2008 +0100
Merge branch 'x86/tsc' into x86/core
commit 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
Merge: 345077cd98ff5532b2d1158013c3fec7b1ae85ec
f4166c54bfe04f64603974058e44fbd7cfef0ccc
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:29:31 2008 +0100
Merge branch 'x86/ptrace' into x86/tsc
Conflicts:
arch/x86/kernel/cpu/intel.c
commit fa623d1b0222adbe8f822e53c08003b9679a410c
Merge: 3d44cc3e01ee1b40317f79ed54324e25c4f848df
1ccedb7cdba6886939dd8b4c8f965a826f696e56
34945ede31071ac7d72270cc6c1893323f392b3f
d4377974062122d6d9be0bbd8a910a0954714194
c415b3dce30dfb41234e118662e8720f47343a4f
beeb4195cbc80b7489631361b7ed38b7518af433
f269b07e862c395d6981ab2c05d6bc34b0249e90
4e42ebd57b2e727b28bf5f6068e95cd19b0e807b
e1286f2c686f5976e0424bb6195ece25e7a17607
878719e831d9e076961aa15d4049a57a6668c67a
fd28a5b58dddf5cb5df162ae5c8797a63171c31d
adf77bac052bb5bf0722b2ce2af9fefc5b2d2a71
8f2466f45f75e3cbe3aa2b69d33fd9d6e343b9cc
93093d099e5dd0c258fd530c12668e828c20df41
bb5574608a8375026510b4f983ffbb06ece33fe2
f34a10bd9f8cc95ebdc69a079db195636b2e22e0
b6fd6f26733e864fba2ea3eb1d716e23d2e66f3a
30604bb410b53efa9c93ee8f03d7aa7494094faa
5b9a0e14eb4bf40a7cb780af4723560e06753f2d
67bac792cd0c05b4b6e0393c32605b028b8dd533
7a9787e1eba95a166265e6a260cf30af04ef0a99
f4166c54bfe04f64603974058e44fbd7cfef0ccc
69b88afa8d114a43a3c0431722b79e31d9920692
8daa19051e1c7369c89ace7b18e74fe1f55dfa29
3e1e9002aa8b32bd4c95ac6c8fad376b7a8127fb
8403295e0fa460f6240e2d781e25dc29189f33c7
4db646b1af8fdcf01d690d29eeae44cd937edb0d
205516c12dbba003c26b42cfb41e598631300106
c8182f0016fb65a721c4fbe487909a2d56178135
ecbf29cdb3990c83d90d0c4187c89fb2ce423367
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:27:23 2008 +0100
Merge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeature',
'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/detect-hyper', 'x86/doc',
'x86/dumpstack', 'x86/early-printk', 'x86/fpu', 'x86/idle', 'x86/io',
'x86/memory-corruption-check', 'x86/microcode', 'x86/mm', 'x86/mtrr',
'x86/nmi-watchdog', 'x86/pat2', 'x86/pci-ioapic-boot-irq-quirks', 'x86/ptrace',
'x86/quirks', 'x86/reboot', 'x86/setup-memory', 'x86/signal',
'x86/sparse-fixes', 'x86/time', 'x86/uv' and 'x86/xen' into x86/core
commit bf8bd66d0580f296f257d371ee41a0a137b541c7
Merge: 8ae936690972dfcad73d0dde1095b9f32af5ee95
1ccedb7cdba6886939dd8b4c8f965a826f696e56
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:24:15 2008 +0100
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
commit 1ccedb7cdba6886939dd8b4c8f965a826f696e56
Merge: a98f8fd24fb24fcb9a359553e64dd6aac5cf4279
929096fe9ff1f4b3645cf3919527ab47e8d5e17c
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Tue Dec 23 16:23:23 2008 +0100
Merge commit 'v2.6.28-rc9' into x86/apic
commit 231ffc9c07021afcfb1afa229aa4935730e5163b
Author: Devin Heitmueller <dheitmueller@xxxxxxxxxxx>
Date: Tue Dec 16 23:09:35 2008 -0300
V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to
VIDIOC_INT_RESET command
Fix a NULL pointer dereference that would occur if the video decoder tied to
the em28xx supports the VIDIOC_INT_RESET call (for example: the cx25840
driver)
Signed-off-by: Devin Heitmueller <dheitmueller@xxxxxxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
commit 908a7a16b852ffd618a9127be8d62432182d81b4
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Mon Dec 22 20:43:12 2008 -0800
net: Remove unused netdev arg from some NAPI interfaces.
When the napi api was changed to separate its 1:1 binding to the net_device
struct, the netif_rx_[prep|schedule|complete] api failed to remove the now
vestigual net_device structure parameter. This patch cleans up that api by
properly removing it..
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f8f50b1bddd49eb171398cfc543c957884dc6e35
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:26 2008 +0000
powerpc/32: Wire up the trampoline code for kdump
Wire up the trampoline code for ppc32 to relay exceptions from the
vectors at address 0 to vectors at address 32MB, and modify Kconfig
to enable Kdump support for all classic powerpcs.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit ccdcef72c249c289898b164eada89a61855b9287
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:13 2008 +0000
powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
Add the ability for a classic ppc kernel to be loaded at an address
of 32MB. This done by fixing a few places that assume we are loaded
at address 0, and by changing several uses of KERNELBASE to use
PAGE_OFFSET, instead.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 01695a9687e5a8d78589605037cc7828a5b67ac9
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:10 2008 +0000
powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
While for debugging it is good to catch bogus users of ioremap, though
for kdump support it is more convenient to use __ioremap for
copy_oldmem_page() (exactly as we do for PPC64 currently).
Note that copy_oldmem_page() calls __ioremap with flags set to '0',
so it should be safe with the regard to the caches.
The other option is to use kmap_atomic_pfn()[1], but it will not work
for kernels compiled without HIGHMEM.
That is, on a board with 256MB RAM and crashkernel=64M@32M case, the
!HIGHMEM capturing kernel maps 0-96M range, which does not include all
the memory needed to capture the dump. And, obviously, accessing
anything upper than 96M will cause faults.
[1] http://ozlabs.org/pipermail/linuxppc-dev/2007-November/046747.html
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 6f29c3298b18216198631cbee01c349adecb225d
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:06 2008 +0000
powerpc/32: Setup OF properties for kdump
Refactor the setting of kdump OF properties, moving the common code
from machine_kexec_64.c to machine_kexec.c where it can be used on
both ppc64 and ppc32. This will be needed for kdump to work on ppc32
platforms.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 73753313884e8d063d9bf9d3e36325743ca006ba
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Wed Dec 17 10:09:01 2008 +0000
powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
This replaces the dummy crash_setup_regs function with full-fledged
crash_setup_regs implementation. On PPC32 we simply use the new
ppc_save_regs function to dump the registers.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 322b439455ea62e6480e300c77b258e872896381
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Wed Dec 17 10:08:55 2008 +0000
powerpc: Prepare xmon_save_regs for use with kdump
Today the arch/powerpc/xmon/setjmp.S file contains only the
xmon_save_regs function. We want to use it for kdump purposes, so
let's move the file into arch/powerpc/kernel/ and give the function a
more generic name (ppc_save_regs).
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 5be8554875bf3a1a42b7f04d5999b36e7c2fa88b
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 16 06:23:08 2008 +0000
powerpc: Remove default kexec/crash_kernel ops assignments
Default ops are implicit now.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 77733f8a33488307e7d4b9077d174647ecea92e1
Author: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Date: Tue Dec 16 06:23:05 2008 +0000
powerpc: Make default kexec/crash_kernel ops implicit
This removes the need for each platform to specify default kexec and
crash kernel ops, thus effectively adds a working kexec support for
most 6xx/7xx/7xxx-based boards.
Platforms that can't cope with default ops will explode in some weird
way (a hang or reboot is most likely), which means that the board's
kexec support should be fixed or blacklisted via dummy _prepare
callback returning -ENOSYS.
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2e8e4f5b80e101da588af650de0ff6b3c475d6b3
Author: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Date: Tue Dec 16 06:22:59 2008 +0000
powerpc: Setup OF properties for ppc32 kexec
Refactor the setting of kexec OF properties, moving the common code
from machine_kexec_64.c to machine_kexec.c where it can be used on
both ppc64 and ppc32. This is needed for kexec to work on ppc32
platforms.
Signed-off-by: Dale Farnsworth <dale@xxxxxxxxxxxxxx>
Signed-off-by: Anton Vorontsov <avorontsov@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit b906cfa397fdef8decbd36467b1f63c830a0bf2b
Author: Sebastien Dugue <sebastien.dugue@xxxxxxxx>
Date: Thu Nov 27 00:59:52 2008 +0000
powerpc/pseries: Fix cpu hotplug
Currently, pseries_cpu_die() calls msleep() while polling RTAS for
the status of the dying cpu.
However, if the cpu that is going down also happens to be the one
doing the tick then we're hosed as the tick_do_timer_cpu 'baton' is
only passed later on in tick_shutdown() when _cpu_down() does the
CPU_DEAD notification. Therefore jiffies won't be updated anymore.
This replaces that msleep() with a cpu_relax() to make sure we're not
going to schedule at that point.
With this patch my test box survives a 100k iterations hotplug stress
test on _all_ cpus, whereas without it, it quickly dies after ~50
iterations.
Signed-off-by: Sebastien Dugue <sebastien.dugue@xxxxxxxx>
Cc: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit fad7b9b51e21a97e9e2662f1b51869ed2d209097
Author: Paul Mackerras <paulus@xxxxxxxxx>
Date: Tue Dec 23 14:57:26 2008 +1100
powerpc: Fix KVM build on ppc440
Commit 2a4aca1144394653269720ffbb5a325a77abd5fa ("powerpc/mm: Split
low level tlb invalidate for nohash processors") changed a call to
_tlbia to _tlbil_all but didn't include the header that defines
_tlbil_all, leading to a build failure on 440 if KVM is enabled.
This fixes it.
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 889bd9b6dbcd426b8698c4a779dd7dbf247f57b8
Author: Oliver Neukum <oliver@xxxxxxxxxx>
Date: Thu Dec 18 03:57:35 2008 +0000
net: startup race in hso driver
The flag marking a device running must be set before the URBs for
recption are submitted or they may complete too early and fail to resubmit.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 05a8c1cbfe368df8c0d4eff710c370d2aa10245a
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Mon Dec 22 19:44:13 2008 -0800
pkt_sched: Remove smp_wmb() in qdisc_watchdog()
While implementing a TCQ_F_THROTTLED flag there was used an smp_wmb()
in qdisc_watchdog(), but since this flag is practically used only in
sch_netem(), and since it's not even clear what reordering is avoided
here (TCQ_F_THROTTLED vs. __QDISC_STATE_SCHED?) it seems the barrier
could be safely removed.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 4707470ae7441733822efcd680b0ef3971921c4d
Author: Florian Fainelli <florian@xxxxxxxxxxx>
Date: Mon Dec 22 19:40:38 2008 -0800
r6040: bump release number to 0.19
This patch bumps the release number of the driver.
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 3e7c469f07ff14cbf9a814739e1fc99a863e0943
Author: Joe Chou <Joe.Chou@xxxxxxxxxx>
Date: Mon Dec 22 19:40:02 2008 -0800
r6040: save and restore MIER correctly in the interrupt routine
This patch saves the MIER register contents before treating
interrupts, then restores them correcty at the end of the
interrupt routine.
Signed-off-by: Joe Chou <Joe.Chou@xxxxxxxxxx>
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 11e5e8f5d14a1229706576184d2cf4c4556ed94c
Author: Joe Chou <Joe.Chou@xxxxxxxxxx>
Date: Mon Dec 22 19:38:17 2008 -0800
r6040: fix wrong logic in mdio code
This patch fixes a reverse logic in the MDIO code.
Signed-off-by: Joe Chou <Joe.Chou@xxxxxxxxxx>
Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 5f2f6da76c429c42d54f73807f00b8fd761a7d68
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Mon Dec 22 19:35:28 2008 -0800
net: Fix oops in dev_ifsioc()
A command like this: "brctl addif br1 eth1" issued as a user gave me
an oops when bridge module wasn't loaded. It's caused by using a dev
pointer before checking for NULL.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit adf77bac052bb5bf0722b2ce2af9fefc5b2d2a71
Author: H. Peter Anvin <hpa@xxxxxxxxx>
Date: Mon Dec 22 17:56:05 2008 -0800
x86: prioritize the FPU traps for the error code
In the case of multiple FPU errors, prioritize the error codes,
instead of returning __SI_FAULT, which ends up pushing a 0 as the
error code to userspace, a POSIX violation.
For i386, we will simply return if there are no errors at all; for
x86-64 this is probably a "can't happen" (and the code should be
unified), but for this patch, return __SI_FAULT|SI_KERNEL if this ever
happens.
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
commit 077ebed54fe66612f58b076628a72eca2be8df90
Author: Dave Airlie <airlied@xxxxxxxxxx>
Date: Mon Dec 22 17:11:02 2008 +1000
drm/radeon: fix correctness of irq_enabled check for radeon.
This check was introduced with the logic the wrong way around.
Fixes regression: http://bugzilla.kernel.org/show_bug.cgi?id=12216
Tested-by: François Valenduc <francois.valenduc@xxxxxxxxxxxxx>
Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
commit c47a75a45fa3a9d98b61f7e31983ffab2c44404f
Merge: 0099f77e0a224cc461d0d2930ef0fdb32c61ba64
abe1dfab60e1839d115930286cb421f5a5b193f3
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 14:52:00 2008 -0800
Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: don't cond_resched() when irqs_disabled()
ACPI: fix 2.6.28 acpi.debug_level regression
commit 0099f77e0a224cc461d0d2930ef0fdb32c61ba64
Merge: 2e8569669805c2d2620527464c395279b74892fc
9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 14:40:48 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
commit 9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325
Author: Julia Lawall <julia@xxxxxxx>
Date: Mon Dec 22 23:05:06 2008 +0100
drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test
In each case, if the NULL test is necessary, then the dereference should be
moved below the NULL test.
The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@
- T i = E->fld;
+ T i;
... when != E
when != i
if (E == NULL) S
+ i = E->fld;
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Acked-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
commit def434c2319c5a336633cd73322e0f28a7091b01
Author: Benjamin Krill <ben@xxxxxxxxxxx>
Date: Thu Nov 27 16:15:44 2008 +0100
powerpc/cell: add QPACE as a separate Cell platform
Since the QPACE (Chromodynamics Parallel Computing on the
Cell Broadband Engine) platform doesn't use a iommu, doesn't
have PCI devices and a MPIC much lesser setup and
configurations are needed. So far all devices are detected
as OF device. A notifier function is used to set the dma_ops
for the of_platform bus. Further this patch splits the
PPC_CELL_NATIVE into PPC_CELL_COMMON which are parts that are
shared with the QPACE platform and the rest.
Signed-off-by: Benjamin Krill <ben@xxxxxxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
commit e68558ddcdbfa8cc2e7811bcada3bcbeef79fd4a
Author: Arnd Bergmann <arnd@xxxxxxxx>
Date: Mon Dec 22 22:08:26 2008 +0100
powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
CBE_THERM and OPROFILE_CELL both cannot be built without
SPU_FS disabled, so make the dependency explicit.
Reported-by: Milton Miller <miltonm@xxxxxxx>
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
commit 2e8569669805c2d2620527464c395279b74892fc
Merge: 7ef5f41c16fdddfc14e882a57200334614d8ffd6
ed2b03ed3cec2a4719d04ef208319f9de6a4258a
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 10:17:19 2008 -0800
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: MIPS64R2: Fix buggy __arch_swab64
MIPS: Fix preprocessor warnings flaged by GCC 4.4
commit 7ef5f41c16fdddfc14e882a57200334614d8ffd6
Merge: 3d44cc3e01ee1b40317f79ed54324e25c4f848df
739840d529eb7505d3cbfe9d468bf1440c9a8e27
Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Mon Dec 22 10:12:54 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ppp: fix segfaults introduced by netdev_priv changes
net: Fix module refcount leak in kernel_accept()
commit 472346da9cc4231bec03ff2032e0d5fd4037232c
Author: Roel Kluin <roel.kluin@xxxxxxxxx>
Date: Mon Dec 22 17:40:45 2008 +0100
ALSA: ASoC: fix a typo in omp-pcm.c
Fix a typo (& and &&)
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Signed-off-by: Liam Girdwood <lrg@xxxxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
commit c69134858722977a82f58cae88e7ffdb28e1e858
Author: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Date: Mon Dec 22 10:57:33 2008 +0200
ASoC: Fix DSP formats in SSM2602 audio codec
Thanks to Troy Kisky <troy.kisky@xxxxxxxxxxxxxxxxxxx> for noticing.
- DSP_A format has 1-bit data delay which corresponds to SSM6202 submode 2
- DSP_B has 0-bit data delay which corresponds to submode 1
- Currently driver sets them opposite so swap the submode setting
Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Cc: Cliff Cai <cliff.cai@xxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit bd25867a6cbe7a00ef7dbe8d9ddebc91b00b9b3f
Author: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Date: Mon Dec 22 10:21:36 2008 +0200
ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
- OMAP McBSP DAI driver claims to support DSP_A format which has 1-bit data
delay but configures link for 0-bit data delay which is in fact DSP_B
- Fix this by changing format from DSP_A to DSP_B
- Fix also TLV320AIC23 codec and OSK5912 machine drivers since the same
error is populated also there
Signed-off-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxx>
Acked-by: Arun KS <arunks@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
commit f5eda57f9bb17b6f09f7888dfc2c47db7aea45d4
Author: Roland Dreier <rolandd@xxxxxxxxx>
Date: Mon Dec 22 07:15:05 2008 -0800
mlx4_core: Delete incorrect comment
The comment about a "Conditional on hca_type" was cut-and-pasted from
the mthca driver, and doesn't apply to mlx4 (since only one type of HCA
is handled by mlx4). So just delete it.
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit b8dd786f9417e5885929bfe33a235c76a9c1c569
Author: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Date: Mon Dec 22 07:15:03 2008 -0800
mlx4_core: Add support for multiple completion event vectors
When using MSI-X mode, create a completion event queue for each CPU.
Report the number of completion EQs in a new struct mlx4_caps member,
num_comp_vectors, and extend the mlx4_cq_alloc() interface with a
vector parameter so that consumers can specify which completion EQ
should be used to report events for the CQ being created.
Signed-off-by: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 59de580af1c2fd671b0cb27c41ff958859ae5288
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 19:32:27 2008 +0900
sh: oprofile: Fix up the module build.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7d91fcfcb91dde7bc4586154942862c1724b3519
Author: Takanari Hayama <taki@xxxxxxxxxx>
Date: Mon Dec 22 11:05:03 2008 +0900
sh: add UIO support for JPU on SH7722.
Add JPU support on Migo-R via UIO. This make use of Magnus's
generic UIO platform driver. Chunk of contiguous memory to hold
intermediate image and compressed data during encode and decode.
Signed-off-by: Takanari Hayama <taki@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b0c50ad71746c4ad148f366135e3c87e32729108
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 03:40:10 2008 +0900
serial: sh-sci: Fix up port pinmux for SH7366.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6f5cd2bd59c3bbaf073a7a52fcdefded939bd306
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 03:26:26 2008 +0900
sh: mach-rsk: Use uImage generation by default for rsk7201/7203.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2ea40dec26da89702dface74365cd16cea9ded6c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 22 03:25:04 2008 +0900
sh: mach-sh03: Fix up pata_platform build breakage.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b5868e8cdeb35cd9ddc3a541f81f318b0f6772b3
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:50 2008 +0900
sh: enable deferred io LCDC on Migo-R
Enable LCDC deferred io on Migo-R using 1s delay.
As with other deferred io frame buffers user space code should
use fsync() on the frame buffer device to trigger an update.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8564557a03c12adb9c4b76ae1e86db4113a04d13
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:41 2008 +0900
video: sh_mobile_lcdcfb deferred io support
This patch adds sh_mobile_lcdcfb deferred io support for SYS panels.
The LCDC hardware block managed by the sh_mobile_lcdcfb driver supports
RGB or SYS panel configurations. SYS panels come with an external display
controller that is resposible for refreshing the actual LCD panel. RGB
panels are controlled directly by the LCDC and they need to be refreshed
by the LCDC hardware.
In the case of SYS panels we can save some power by configuring the LCDC
hardware block in one-shot mode. In this one-shot mode panel refresh is
managed by software. This works well together with deferred io since it
allows us to stop clocks for most of the time and only enable clocks when
we actually want to trigger an update. When there is no fbdev activity
the clocks are kept stopped which allows us to deep sleep.
The refresh rate in deferred io mode is set using platform data. The same
platform data can also be used to disable deferred io mode.
As with other deferred io frame buffers user space code should use fsync()
on the frame buffer device to trigger an update.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 37b4837959cb9aa60686ca0d85f73d819251abad
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:32 2008 +0900
video: deferred io with physically contiguous memory
Extend the deferred io code from only supporting vmalloc()ed frame
buffer memory to support both vmalloc()ed and physically contiguous
frame buffer memory.
The sh_mobile_lcdcfb hardware does not support scatter gather so
we need physically contiguous memory to back our frame buffer.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Acked-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6e1038a95bebb8a1ad6066c95aa9c3af6963c9ff
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:23 2008 +0900
video: deferred io cleanup
Make sure the mmap callback is set to NULL in the deferred io
cleanup function. This way we can enable and disable deferred
io on the fly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Acked-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 87884bd8ae42c875adbd62c84f47ed1cbb3e5090
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 15:34:09 2008 +0900
video: fix deferred io fsync()
If CONFIG_FB_DEFERRED_IO is set, but there are framebuffers
registered that does not make use of deferred io, then fsync()
on those framebuffers will result in a crash. Fix that.
This is needed for sh_mobile_lcdcfb since we always enable
deferred io at compile time but we may disable deferred io
for some types of hardware configurations.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Acked-by: Jaya Kumar <jayakumar.lkml@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0790555437df2b6070af8f021b8d2ef79e70e144
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Dec 19 12:02:16 2008 +0900
sh: add LCDC interrupt configuration to AP325 and Migo-R
Add LCDC interrupt resources for AP325 and Migo-R. The LCDC driver does
not require interrupts at this point, but changes such as one-shot SYS
mode using deferred io, and wait-for-vblank will both need this.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2540c111ead82cad605ec2b14a1905ad914cc124
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Wed Dec 17 17:29:49 2008 +0900
sh_mobile_lcdc: use FB_SYS helpers instead of FB_CFB
Since the sh_mobile_lcdc hardware has the framebuffer(s) in system RAM,
use FB_SYS instead of FB_CFB. Also hook in read and write helpers.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit da9fdc8b44c421f14a68988ae4d1fb414d5edbf0
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Wed Dec 17 17:18:45 2008 +0900
sh: split coherent pages
Split pages returned by dma_alloc_coherent() and make sure
we free them one by one.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 78fb40263f34c65ade1693664db1af168d479588
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 16:23:32 2008 +0900
sh: dma: Kill off ISA DMA wrapper.
There are no more users for this code, and it has been deprecated for
some time, so just kill it off.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5d2685d0b3edc51ecc92604d5b7f5ca9b29b90bb
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:56:06 2008 +0900
sh: Conditionalize the code dumper on CONFIG_DUMP_CODE.
We don't really want this enabled by default, but it is still quite
useful for debugging. So, make it conditional and leave it off by
default.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit fe58cac35f48a9598c2a1360c2204c73f7bca2d2
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:36:50 2008 +0900
sh: Kill off the unused SH_ALPHANUMERIC debug option.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 740a3e677b70181d5e2b1458a27891209e3bf635
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:33:43 2008 +0900
sh: Enable skipping of bss on debug platforms for sh32 also.
This enables the same functionality that sh64 has for sh32. When running
on simulated hardware or via remote memory via the debug interface,
memory is gauranteed to be zero on boot already, and skipping the zeroing
of BSS has measurable boot time benefits.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8a655053ca1593dd160dac2a4ee638fdec037d86
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 15:06:54 2008 +0900
doc: Update sh cpufreq documentation.
The sh cpufreq driver is no longer limited to just the SH-3 and SH-4,
update the documentation to reflect this fact accordingly.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0146d7875976795fe364b4a3da629975ebd37671
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 14:58:04 2008 +0900
sh: mrshpc_setup_windows() needs to be inline.
While no one should be including this file multiple times, flag it
inline anyways just in case.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1f6fd5c916c8416588f5797e7837b9e81b3251a5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 14:53:24 2008 +0900
serial: sh-sci: sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL.
sci_poll_put_char() happens to also be used by the serial console,
while sci_poll_get_char() is only used by CONFIG_CONSOLE_POLL. Add
another gnarly ifdef to shut up the compiler.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 073da9c0de401e8683b6bc76c008a7e0850045d5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 14:41:54 2008 +0900
sh: Kill off cf-enabler with extreme prejudice.
Now that the rest of the boards that were using cf-enabler "generically"
have switched to setting up their mappings on their own, only the mach-se
boards were left using it. All of the cf-enabler using mach-se boards
use a special initialization of the MRSHPC windows rather than going
through the special PTE as other SH-4 platforms do. This consolidates
the MRSHPC setup logic, hooks it up on the boards that care, and gets rid
of any and all remaining references to cf-enabler.
This has been long overdue, as cf-enabler has been the bane of
arch/sh/kernel for the last 7 years. Good riddance.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8c197c3afb4a9026973315cc6a3c189dd8434053
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 13:57:45 2008 +0900
sh: Add a simple edosk7705_defconfig for build testing.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 866ef8f48f2272ce8d84156c91964d730666ab33
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 13:57:15 2008 +0900
sh: mach-edosk7705: Fix up edosk7705 so it all builds again.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0ef0e6ca426d28561b752e5f576932659295b928
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 13:14:22 2008 +0900
sh: mach-microdev: Split out the fdc37c93xapm initialization code.
This makes the microdev code a bit more readable, and moves the
setup for the SuperIO out on its own.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 43eeb0fb9f4e2aaefc4ae9dc964308ce8f55998b
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:54:09 2008 +0900
sh: mach-sh03: Use __set_io_port_base(), kill off special ioport_map().
This also fixes up a long-standing bug for this platform where the PIO
base was set to a register offset, rather than the actual PIO offset
itself.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8db806ec80ce80605005d1d558add716152a1134
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:48:41 2008 +0900
sh: mach-sh03: Move off of cf_enabler to pata_platform, as per landisk.
This gets rid of the cf enabler use on mach-sh03 and switches to use
pata_platform with the proper address directly. cf_enabler is
subsequently disabled for mach-sh03.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 98a955da8525a4218c8186fba5a6b949f563bbea
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:42:20 2008 +0900
sh: board-shmin: Convert shmin to use __set_io_port_base().
Drop the special mv_ioport_map() implementation, as this can simply use
__set_io_port_base() directly.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2125a46083dc5a9aa321c243e322638a9338cd11
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:31:32 2008 +0900
sh: Kill off dead mv_init_pci() from machvec.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 43f8f9b95b65dc05368cd82268895b9508b17d50
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:20:15 2008 +0900
sh: Simplify kernel_thread_helper() for sh32.
This can use the same implementation as sh64, the generated assembly is
the same between the new and old version, so there is not much point in
leaving it open coded in inline assembly.
This is preparatory work for future consolidation of the _32/_64
variants.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7b80fb32b39a51ce3e1afa051f5a616eb8ecbed3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:19:30 2008 +0900
sh: Kill off mv_heartbeat() from the machvec.
Nothing is using this any more, so get rid of it before anyone gets the
bright idea to start using it again.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b94ea27570e4ae87942e2f2ae386d4007ef7ac58
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 12:17:20 2008 +0900
sh: Kill off the cayman and microdev special heartbeat code.
These can use the generic code instead.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ca0c14e447a399eb90a1c9a4357560c2a29ef499
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 11:47:59 2008 +0900
sh: Kill off sh_bios_in_gdb_mode().
With the reworked kgdb support, we always detach and reinitialize the
stub. This was mostly a feature for handoffs between sh-ipl+g and the
kgdb stub, but virtually no sh-ipl+g versions ever had this working
right in the first place.
Given that the sh-ipl+g stubs in general use today don't even support
the GDB stub, and we have already killed off the special casing in the
sh-sci serial driver, kill off this now unused symbol too.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a9df1ed92fc46cb7c9a9c6b74dbd8bbdc41f69ce
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 11:39:33 2008 +0900
sh: export sh_bios_get_node_addr() symbol for stnic module.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8e32018b0428038b492dad5b19e80bf7d6dc002d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 17 11:37:51 2008 +0900
sh: Run sh_bios through a long overdue Lindent.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d5701647f1aaaea5da20023976d86af79ab84707
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 20:07:27 2008 +0900
serial: sh-sci: Generalize port pin initialization.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d830fa4584a4015989b9b396a80779f28f277baa
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 19:29:38 2008 +0900
serial: sh-sci: Tidy up fifo overrun error handling.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 762c69e3cad67a5cc5a01ba74e0b552ae4615258
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 18:55:26 2008 +0900
serial: sh-sci: pr_debug() -> dev_dbg() conversion.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 027e68724935599417faa7dd4123c117d18e2483
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 18:36:16 2008 +0900
serial: sh-sci: Fix up the cpufreq notifier to use the proper port clock.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d9341b51f28a5eb4ce231f4a3bbfa02aaecae626
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 09:36:25 2008 +0900
sh: oprofile: Convert op_model_sh7750 to new common interface.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 40a8b421b6a85f7786bf3007d316cd799efe8ea1
Author: Dave Peverley <dpeverley@xxxxxxxxxxxxxx>
Date: Tue Dec 16 09:35:40 2008 +0900
sh: oprofile: Backtrace support.
This patch improves the oprofile support on sh and adds backtrace
support.
Signed-off-by: Dave Peverley <dpeverley@xxxxxxxxxxxxxx>
Signed-off-by: Chris Smith <chris.smith@xxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 60a51fbe5dd2baef0f35bcf79f25ac1ee239a660
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Dec 16 09:33:53 2008 +0900
sh: oprofile: Refactor common setup code for multiple driver support.
This re-implements the old op_model_null code in to something more
generic, where multiple drivers, backtrace, etc. can all be interfaced.
Based largely on arch/mips/oprofile/common.c.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 70fe224743c11b57f9b63326313988fdcceb54df
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Tue Dec 16 09:13:05 2008 +0900
sh: Enable GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH machines
After the recent changes to switch SuperH board support over to irq_chip
it is now possible to set GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH
boards.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1a94757fae2ac2a9971694b55972f65a396a2f31
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:27 2008 +0000
sh: Convert Cayman boards from hw_interrupt_type to irq_chip
I've been unable to even compile-test this change because I don't have
an sh5 toolchain. All uses of hw_interrupt_type for SuperH boards have
now been converted to use irq_chip.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e85a47744bbdfbcc65c94b2af67499f861c6fa42
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:26 2008 +0000
sh: Convert Dreamcast support from hw_interrupt_type to irq_chip
Switch the dreamcast IRQ code over to the irq_chip way of doing things,
so that we can set GENERIC_HARDIRQS_NO__DO_IRQ for all SuperH boards.
Also, whilst I'm here change some things to make checkpatch.pl happy:
- Indent with tabs, not with spaces
- Include <linux/io.h>, not <asm/io.h>
- Fix the multi-line comment style
- Fix some typos in the comments
Tested-by: Adrian McMenamin <adrian@xxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit bd0a22d21f26864792a0e49c20f5bd25d6c335e4
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:25 2008 +0000
sh: Convert SystemH board support from hw_interrupt_type to irq_chip
... as part of the hw_interrupt_type to irq_chip crusade.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit be729fd8900f0026238539de46d867d232d1e913
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Sun Dec 14 12:02:24 2008 +0000
sh: Convert Microdev boards from hw_interrupt_type to irq_chip
This is part of the SH move to irq_chip.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 180ae2037f5bc33b0597ddbb76d36b08a74a238a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 12 16:53:14 2008 +0900
sh: Provide sdivsi3/udivsi3/udivdi3 for sh64, kill off libgcc linking.
This moves in the necessary libgcc bits and kills off the libgcc linking
for sh64 kernels as well.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 209aa4fdc39eacc145a7f9c32a4b9ffcc68912c6
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 12 16:35:40 2008 +0900
fb: SH-5 uses __raw I/O accessors now also, drop the special casing.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4466b20cfcfa718ff515b9e3886749cc025e2005
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Fri Dec 12 16:34:44 2008 +0900
sh: Add SH-5 optimized memcpy()/memset()/strcpy()/strlen().
Adopted from the uClibc optimized string versions.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 776d6c298aad42c2b8f191fa9ad826075e4d588c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 11 19:15:14 2008 +0900
sh: Kill off remaining CONFIG_SH_KGDB bits.
Now that we use the generic stub, kill off all of the left over
references.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 07d2a1a1cd8d609a4bc320a492670de57ec6bde1
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 11 19:06:43 2008 +0900
serial: sh-sci: Implement CONSOLE_POLL support and kill off old kgdb
console.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ab6e570ba33dbee18c2520d386e0f367a9b573c3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Dec 11 18:46:46 2008 +0900
sh: Generic kgdb stub support.
This migrates from the old bitrotted kgdb stub implementation and moves
to the generic stub. In the process support for SH-2/SH-2A is also added,
which the old stub never provided.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d7b01f78a3ae6a3cc21a16a1a3d377adc2227537
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 20:17:15 2008 +0900
sh: Enable HAVE_ARCH_TRACEHOOK for all SH, now that SH-5 supports it too.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit dd76279b47dce2c0bd7c54997938ec4cb9f16884
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 20:14:15 2008 +0900
sh: Provide linux/regset.h interface for SH-5.
Plugs in general and FPU regsets.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 94e2fb3d3e1f4cb6bad2b13c572c4c99ad734a37
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 19:46:18 2008 +0900
sh: Provide asm/syscall.h for SH-5.
This provides the asm/syscall.h implementation for sh64 parts.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6ac034375fe8b4341137657adf5e6ff0dcb5a99f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 19:26:44 2008 +0900
sh: Handle cases where setup{_rt,}_frame() fail on SH-5 signal delivery.
Presently these cases are not handled properly due to the return value
not being passed back. This needs to be correct to get proper behaviour
out of things like the tracehook signal notifier, amongst others.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f15b2dc02fef0c53aa5ffa3c4617e184f057d402
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 19:18:46 2008 +0900
sh: Fix up syscall_get_nr() comment in syscall_32.h.
Residual copy-and-paste damage, fix it up.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 35724a0aed6e62bdad640e8a1b8498329708226f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 18:17:19 2008 +0900
sh: Fix up the cpu_asid() return value on nommu.
This ought to be unsigned long, rather than defaulting to int.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a99d6fde69dd9c73ac0b4e42a77ed1ebc714e56a
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 18:06:36 2008 +0900
sh: Convert sh64 /proc/asids to debugfs and generic sh.
This converts the sh64 /proc/asids entry to debugfs and enables it for
all SH parts that have debugfs enabled.
On MMU systems this can be used to determine which processes are using
which ASIDs which in turn can be used for finer grained cache tag
analysis.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4d1f3bbec49a080cae753aaa44dc1fc7277b3e50
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 17:16:09 2008 +0900
sh: Kill off sh64's unused alloc/free_task_struct() definitions.
These were left over from some time ago, sh64 never got around to
defining __HAVE_ARCH_TASK_STRUCT_ALLOCATOR during the conversion, and it
has no need to. Kill these off and use the generic versions instead.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4eec8834f085e5eaf70e64849f879068256c07c5
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 17:09:36 2008 +0900
sh: mach-migor: Kill off unused Migo-R machvec.
This kills off the special Migo-R machvec, as nothing is using it. By
default this will switch to using the generic machvec, which provides the
same functionality. This saves us a bit of space in the machvec section.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4545bfa00a010b619a596b3893be820935c01bb7
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Wed Dec 10 17:02:13 2008 +0900
sh: add ov772x reset delay on Migo-R
Add reset delay for the ov772x device on Migo-R.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a6bc25abc89a72a8533dbb912a4116a8349b9d8c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Dec 10 13:42:14 2008 +0900
sh: Drop the special qemu defconfig.
QEMU can now use rts7751r2dplus_defconfig directly, there is no more need
for a neutered defconfig.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit bd40e8132336fbc3f2857f24720e11b6c1c9ac26
Author: Aoi Shinkai <shinkoi2005@xxxxxxxxx>
Date: Wed Dec 10 13:30:28 2008 +0900
sh: Delete unnecessary mov in the interrupt exception entry point.
The INTEVT read at interrupt exception entry is uneccessary, as the read
is deferred until we are ready to enter do_IRQ(). The kgdb nmi path still
requires it, so move it there.
Signed-off-by: Aoi Shinkai <shinkoi2005@xxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 06be3724548a443a99d703ff79f43d6f1e2975f0
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 17:01:40 2008 +0900
sh: Fix an off-by-1 check in __mutex_fastpath_unlock().
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a47925ffd1b1b22ee004de36e2c8b811910616ba
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 14:53:28 2008 +0900
sh: Update rsk701_defconfig to reflect mach-rsk changes.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ff15b9050677b9d63959cbca4c9abe36a05c72c9
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 14:46:55 2008 +0900
sh: Enable leds-gpio in rsk7203 defconfig.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ea0aac1e1327476d2f6a38f08145281237cf1b03
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 14:32:03 2008 +0900
sh: Consolidate rsk7203/7201 in to a new mach-rsk.
RSK+ platforms have quite a few characteristics in common, so roll them
together in to a shiny new RSK mach-type.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b5cfeac990cc164a3d3422aab88ac5b138fa822d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 12:02:28 2008 +0900
sh: Provide ftrace_make_call()/ftrace_make_nop().
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4bc3e7192cf9a47d9864c4e8259859be55a480b3
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 11:49:19 2008 +0900
sh: Disable -Werror for arch/sh/oprofile/.
drivers/oprofile/ objects have proven to be problematic in this regard,
so simply disable -Werror for now.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3b041227f7ef7c7e97f205c68c6069c0c62e5204
Author: Takashi YOSHII <yoshii.takashi@xxxxxxxxxxx>
Date: Mon Dec 8 11:33:06 2008 +0900
sh: Add plain udivsi3 (not _i4*) for gcc-4.1 and lower.
We chan't share code for udivsi3 and udivsi3_i4, because they
have a different clobber list. Copy udivsi3 from gcc-4.1.2.
As shown in arch/sh/lib/udivsi3.S (and -Os.S),
.global __udivsi3_i4i
.global __udivsi3_i4
.global __udivsi3
__udivsi3_i4i:
...
Three symbols are sharing one code, which is actually udivsi3_i4i.
But, this results unwanted code with gcc 4.1.
In gcc, these three are treated as pseudo instructions that have
their own clobber list apart from the usual calling convention.
According to sh's machine description. The clobber list is as
follows:
- udivsi3_i4i : t,r1,pr,mach,macl
- udivsi3_i4 : t,r0,r1,r4,r5,pr,dr0,dr2,dr4
- udivsi3 : t,r4,pr
The caller of udivsi3 will be left with a broken r1 and mac*.
gcc-4.1.x and older(at least to 3.4) generate udivsi3.
ST's gcc-4.1.1 seems to be OK because it has _i4i.
Signed-off-by: Takashi YOSHII <yoshii.takashi@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1fdae0e59a3fc9e391d2422ddcfbdbdec1e8f724
Author: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Date: Fri Dec 5 14:07:57 2008 +1100
Fix incorrect use of loose in c-checksum.c
Fix incorrect use of loose in c-checksum.c
It should be 'lose', not 'loose'.
Signed-off-by: Nick Andrew <nick@xxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 77ba93a7ac5fb0d9338bffbf97c787b8efe00806
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Mon Dec 8 11:25:50 2008 +0900
sh: Fix up the SH-4A mutex fastpath semantics.
This fixes up the __mutex_fastpath_xxx() routines to match the semantics
noted in the comment. Previously these were looping rather than doing a
single-pass, which is counter-intuitive, as the slow path takes care of
the looping for us in the event of contention.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c6f17cb2272121475c87592560534b157b17544e
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 22:45:20 2008 +0900
sh: allow CONFIG_CPU_IDLE
Allow users to select CONFIG_CPU_IDLE regardless of processor type or board.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit af998a9a0ae3291e86ddcae8e196a1cbf82c2457
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 22:45:12 2008 +0900
sh: allow CONFIG_PM
Allow users to select CONFIG_PM regardless of processor type or board.
Suspend and hibernation are only allowed on supported platforms.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 3e51762759db9e26c6c3e4e1010d80a50c62ca03
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 22:45:03 2008 +0900
sh: move the hp6xx pm code
Move the not-so-generic pm code from arch/sh/kernel/pm.c to the
platform directory together with the rest of the hp6xx pm code.
This is done to let non-hp6xx platforms enable CONFIG_PM.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 04645185d06e8b0c92f6f1f9d76ede45637afc09
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:39 2008 +0900
sh: update se7343 defconfig
Update the se7343 defconfig with:
- use 33MHz PCLK
- increase max number of SCIFs
- add serial console configuration to compiled-in kernel command line
- add 8250 serial port support
- add sh-mobile-i2c driver
- add uio driver to export VEU and VPU
- add usb support and isp1161 host controller
- add dm9601 ethernet-over-usb support
- remove smc91x support
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 21c601bb2ec79be5c52a99bc6f4b513aff4fa236
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:30 2008 +0900
sh: remove ioport cruft and smc91x from se7343
Remove out-of-date se7343 ioport code including some old support
for unknown-ne2000-pcmcia-card, cf-over-pcmcia and a mysterical
smc91x that once must have been on a special daughterboard.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5e5aacb0de70fa80e8b1a2b803ae9e2ad40b8e52
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:22 2008 +0900
sh: add isp1161 usb host device to se7343
Add isp1161 platform data to get usb host working on se7343.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6aacba72dbdadc1445244e366ecf0263a160409e
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:11 2008 +0900
sh: add st16c2550 devices to se7343
Add 8250 platform data to setup the ST16C2550C chip on se7343.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5727003b5d23eb852c057d25459bba27cbf754c3
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 18:00:02 2008 +0900
sh: fix number of interrupts on se7343
Fix to make sure that the on-board interrupt sources are included
in the interrupt count on se7343.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 551ea2b40ecf75e0035406fe75ba995233737e76
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Thu Dec 4 17:59:54 2008 +0900
sh: sh7343 scif configuration update
Fix interrupt values for the first sh7343 SCIF port and
update the configuration to include the remaining 3 ones.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0c0daec7ca4f6a67daeafc4343bb453a4a246dbd
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Mon Dec 1 15:40:33 2008 +0900
sh: propagate r_clk
Make sure the 32 KHz r_clk rate gets propagated correctly. Without
this fix the clocks for RTC, CMT, KEYSC and RWDT are stuck at 0 Hz.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6feb348783767e3f38d7612e6551ee8b580ac4e9
Author: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Date: Fri Nov 28 22:56:45 2008 +0900
sh: RSK+ 7201 board support.
This patch adds support for the RTE RSK+ 7201 board.
Signed-off-by: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 2825999e8a9bd7ab7e25a7e7475c7cdd10371a13
Author: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Date: Fri Nov 28 22:48:20 2008 +0900
sh: Add support for SH7201 CPU subtype.
This patch adds support for the SH-2A FPU based SH7201 processor subtype.
Signed-off-by: Peter Griffin <pgriffin@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 135210b378d26f9a9a0c901d0089522c06b5807a
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Fri Nov 28 08:58:30 2008 +0000
sh: Switch HD64461 from hw_interrupt_type to irq_chip
Use struct irq_chip for the interrupt handler for the HD64461. Also
convert some in{b,w} and out{b,w} calls to the equivalent __raw_* calls.
Include <linux/io.h> and not <asm/io.h> to stop checkpatch.pl
complaining.
This change should now allow machines with HD64461 to define
GENERIC_HARDIRQS_NO__DO_IRQ.
Acked-by: Kristoffer Ericson <Kristoffer.Ericson@xxxxxxxxx>
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 331ff103c7737294c8ecd7921564dae07b9e4632
Author: Yoshihiro Shimoda <shimoda.yoshihiro@xxxxxxxxxxx>
Date: Thu Nov 27 18:57:35 2008 +0900
sh: pci-sh7780: fix pci memory address mask
Fix the problem that cannot work a PCI device when system memory size is
256Mbyte in 29bit address mode.
Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 22f131aa8de7a534339bf7051680234462f2e877
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 27 11:04:43 2008 +0900
sh: Provide a dyn_arch_ftrace struct definition.
Needed for dynamic ftrace API changes.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1da1180c6e28cf21be356e2701978727558fa198
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:52:44 2008 +0900
sh: Split out the idle loop for reuse between _32/_64 variants.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit eb67cf14ae5c21609c200859d6f3eba71c591569
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:47:44 2008 +0900
sh: Consolidate cpu_relax()/cpu_sleep() definitions across _32/_64.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f74c034d52d0f908d5b929423a680962a2586199
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:22:50 2008 +0900
sh: do not latency trace idle.
Description snipped from Steven Rostedt's PPC patch:
When idle is called, interrupts are blocked, but the idle
function will still wake up on an interrupt. The problem is
that the interrupt disabled latency tracer will take this call
to idle as a latency.
This patch disables the latency tracing when going into idle.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 75fd24c1073adcd1e8ea43048d946bbfa34dfc64
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 15:20:35 2008 +0900
sh: Tidy up backtrace formatting with kallsyms disabled.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9cfc9a9b6fff9ea7a19814b4472b3cb18b7bbdcc
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 14:31:03 2008 +0900
sh: Add a simple code dumper for SUPERH32 show_regs().
This implements a simple show_code() that is in turn plugged in to
show_regs() to provide minimal code dumping at the end of the trace.
Built on top of a simple instruction disassembler derived from the
binutils opcode table.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit edfd6da0405520b147ab1473ad183a5b32be7082
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 13:06:04 2008 +0900
sh: Add a few more branch types to the branch emulator.
This plugs in some extra encodings for matching more bsr/bsrf/jsr
branches.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5dd614761f05f56b93c94541aa92e6449920516c
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 04:21:36 2008 +0900
sh: Re-add support for best fit ISA tuning if none is available.
This was removed in the libgcc integration, but there are still some
compilers that need this. We also relax the rules on the ISA tuning in
the cases where there are no matches for the CPU tuning and adopt the
-any default, which matches the intent of the isa-y target list. This
compensates for mismatches where binutils supports a wide array of
targets whilst the compiler is much more restricted.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 624c6a6750c502981d92de4579647fe2549451dd
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 03:44:07 2008 +0900
sh: More movmem alias symbol exports for older compilers.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 95b781c239f53b4c7ecaf2989404ec6379b2409b
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 26 00:29:58 2008 +0900
sh: Provide optimized unaligned loads on SH-4A.
This adds support for unaligned loads on SH-4A, using the SH-4A's
neutered movua.l instruction. As movua.l is r0-inspired, stores are
still handled through the packed struct.
Based on asm-generic/unaligned.h by Harvey Harrison.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 716777db7270255f1f7210fd87a7188b08c9a267
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Tue Nov 25 21:57:29 2008 +0900
sh: P4 ioremap pass-through
This patch adds a pass-through case when ioremapping P4 addresses.
Addresses passed to ioremap() should be physical addresses, so the
best option is usually to convert the virtual address to a physical
address before calling ioremap. This will give you a virtual address
in P2 which matches the physical address and this works well for
most internal hardware blocks on the SuperH architecture.
However, some hardware blocks must be accessed through P4. Converting
the P4 address to a physical and then back to a P2 does not work. One
example of this is the sh7722 TMU block, it must be accessed through P4.
Without this patch P4 addresses will be mapped using PTEs which
requires the page allocator to be up and running.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0c9122323acb0c3410dfbd219cb47f4c2e9305e3
Author: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Date: Tue Nov 25 21:37:14 2008 +0900
sh: Add SH-4A optimized fastpath mutex implementation.
Add fast mutex path implementation for the SH4A architecture
Signed-off-by: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 5c72f303a2b7862dbba79f4176ddc922a440b567
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Date: Fri Nov 21 14:35:29 2008 +0900
sh: sh7760fb: Add support SH7720/SH7721 of Renesas
SH7720 and 7721 has IP of Frame Buffer same as SH7760.
This driver can support these.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 679dc3c92ca7894c3df70ee3333ff9878e7d90b9
Author: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Date: Fri Nov 21 14:34:25 2008 +0900
sh: sh7760fb: Fix color pallette setting
The setting of the color palette was wrong, fixed it.
And removed fb_setcmap, and added fb_setcolreg function.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@xxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f617682e9cabd5616dc2fe53c67762790eeb14d3
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Sun Nov 23 15:00:31 2008 +0000
sh: add SH DMAC burst mode constant
The SH7709 datasheet defines bit 5 as set for burst mode, clear for
cycle-steal mode.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit c2c5883b3fce61388eb02ca328072400eb54769c
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Sun Nov 23 14:27:22 2008 +0000
sh: fix DMAOR register access on SH7709
sh7709 hardware manual says DMAOR is 16 bits long on this platform.
Tested and working with a modified smsc911x ethernet driver (sh-dma
support patch for this driver is coming soon).
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8085ac753164f45fd23603e7cad85a4c985cbf75
Author: Steve Glendinning <steve.glendinning@xxxxxxxx>
Date: Sun Nov 23 14:27:21 2008 +0000
sh: Add platform-specific constants for SH7709
I'm using these constants in support of an in-house development board,
and thought they may be useful to other users of SH7709.
Signed-off-by: Steve Glendinning <steve.glendinning@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 0d5bbe0bc2583c4dc06ea00adccf07c3acd1481d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 25 21:22:02 2008 +0900
sh: Provide optimized non-atomic bitops for SH-2A.
This ties in the new SH-2A 32-bit non-atomic bitops.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 8bcc5c1c332af97ba731f99fda780a47911e476f
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 20 15:28:47 2008 +0900
sh: Add -m4al tuning for SH4AL-DSP.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 9ef100287afa8e134de50258b8382cbc9d20f954
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 20 15:26:35 2008 +0900
sh: Add exports for __udivsi3/__sdivsi3 and the _i4 versions.
Needed by older compilers.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 16b529d1d78060254d5bc735390915ca5ccf13a1
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 20 15:25:22 2008 +0900
sh: Convert to generic bitops for IRQ-toggling implementation.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 709420dd4e75083ee7920e61c2d0bcc3db9b7405
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 17:35:45 2008 +0900
sh: Specify sane default image targets for the SH-2 platforms.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1aad54a99b6ce316c851ba99b2efe41998cfd37d
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 17:33:48 2008 +0900
sh: Migrate necessary libgcc bits in to arch/sh/lib for SUPERH32.
This moves in the necessary libgcc bits for SUPERH32 and drops the
libgcc linking for the regular targets. This in turn allows us to rip
out quite a few hacks both in sh_ksyms_32 and arch/sh/Makefile.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e9bf51e5ccc7703226c79888603e157066213700
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 14:22:39 2008 +0900
sh: __udivdi3 -> do_div() in softfloat lib.
Inhibit the generation of __udivdi3 for the softfloat lib, use do_div()
outright.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 00e825c6b99b39f12751ea45d38bb4d900de70f4
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 14:21:34 2008 +0900
sh: Fix clock framework compiler warnings.
CC arch/sh/kernel/cpu/clock.o
arch/sh/kernel/cpu/clock.c: In function 'clk_disable':
arch/sh/kernel/cpu/clock.c:156: warning: 'return' with a value, in
function returning void
Introduced by ("sh: enable and disable clocks recursively").
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d6435102d4ca3b5655c0105abe924abec17ffeb8
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Tue Nov 18 12:40:39 2008 +0900
usb: Fix up sh_mobile usbf clock framework warnings.
drivers/usb/gadget/m66592-udc.c: In function 'm66592_probe':
drivers/usb/gadget/m66592-udc.c:1672: warning: label 'clean_up2' defined
but not used
drivers/usb/host/r8a66597-hcd.c: In function 'r8a66597_probe':
drivers/usb/host/r8a66597-hcd.c:2401: warning: label 'clean_up2' defined
but not used
Added by commit 985fc7c81c7852f2e104c71cbe913ace683c9e6a ("sh: sh_mobile
usbf clock framework support").
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit e7c98dc76d5823444059205e0c7aca49743679f3
Author: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Date: Thu Nov 13 18:18:35 2008 +0900
serial: sh-sci: Codestyle cleanup patch.
Trivial coding style cleanups.
Signed-off-by: Michael Trimarchi <trimarchimichael@xxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit af505b1eab55445e832bebbe5686f5bd22f1b717
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Thu Nov 13 12:20:26 2008 +0900
media: sh_mobile_ceu_camera: Add HAVE_CLK dependency.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit fad57feba77d2e5b183e068cb6b90693e4567b40
Author: Matt Fleming <mjf@xxxxxxxxxx>
Date: Wed Nov 12 20:11:47 2008 +0900
sh: dynamic ftrace support.
First cut at dynamic ftrace support.
Signed-off-by: Matt Fleming <mjf@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ef6aff6884408db95ceb0f678f583536e0bd48f8
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:24:01 2008 +0900
sh: remove old sh_mobile mstpc clocks
Remove the old sh_mobile mstpcr clocks.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit b51339fff240ff179730f8963a758147fd60f3ec
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:23:26 2008 +0900
sh: sh_mobile lcdc clock framework support
Add clock framework support to the lcdc driver and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 765786e0aead7faf6c333176d22948c6f155fff1
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:22:38 2008 +0900
sh: sh_mobile usb clock framework support
Add clock framework support to the usb/r8a66597 driver and
adjust the cpu specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit af5be79a7f8d7067588dc2863d37f7cd22e5f2de
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:22:13 2008 +0900
sh: sh_mobile usbf clock framework support
Add clock framework support to the usbf/m66592 driver and
adjust the cpu specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a42b6dd69cb1c61c5f5a24061a227c22071786de
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:21:44 2008 +0900
sh: sh_mobile ceu clock framework support
Add clock framework support to the sh_mobile ceu and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 090d951b69f29a8d5777c63570d4cd61d7efeb22
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:21:23 2008 +0900
sh: sh_mobile keysc clock framework support
Add clock framework support to the sh_mobile keysc driver and
adjust the board specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit a5616bd0f19730a780c354110454ce37209f1ded
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:20:55 2008 +0900
sh: sh_mobile i2c clock framework support
Add clock framework support to the sh_mobile i2c driver and
adjust the processor specific code accordingly.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f2eb0109fb4268505b0737cfe661542eb6151907
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:20:23 2008 +0900
sh: sh_mobile mstpcr clocks for sh7366
Add sh7366 mstpcr bits and information about their parent clocks.
The datasheet is pretty clear about the clocks on this device.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 6e88d030a1491ec0f130dc4765d06b22f7db6610
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:19:38 2008 +0900
sh: sh_mobile mstpcr clocks for sh7343
Add sh7343 mstpcr bits and information about their parent clocks.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit f14c017d6b2e9e97b0d5f0b33f573797dde4d4f1
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:16:08 2008 +0900
sh: sh_mobile mstpcr clocks for sh7723
Add sh7723 mstpcr bits and information about their parent clocks.
The datasheet is pretty clear about the clocks on this device.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ecf399bdafb83b6c0091837dd2a0612470e9c8d2
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:15:48 2008 +0900
sh: sh_mobile mstpcr clocks for sh7722
Add sh7722 mstpcr bits and information about their parent clocks.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 7c7e02a28b4e7212dcdcc24bbd2b137790504a84
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:15:07 2008 +0900
sh: new sh_mobile mstpcr clocks base code
Add base code to handle new mstpcr clocks. Make sure clock rates propagate.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 1dc7b776d91ac9f016982e418e74cb14f63c5b02
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:14:28 2008 +0900
sh: use arch_flags for sh_mobile mstpcr clock bits
Use arch_flags to keep track of register and flag number.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d902d04f5410176bdec77bfefa032516326eb542
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:14:03 2008 +0900
sh: sh_mobile clock divider index fix
Use divider index value instead of divider value.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit d12cfac146d2b512496bf974b83ee1210032065f
Author: Magnus Damm <damm@xxxxxxxxxx>
Date: Fri Oct 31 20:13:32 2008 +0900
sh: enable and disable clocks recursively
Recurse and make sure parent clocks get enabled/disabled.
Signed-off-by: Magnus Damm <damm@xxxxxxxxxx>
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit 4a4a9be3ebdbf17957d29e3521f328a1145f9431
Author: Paul Mundt <lethal@xxxxxxxxxxxx>
Date: Wed Nov 12 13:17:38 2008 +0900
sh: Move arch_get_unmapped_area() in to arch/sh/mm/mmap.c.
Now that arch/sh/mm/mmap.c exists, move arch_get_unmapped_area() there.
Follows the ARM change.
Signed-off-by: Paul Mundt <lethal@xxxxxxxxxxxx>
commit ed2b03ed3cec2a4719d04ef208319f9de6a4258a
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 17 13:28:39 2008 -0800
MIPS: MIPS64R2: Fix buggy __arch_swab64
The way the code is written it was assuming dshd has the function of a
hypothetical dshw instruction ...
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 08d9d1c4d44ce43856da048cb0737ef769b61e9a
Author: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Date: Wed Dec 17 18:19:18 2008 -0800
MIPS: Fix preprocessor warnings flaged by GCC 4.4
Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
commit 826e08b0157c0ce8a80dfe3c0a6c5a1540dd0b1d
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Dec 22 07:37:41 2008 +0100
sched: fix warning in fs/proc/base.c
Stephen Rothwell reported this new (harmless) build warning on platforms
that
define u64 to long:
fs/proc/base.c: In function 'proc_pid_schedstat':
fs/proc/base.c:352: warning: format '%llu' expects type 'long long
unsigned int', but argument 3 has type 'u64'
asm-generic/int-l64.h platforms strike again: that file should be
eliminated.
Fix it by casting the parameters to long long.
Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit d3d317092b58a6df1d31a4ca90cdb9d2bd4ebffa
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:21:52 2008 -0800
tg3: Update version to 3.97
This patch updates the version number to 3.97.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit aa10f27d99410cff9145bf91b6efc884c7a4871c
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:21:18 2008 -0800
tg3: tg3.h cleanups
This patch cleans up the tg3 header file by removing the preprocessor
definitions for standard PCI configuration space registers. The driver
should be using the standard definitions when needed. The patch
continues by removing redundant PHY related definitions and reorganizes
some of the remaining entries.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 69fc405318967c7913e5b55cf3906250a26b49d0
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:19:57 2008 -0800
tg3: Remove unused cfgspc device members
This patch removes the pci_bist and pci_hdr_type members from the
device structure and removes the code that references them. They are
not really used.
The patch rounds out the changes by moving the pci_cmd member to plug
a structure hole that would have been created. On 32-bit systems, this
movement removes a subsequent structure hole later in the structure. On
64-bit systems though, the movement merely consolidates two holes into
one larger hole.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 027455adacdc142cc018e555ce391014fa227e70
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:19:30 2008 -0800
tg3: Cleanup IPV6 LSO
This patch attempts to make the relationship between IPV6 checksum
offload and IPV6 LSO more obvious. The patch also toggles a bit
needed for IPV6 LSO on 5785 and 57780 devices.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 2023276ebf074a01eb56f38ed4d04deef1deee67
Author: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Date: Sun Dec 21 20:18:56 2008 -0800
tg3: WOL fixes
The first hunk of this patch inverts a flag that was accidentally
toggled as part of commit 0a459aac9d151c2e36ec65723b9b845b24c5cbc3
("tg3: Allow WOL for phylib controlled Broadcom phys").
The second hunk of the patch removes the call to
device_may_wakeup() in the 5906 config detection path. At the
point of the call, the driver shouldn't be querying for WOL
capability. It should be detecting and setting it.
Signed-off-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>
Signed-off-by: Benjamin Li <benli@xxxxxxxxxxxx>
Signed-off-by: Michael Chan <mchan@xxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit 7f3ff4f63f76c2702da6041d2da5eb30fac407f6
Author: Jarek Poplawski <jarkao2@xxxxxxxxx>
Date: Sun Dec 21 20:14:48 2008 -0800
pkt_sched: Annotate uninitialized var in sfq_enqueue()
Some gcc versions warn that ret may be used uninitialized in
sfq_enqueue(). It's a false positive, so let's annotate this.
Signed-off-by: Jarek Poplawski <jarkao2@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit bfb8cc31b11ccaf7cd55fd9e0f4794f82527948f
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Dec 21 20:11:04 2008 -0800
ixgbe: fix the display of DCB control stats in ethtool
Priority flow contol statistics for Data Center Bridging (DCB) weren't
included in ethtool. This patch adds them.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit f4314e815e87b4ab1c9b1115dd5853cd20ca999c
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Dec 21 20:10:29 2008 -0800
net: add DCNA attribute to the BCN interface for DCB
Adds the Backward Congestion Notification Address (BCNA) attribute to the
Backward Congestion Notification (BCN) interface for Data Center Bridging
(DCB), which was missing. Receive the BCNA attribute in the ixgbe driver.
The BCNA attribute is for a switch to inform the endstation about the
physical
port identification in order to support BCN on aggregated links.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
commit 1486a61ebcd2711532f8163d30babc40e11e7b40
Author: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Date: Sun Dec 21 20:09:50 2008 -0800
net: fix DCB setstate to return success/failure
Data Center Bridging (DCB) had no way to know if setstate had failed in the
driver. This patch enables dcb netlink code to handle the status for the
DCB
setstate interface. Likewise it allows the driver to return a failed status
if MSI-X isn't enabled.
Signed-off-by: Don Skidmore <donald.c.skidmore@xxxxxxxxx>
Signed-off-by: Eric W Multanen <eric.w.multanen@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
commit c2da953a46b18b7515ad476c1c1686640a12e93a
Merge: c94cb314503a69492bf4455dce4f6d300cff0851
9cf7f247bd0cd21e475c71a4e018bb612ef02aab
Author: David S. Miller <davem@xxxxxxxxxxxxx>
Date: Sun Dec 21 19:57:10 2008 -0800
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
commit 59f8500efb05096484a55263109acab6a6df89d5
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Mon Dec 22 02:00:17 2008 +0100
Convert ixp4xx_eth driver to use net_device_ops.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 4cb56b685617732733d4d9dffbf8c5a81d4a0c71
Author: Julia Lawall <julia@xxxxxxx>
Date: Sun Dec 21 16:39:15 2008 +0100
drivers/net/wan: Remove redundant test
arg is checked not to be NULL a few lines before.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 93bc933524d05e3b391358e24b3666599f8ec026
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Wed Nov 26 23:06:57 2008 +0100
HDLC_PPP: Fix Configure-Ack to return original options as required by the
standard.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit e6da96ace859dad966fe85cc9552b89f48bbc930
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Mon Dec 22 00:26:38 2008 +0100
IXP4xx: move common debugging from network drivers to QMGR module.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 9251ce959cab704eb0e4910860b06b18e7083474
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sun Dec 21 23:52:36 2008 +0100
Update MAINTAINERS entries for IXP4xx and WAN network drivers.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit f5b89e41ce7a980aa2fd8ad105626b9ed4e8d347
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sun Dec 21 23:52:18 2008 +0100
WAN: Add IXP4xx HSS HDLC driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 490b77224fe66c77ab7cb48d6b77e62cb55591a0
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sun Dec 21 00:02:34 2008 +0100
IXP4xx: Add ethtool support to Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 4954936e25cb8ce99a96cac9dd9417d7b639867a
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sat Dec 20 18:57:23 2008 +0100
IXP4xx: Add PHYLIB MII ioctl to the Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 2098c18d6cf65358dd1620154bdedbc8c8d36f44
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sat Dec 20 01:53:08 2008 +0100
IXP4xx: Add PHYLIB support to Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit b4c7d3b07257528d3c0bfd07c5b38b48beb9b6d1
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Sat Dec 20 01:58:59 2008 +0100
IXP4xx: Make the Ethernet driver use built-in netdev stats.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 3c36a837a960ccbff05fa773a495c389fbd42f0e
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Wed Nov 26 22:59:18 2008 +0100
IXP4xx: Silence section mismatch warning in Ethernet driver.
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit ae2754a975694a3865788e303b741d0f616bc43a
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Fri May 9 02:14:09 2008 +0200
IXP4xx: clear IRQ stat in qmgr_disable_irq().
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit 3edcfb2937054fb546ecf3a8883675751db16c6f
Author: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
Date: Thu May 8 23:18:31 2008 +0200
IXP4xx: check for queue being empty in qmgr_release_queue().
Signed-off-by: Krzysztof HaÅ?asa <khc@xxxxxxxxx>
commit bba7ebba3b17f4fe8c5907a32e16d9bd3fcf5192
Author: David Disseldorp <ddiss@xxxxxxx>
Date: Sun Dec 21 13:56:50 2008 -0800
IB/iser: Avoid recv buffer exhaustion caused by unexpected PDUs
iSCSI/iSER targets may send PDUs without a prior request from the
initiator. RFC 5046 refers to these PDUs as "unexpected". NOP-In PDUs
with itt=RESERVED and Asynchronous Message PDUs occupy this category.
The amount of active "unexpected" PDU's an iSER target may have at any
time is governed by the MaxOutstandingUnexpectedPDUs key, which is not
yet supported.
Currently when an iSER target sends an "unexpected" PDU, the
initiators recv buffer consumed by the PDU is not replaced. If over
initial_post_recv_bufs_num "unexpected" PDUs are received then the
receive queue will run out of receive work requests entirely.
This patch ensures recv buffers consumed by "unexpected" PDUs are
replaced in the next iser_post_receive_control() call.
Signed-off-by: David Disseldorp <ddiss@xxxxxxx>
Signed-off-by: Ken Sandars <ksandars@xxxxxxx>
Acked-by: Or Gerlitz <ogerlitz@xxxxxxxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 139cdab0a2af6f5eaee47cc0144608e53b65279d
Author: Julia Lawall <julia@xxxxxxx>
Date: Sun Dec 21 13:29:13 2008 -0800
IB/ehca: Remove redundant test of vpage
vpage is checked not to be NULL just after it is initialized at the
beginning of each loop iteration.
A simplified version of the semantic patch that makes this change is
as follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x@p1 == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)
// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@
... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)
@fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@
(
- if ((x@p2 != NULL) || ...)
S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>
Signed-off-by: Julia Lawall <julia@xxxxxxx>
Signed-off-by: Roland Dreier <rolandd@xxxxxxxxx>
commit 418441d9ebe84b205cb23eb0ab214c1f991621fe
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:32 2008 -0700
powerpc/mpc5200: fix error paths in PSC UART probe function
- error cases for mapbase and irq were unbundled
- mapped irq now gets disposed on error
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit aec739e010f8163eac225f4e331ac7fbd59ac5c8
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:32 2008 -0700
powerpc/mpc5200: add rts/cts handling in PSC UART driver
Add RTS/CTS-support for the PSC of the MPC5200B. Tested with a Phytec
MPC5200B-IO.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit b65149880d0467287fa4c7b4f19953392323f4ac
Author: René Bürgel <r.buergel@xxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:31 2008 -0700
powerpc/mpc5200: Make PSC UART driver update serial errors counters
This patch adds the capability to the mpc52xx-uart to report framing
errors, parity errors, breaks and overruns to userspace. These values
may be requested in userspace by using the ioctl TIOCGICOUNT.
Signed-off-by: René Bürgel <r.buergel@xxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit e51f47a5c695b76905aadc2be47c7dc774f3e5af
Author: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:30 2008 -0700
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
As this driver polls for a complete MDIO transaction, there is no need
to enable interrupts for it. Furthermore, make both checks for
freeing MDIO-bus irqs consistent.
Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 6b61e69e7bc1cfe80ab54c6321f19061f9487ed3
Author: Tim Yamin <plasm@xxxxxxxxx>
Date: Sun Dec 21 02:54:29 2008 -0700
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
This patch adds MDMA/UDMA support using BestComm for DMA on the MPC5200
platform. Based heavily on previous work by Freescale (Bernard Kuhn,
John Rigby) and Domen Puncer.
With this patch, a SanDisk Extreme IV CF card gets read speeds of
approximately 26.70 MB/sec.
Signed-off-by: Tim Yamin <plasm@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit aaab5e83c2c25d94f7409bdc947a5cc383514e15
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:28 2008 -0700
powerpc/mpc5200: Disable bestcomm prefetching when ATA DMA enabled
When ATA DMA is enabled, bestcomm prefetching does not work. This
patch adds a function to disable bestcomm prefetch when the ATA
Bestcomm task is initialized.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit e4efe3c271c5498ffe7e167eaff01514be2b9a77
Author: Tim Yamin <plasm@xxxxxxxxx>
Date: Sun Dec 21 02:54:28 2008 -0700
powerpc/mpc5200: Bestcomm fixes to ATA support
1) ata.h has dst_pa in the wrong place (needs to match what the BestComm
task microcode in bcom_ata_task.c expects); fix it.
2) The BestComm ATA task priority was changed to maximum in bestcomm_priv.h;
this fixes a deadlock issue experienced with heavy DMA occurring on
both the ATA and Ethernet BestComm tasks, e.g. when downloading a large
file over a LAN to disk.
Signed-off-by: Tim Yamin <plasm@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 622882455aa718cfbd6785cc5fbc479f1d976095
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:27 2008 -0700
powerpc/mpc5200: Bugfix on handling variable sized buffer descriptors
The buffer descriptors for the ATA BestComm task are larger than the
current definition for bcom_bd. This causes problems because the
various bcom_... functions dereference the buffer descriptor pointer
by using the array operator which doesn't work when the buffer
descriptors are a different size.
This patch adds the bcom_get_bd() function which uses the value in
bcom_task.bd_size to calculate the offset into the BD table. This
patch also changes the definition of bcom_bd to specify a data size
of 0 instead of 1 so that it will never work if anyone attempts to
dereference the bd list as an array (as opposed to something that
might work even though it is wrong).
Finally, this patch moves the definition of bcom_bd up in the file
to eliminate a forward declaration.
Based on patch originally written by Tim Yamin.
Signed-off-by: Tim Yamin <plasm@xxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit dd952cbb3dae9ea2dc47cc902b796e1e2bf806f0
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:27 2008 -0700
powerpc/mpc5200: Make internal 5200 PIC the default interrupt controller
The MPC5200 internal interrupt controller setup function needs to set
the default interrupt controller when it is called. Without this
irq_create_of_mapping() cannot be called without first determining
the pointer to the irq controller (ie. call with controller = NULL).
Reported-by: Steven Cavanagh <scavanagh@xxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit bcb73f5611c1946db768a1c219d205b3bf90f4a5
Author: Grant Likely <grant.likely@xxxxxxxxxxxx>
Date: Sun Dec 21 02:54:26 2008 -0700
powerpc/mpc5200: Document and tidy irq driver
This patch adds documentation to the mpc5200 interrupt controller
driver and cleans up some minor coding conventions. It also moves the
contents of mpc52xx_pic.h into the driver proper (except for a small
common bit that is moved to the common mpc52xx.h) because the
information encoded there is not required by any other part of kernel
code. Finally for code readability sake, the L2_OFFSET shift value
is removed because the code using it resolves to a noop.
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit a14953597b771f793ce32529d7b8b04fdedca3ef
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Sun Dec 21 02:54:25 2008 -0700
powerpc: Fix missing 'blr' in _tlbia()
Rework to MMU code dropped a much missed 'blr' instruction.
Brown-Paper-Bag-Worn-By: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
commit 3ddeb912f41801fd1968c7880d031702a396e4d0
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Date: Sat Dec 20 17:15:14 2008 +0800
ftrace: enable format arguments checking
Impact: broaden gcc printf format checks for ftrace_printk()
format arguments checking for ftrace_printk() is __printf(1, 2),
not __printf(1, 0).
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
commit 49e6e3f1aec2d46f5865d3ada38fe9a5d660ef5d
Author: Scott Wood <scottwood@xxxxxxxxxxxxx>
Date: Fri Dec 19 10:13:09 2008 +0000
powerpc/bootwrapper: Use the child-bus #address-cells to decide which range
entry to use
The correct #address-cells was still used for the actual translation,
so the impact is only a possibility of choosing the wrong range entry
or failing to find any match. Most common cases were not affected.
Signed-off-by: Scott Wood <scottwood@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit e14d77490d3e1da833cff4fee52674c52684ce77
Author: Grant Erickson <gerickson@xxxxxxxxxxxxxx>
Date: Fri Dec 19 08:17:54 2008 +0000
powerpc: Const-qualify Device Node Argument to DCR Resource Extent API
Add const qualifier to device_node argument for
dcr_resource_{start,len} as of_get_property also const-qualifies this
argument.
Signed-off-by: Grant Erickson <gerickson@xxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 9dce3ce5c55c848f00429005a46fd6246cfabfbe
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:54 2008 +0000
powerpc/44x: 44x TLB doesn't need "Guarded" set for all pages
After discussing with chip designers, it appears that it's not
necessary to set G everywhere on 440 cores. The various core
errata related to prefetch should be sorted out by firmware by
disabling icache prefetching in CCR0. We add the workaround to
the kernel however just in case oooold firmwares don't do it.
This is valid for -all- 4xx core variants. Later ones hard wire
the absence of prefetch but it doesn't harm to clear the bits
in CCR0 (they should already be cleared anyway).
We still leave G=1 on the linear mapping for now, we need to
stop over-mapping RAM to be able to remove it.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 64b3d0e8122b422e879b23d42f9e0e8efbbf9744
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:51 2008 +0000
powerpc/mm: Rework usage of _PAGE_COHERENT/NO_CACHE/GUARDED
Currently, we never set _PAGE_COHERENT in the PTEs, we just OR it in
in the hash code based on some CPU feature bit. We also manipulate
_PAGE_NO_CACHE and _PAGE_GUARDED by hand in all sorts of places.
This changes the logic so that instead, the PTE now contains
_PAGE_COHERENT for all normal RAM pages thay have I = 0 on platforms
that need it. The hash code clears it if the feature bit is not set.
It also adds some clean accessors to setup various valid combinations
of access flags and change various bits of code to use them instead.
This should help having the PTE actually containing the bit
combinations that we really want.
I also removed _PAGE_GUARDED from _PAGE_BASE on 44x and instead
set it explicitely from the TLB miss. I will ultimately remove it
completely as it appears that it might not be needed after all
but in the meantime, having it in the TLB miss makes things a
lot easier.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 77520351805cc19ba37394ae33f862ef6d3c2a23
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:48 2008 +0000
powerpc/mm: Runtime allocation of mmu context maps for nohash CPUs
This makes the MMU context code used for CPUs with no hash table
(except 603) dynamically allocate the various maps used to track
the state of contexts.
Only the main free map and CPU 0 stale map are allocated at boot
time. Other CPU maps are allocated when those CPUs are brought up
and freed if they are unplugged.
This also moves the initialization of the MMU context management
slightly later during the boot process, which should be fine as
it's really only needed when userland if first started anyways.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 760ec0e02d8a13d0ed60d99f47879d4aa8ef1910
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:46 2008 +0000
powerpc/44x: No need to mask MSR:CE, ME or DE in _tlbil_va on 440
The handlers for Critical, Machine Check or Debug interrupts
will save and restore MMUCR nowadays, thus we only need to
disable normal interrupts when invalidating TLB entries.
Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Acked-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Acked-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
commit 2a4aca1144394653269720ffbb5a325a77abd5fa
Author: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Date: Thu Dec 18 19:13:42 2008 +0000
powerpc/mm: Split low level tlb invalidate for nohash processors
Currently, the various forms of low level TLB invalidations are all
implemented in misc_32.S for 32-bit processors, in a fairly scary
mess of #ifdef's and with interesting duplication such as a whole
bunch of code for FSL _tlbie and _tlbia which are no longer used.
This moves things around such that _tlbie is now defined in
hash_low_32.S and is only used by the 32-bit hash code, and all
nohash CPUs use the various _tlbil_* forms that are now moved to
a new file, tlb_nohash_low.S.
I moved all the definitions for that stuff out of
include/asm/tlbflush.h as they are really internal mm stuff, into
mm/mmu_decl.h
The code should have no functional changes. I kept some va |