Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull from torvalds #1

Merged
merged 2,944 commits into from
Jan 21, 2014
Merged
Changes from 1 commit
Commits
Show all changes
2944 commits
Select commit Hold shift + click to select a range
3708983
sched, net: Fixup busy_loop_us_clock()
Nov 19, 2013
130816c
sched, thermal: Clean up preempt_enable_no_resched() abuse
Dec 11, 2013
1d027ee
perf probe: Fix build when DWARF support libraries not present
acmel Jan 13, 2014
5aa3d71
x86, ramdisk: Export relocated ramdisk VA
suryasaimadhu Dec 4, 2013
e1b43e3
x86, microcode: Share native MSR accessing variants
suryasaimadhu Dec 4, 2013
5335ba5
x86, microcode, AMD: Fix early ucode loading
suryasaimadhu Nov 29, 2013
bad5fa6
x86, microcode: Move to a proper location
suryasaimadhu Dec 1, 2013
9ef9730
cxgb4: silence shift wrapping static checker warning
Jan 9, 2014
26f7f98
perf tools: Remove unused test-volatile-register-var.c
ydroneaud Jan 11, 2014
ce9b499
Revert "kernfs: remove unnecessary NULL check in __kernfs_remove()"
gregkh Jan 13, 2014
a30f82b
Revert "sysfs, driver-core: remove unused {sysfs|device}_schedule_cal…
gregkh Jan 13, 2014
ff483d5
Revert "s390: use device_remove_file_self() instead of device_schedul…
gregkh Jan 13, 2014
c41d966
Revert "scsi: use device_remove_file_self() instead of device_schedul…
gregkh Jan 13, 2014
8634c42
Revert "pci: use device_remove_file_self() instead of device_schedule…
gregkh Jan 13, 2014
a9f138b
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() an…
gregkh Jan 13, 2014
9b0925a
Revert "kernfs: implement kernfs_{de|re}activate[_self]()"
gregkh Jan 13, 2014
f4b3e63
Revert "kernfs: make kernfs_get_active() block if the node is deactiv…
gregkh Jan 13, 2014
7653fe9
Revert "kernfs: remove kernfs_addrm_cxt"
gregkh Jan 13, 2014
55f6e30
Revert "kernfs: invoke kernfs_unmap_bin_file() directly from __kernfs…
gregkh Jan 13, 2014
4f4b1b6
Revert "kernfs: restructure removal path to fix possible premature re…
gregkh Jan 13, 2014
798c75a
Revert "kernfs: remove KERNFS_REMOVED"
gregkh Jan 13, 2014
0890147
Revert "kernfs: remove KERNFS_ACTIVE_REF and add kernfs_lockdep()"
gregkh Jan 13, 2014
87da149
Revert "kernfs: replace kernfs_node->u.completion with kernfs_root->d…
gregkh Jan 13, 2014
197ba5f
Move DWC2 driver out of staging
Jan 13, 2014
683bb27
Revert "kernfs: fix get_active failure handling in kernfs_seq_*()"
gregkh Jan 13, 2014
db50d2f
drivers/char: don't use module_init in non-modular ttyprintk.c
Jan 12, 2014
33ec082
mei: revamp mei reset state machine
Jan 11, 2014
6adb8ef
mei: limit the number of consecutive resets
Jan 11, 2014
04b5650
comedi: Humusoft MF634 and MF624 DAQ cards driver
lisovy Jan 9, 2014
bc46155
Staging: comedi: fix numerous brace coding style issues in ni_mio_com…
Jan 11, 2014
b9ede31
Staging: comedi: fix indentation coding style issue in ni_mio_common.c.
Jan 11, 2014
69ba835
Staging: comedi: fix extra whitespace style issues in ni_mio_common.c.
Jan 11, 2014
ee2e072
staging: drm/imx: set second plane base address
pH5 Jan 10, 2014
bc2b067
staging: drm/imx: handle framebuffer offsets correctly
lynxeye-dev Jan 10, 2014
32f7110
staging: drm/imx: don't drop crtc offsets when doing pageflip
lynxeye-dev Jan 10, 2014
075c457
imx-drm: parallel-display: honor 'native-mode' property when selectin…
lw-karo Jan 13, 2014
6d23987
staging: vt6655: Fix memory leak in wpa_ioctl()
Jan 11, 2014
3f35c7f
Staging: rtl8188eu: Fixed required spaces after ',' and around '=' an…
timjp87 Jan 11, 2014
c7333c1
Staging: rtl8188eu: Fixed "foo * bar" related coding style issues
timjp87 Jan 11, 2014
ee2d9df
staging: wlags49_h2: Fix "do not use C99 //" in wl_cs.h, wl_enc.h wl_…
standby24x7 Jan 12, 2014
f834718
Staging: rts5139: rts51x_card: fixed style issues
gamingrobot Jan 12, 2014
ff11917
staging: tidspbridge: adjust error return code (bugfix)
JuliaLawall Jan 13, 2014
5b50eef
staging: lustre: libcfs_debug.h: align define values
lym Jan 13, 2014
924a9f9
staging: lustre: libcfs_debug.h: Align backslashes in macros
lym Jan 13, 2014
e6ee5f4
staging: lustre: libcfs_debug.h: remove extra blank lines
lym Jan 13, 2014
1c4738c
staging: lustre: libcfs_debug: small whitespace cleanups
lym Jan 13, 2014
d820fa9
staging: vt6656: sparse fixes: dpc.c missing dpc.h
Jan 13, 2014
86a362f
staging: vt6656: sparse fixes ethtool_ioctl Use struct ifreq *
Jan 13, 2014
9010a28
staging: vt6656: sparse fixes: iwctl_siwgenie use memcpy.
Jan 13, 2014
c1cd149
staging: vt6656: sparse fixes: iwctl_giwgenie use memcpy.
Jan 13, 2014
13e6dd4
usb: dwc2: move device tree bindings doc to correct place
Jan 13, 2014
1b9fb31
usb: core: check for valid id_table when using the RefId feature
Jan 13, 2014
feffe09
usb: ehci: add freescale imx28 special write register method
Jan 10, 2014
ed8f831
usb: chipidea: add freescale imx28 special write register method
Jan 10, 2014
1071055
usb: chipidea: imx: set CI_HDRC_IMX28_WRITE_FIX for imx28
Jan 10, 2014
3b5d3e6
usb: chipidea: Fix Internal error: : 808 [#1] ARM related to STS flag
ruehlchris Jan 10, 2014
cd0b42c
usb: chipidea: put hw_phymode_configure before ci_usb_phy_init
ruehlchris Jan 10, 2014
5332ff1
usb: chipidea: need to mask INT_STATUS when write otgsc
Jan 10, 2014
2fc5a7d
usb: chipidea: udc: using MultO at TD as real mult value for ISO-TX
Jan 10, 2014
8bc661b
tty/serial: at91: disable uart timer at start of shutdown
marekr Jan 10, 2014
187df69
staging: lustre: remove some unused debug macros
gregkh Jan 14, 2014
aa3bee0
lustre: delete linux/lustre_debug.h
gregkh Jan 14, 2014
c0eeb85
Merge tag 'drm-intel-fixes-2014-01-13' of git://people.freedesktop.or…
airlied Jan 14, 2014
abce1ec
Revert "drm: copy mode type in drm_mode_connector_list_update()"
airlied Jan 14, 2014
1cc03eb
md/raid5: Fix possible confusion when multiple write errors occur.
neilbrown Jan 6, 2014
b50c259
md/raid10: fix two bugs in handling of known-bad-blocks.
neilbrown Jan 13, 2014
41a336e
md/raid1: fix request counting bug in new 'barrier' code.
neilbrown Jan 14, 2014
5af9bef
md/raid5: fix a recently broken BUG_ON().
neilbrown Jan 14, 2014
e8b8491
md/raid10: fix bug when raid10 recovery fails to recover a block.
neilbrown Jan 5, 2014
8313b8e
md: fix problem when adding device to read-only array with bitmap.
neilbrown Dec 11, 2013
f549ed1
arch: Re-sort some Kbuild files to hopefully help avoid some conflicts
sfrothwell Jan 14, 2014
70315d2
inet_diag: fix inet_diag_dump_icsk() to use correct state for timewai…
nealcardwell Jan 10, 2014
fdc3452
net: usbnet: fix SG initialisation
bmork Jan 10, 2014
9c07912
Merge tag 'amd_ucode_for_3.14' of git://git.kernel.org/pub/scm/linux/…
Jan 14, 2014
60283df
x86/apic: Read Error Status Register correctly
richardweinberger Jan 14, 2014
1b3f828
Merge branch 'clockevents/3.14' of git://git.linaro.org/people/daniel…
Jan 12, 2014
1c59a86
s390/qdio: bridgeport support - CHSC part
Apr 24, 2013
2fac2b8
i2c: Re-instate body of i2c_parent_is_i2c_adapter()
nvswarren Jan 13, 2014
1977499
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux…
Jan 14, 2014
bb30594
kernfs: fix get_active failure handling in kernfs_seq_*()
htejun Jan 14, 2014
3f9aec7
hwmon: (coretemp) Fix truncated name of alarm attributes
Jan 14, 2014
1925994
x86, kaslr: Remove unused including <linux/version.h>
Dec 7, 2013
da2b6fb
x86, kaslr: Clarify RANDOMIZE_BASE_MAX_OFFSET
kees Dec 10, 2013
509051e
perf record: Rename --no-delay to --no-buffering
acmel Jan 14, 2014
a6205a3
perf record: Rename --initial-delay to --delay
acmel Jan 14, 2014
267d29a
ieee802154: Fix memory leak in ieee802154_add_iface()
Jan 11, 2014
3b56496
x86, cpu, amd: Add workaround for family 16h, erratum 793
suryasaimadhu Jan 14, 2014
a02bbb1
MAINTAINERS: add virtio-dev ML for virtio
mstsirkin Jan 12, 2014
7c4b517
dm9601: add USB IDs for new dm96xx variants
jacmet Jan 12, 2014
95f4a45
net: avoid reference counter overflows on fib_rules in multicast forw…
strssndktn Jan 13, 2014
51bb352
qlge: Fix vlan netdev features.
Jan 14, 2014
fdd239a
drm/nouveau: fix null ptr dereferences on some boards
Jan 14, 2014
703a8c2
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouv…
airlied Jan 15, 2014
cd9bb05
hwmon: remove DEFINE_PCI_DEVICE_TABLE macro
Dec 3, 2013
14513ee
hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary
groeck May 27, 2013
347c16c
hwmon: (coretemp) Add PCI device ID for CE41x0 CPUs
groeck May 27, 2013
9fb6c9c
hwmon: (coretemp) Refine TjMax detection
groeck Nov 9, 2013
c09088d
hwmon: (da9052) Fix adc to voltage calculation
Dec 18, 2013
bf6ea08
hwmon: (coretemp) Do not return -EAGAIN for low temperatures
groeck Nov 20, 2013
2ac1dfc
hwmon: (s3c) Trivial cleanup in hwmon-s3c.h
Dec 27, 2013
f5776cc
hwmon: (nct6775) Re-enable logical device mapping for NCT6791 during …
groeck Dec 25, 2013
4cb6409
hwmon: (max197) add include guard
vivien Jan 10, 2014
ffcc3b2
hwmon: (sht15) add include guard
vivien Jan 10, 2014
d303b1b
hwmon: (k10temp) Add support for Kaveri CPUs
ppokorny Jan 14, 2014
e59da0a
Merge branch 'clockevents/3.13-fixes' of git://git.linaro.org/people/…
Jan 15, 2014
70f2fe3
nilfs2: fix segctor bug that causes file system corruption
zeitgeist87 Jan 15, 2014
bad009f
MIPS: fix case mismatch in local_r4k_flush_icache_range()
chenhuacai Jan 15, 2014
43a0684
MIPS: fix blast_icache32 on loongson2
aakoskin Jan 15, 2014
03e5ac2
mm: fix crash when using XFS on loopback
Jan 15, 2014
5a610fc
crash_dump: fix compilation error (on MIPS at least)
Jan 15, 2014
74e72f8
lib/percpu_counter.c: fix __percpu_counter_add()
ming1 Jan 15, 2014
145830d
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Jan 15, 2014
1a60864
Merge tag 'md/3.13-fixes' of git://neil.brown.name/md
torvalds Jan 15, 2014
2e67c56
Merge branch 'akpm' (incoming from Andrew)
torvalds Jan 15, 2014
d139336
x86, cpu, amd: Fix a shadowed variable situation
suryasaimadhu Jan 15, 2014
0dce7cd
kvm: x86: fix apic_base enable check
Jan 15, 2014
151e0c7
x86, apic, kexec: Add disable_cpu_apicid kernel parameter
Jan 15, 2014
7d16c63
perf tools: Fix build error due to zfree() cast
namhyung Jan 9, 2014
3c6d8d8
tools lib traceevent: Add state member to struct trace_seq
namhyung Dec 19, 2013
3026bba
tools lib traceevent: Check return value of realloc()
namhyung Jan 15, 2014
504586e
tools lib traceevent: Get rid of malloc_or_die() in trace_seq_init()
namhyung Jan 15, 2014
e825e75
tools lib traceevent: Get rid of die() finally!!
namhyung Jan 15, 2014
8d0c222
tools lib traceevent: Make plugin unload function receive pevent
namhyung Jan 15, 2014
a8a5cd8
perf: tools: Fix cross building
Jan 15, 2014
540476d
perf tools: Remove symbol_conf.use_callchain check
namhyung Jan 14, 2014
2dc9fb1
perf tools: Factor out sample__resolve_callchain()
namhyung Jan 14, 2014
f39056f
perf hists: Convert hist entry functions to use struct he_stat
namhyung Jan 14, 2014
0e9e79a
tools lib traceevent: fix pointer-integer size mismatch
Jan 15, 2014
5b4d1db
x86, apic: Make disabled_cpu_apicid static read_mostly, fix typos
Jan 15, 2014
ecd6910
x86, intel-mid: Move Medfield code out of intel-mid.c core file
Dec 16, 2013
85611e3
x86, intel-mid: Add Clovertrail platform support
Dec 16, 2013
bc20aa4
x86, intel-mid: Add Merrifield platform support
Dec 16, 2013
4cb9b00
x86, intel-mid: Remove deprecated X86_MDFLD and X86_WANT_INTEL_MID co…
Dec 17, 2013
1df0cbd
batman-adv: fix batman-adv header overhead calculation
Jan 15, 2014
a926592
net,via-rhine: Fix tx_timeout handling
richardweinberger Jan 14, 2014
d9aee59
bnx2x: Don't release PCI bars on shutdown
Jan 15, 2014
ba42fad
be2net: add dma_mapping_error() check for dma_map_page()
Jan 15, 2014
aee636c
bpf: do not use reciprocal divide
Jan 15, 2014
a9bdddb
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/…
torvalds Jan 16, 2014
70b23ce
Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 16, 2014
9826dbb
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
torvalds Jan 16, 2014
93a11c8
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 16, 2014
9b6c4ea
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Jan 16, 2014
85ce70f
Merge branches 'sched-urgent-for-linus' and 'timers-urgent-for-linus'…
torvalds Jan 16, 2014
da6139e
x86: Add check for number of available vectors before CPU down
prarit Jan 13, 2014
7da7c15
x86, tsc: Add static (MSR) TSC calibration on Intel Atom SoCs
Oct 21, 2013
c026b35
x86, mm, perf: Allow recursive faults from interrupts
Jan 10, 2014
bee09ed
perf/x86/amd/ibs: Fix waking up from S3 for AMD family 10h
rric-net Jan 15, 2014
54b278b
m68k: Fix build warning in mac_via.h
Jan 12, 2014
88f1ebb
sched/deadline: Fix sparse static warnings
Jan 14, 2014
d8bf523
sched/deadline: Remove unused variables
Jan 14, 2014
7136265
sched/deadline: No need to check p if dl_se is valid
jlelli Jan 14, 2014
5778fcc
sched/core: Fix htmldocs warnings
jlelli Jan 14, 2014
e3de300
sched: Preserve the nice level over sched_setscheduler() and sched_se…
Jan 15, 2014
39fd8fd
sched: Fix up scheduler syscall LTP fails
Jan 15, 2014
0bb040a
sched: Fix up attr::sched_priority warning
Jan 15, 2014
7479f3c
sched: Move SCHED_RESET_ON_FORK into attr::sched_flags
Jan 15, 2014
860fc2f
Merge branch 'perf/urgent' into perf/core
Jan 16, 2014
3e7e09d
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux…
Jan 16, 2014
63b1a81
futexes: Fix futex_hashsize initialization
heicarst Jan 16, 2014
b4a9601
s390: Fix misspellings using 'codespell' tool
hbrueckner Dec 13, 2013
f85168e
s390/cpum_sf: fix printk format warnings
hbrueckner Jan 8, 2014
eaad451
sched: Fix __sched_setscheduler() nice test
Jan 16, 2014
4ce00df
Revert "arm64: Fix memory shareability attribute for ioremap_wc/cache"
ctmarinas Jan 16, 2014
ad13701
tools lib traceevent: Add pevent_unregister_event_handler()
namhyung Jan 16, 2014
20c7e5a
tools lib traceevent: Add pevent_unregister_print_function()
namhyung Jan 16, 2014
ac668c7
tools lib traceevent: Unregister handler when function plugin is unlo…
namhyung Jan 16, 2014
4061eda
tools lib traceevent: Unregister handler when hrtimer plugin is unloaded
namhyung Jan 16, 2014
11e99c5
tools lib traceevent: Unregister handler when kmem plugin is unloaded
namhyung Jan 16, 2014
354a2bd
tools lib traceevent: Unregister handler when kvm plugin is unloaded
namhyung Jan 16, 2014
02bafd3
tools lib traceevent: Unregister handler when sched_switch plugin is …
namhyung Jan 16, 2014
ec7c6de
tools lib traceevent: Unregister handler when mac80211 plugin is unlo…
namhyung Jan 16, 2014
6024cf3
tools lib traceevent: Unregister handler when cfg80211 plugin is unlo…
namhyung Jan 16, 2014
0247a96
tools lib traceevent: Unregister handler when jbd2 plugin is is unloaded
namhyung Jan 16, 2014
a157112
tools lib traceevent: Unregister handler when scsi plugin is unloaded
namhyung Jan 16, 2014
bf6b3a9
tools lib traceevent: Unregister handler when xen plugin is unloaded
namhyung Jan 16, 2014
a707723
perf tools: Add 'build-test' make target
namhyung Jan 16, 2014
981d05a
perf probe: Release allocated probe_trace_event if failed
mhiramathitachi Jan 16, 2014
e53b00d
perf probe: Release all dynamically allocated parameters
mhiramathitachi Jan 16, 2014
99ca423
perf symbols: Export elf_section_by_name and reuse
mhiramathitachi Jan 16, 2014
3178f58
perf tools: Do proper comm override error handling
fweisbec Jan 14, 2014
ca1e631
x86, tsc, apic: Unbreak static (MSR) calibration when CONFIG_X86_LOCA…
Jan 16, 2014
acb20d7
x86, intel-mid: sfi_handle_*_dev() should check for pdata error code
Jan 16, 2014
a957a14
x86, intel-mid: Check get_gpio_by_name() error code on platform code
Jan 16, 2014
28c6a39
x86, intel-mid: Return proper error code from get_gpio_by_name()
Jan 16, 2014
38a529b
e1000e: Fix compilation warning when !CONFIG_PM_SLEEP
westeri Jan 16, 2014
ee87c75
x86, intel_mid: Replace memcpy with struct assignment
Jan 17, 2014
d1969a8
percpu_counter: unbreak __percpu_counter_add()
Jan 16, 2014
8b6d79f
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Jan 17, 2014
8c12ec7
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux…
davem330 Jan 17, 2014
b965bb4
perf callchain: Spare double comparison of callchain first entry
fweisbec Jan 14, 2014
2a29190
perf tools: Remove unnecessary callchain cursor state restore on unmatch
fweisbec Jan 14, 2014
fb09b78
x86, mpx: Add MPX related opcodes to the x86 opcode map
qwren Jan 12, 2014
917f56c
kernfs: add struct dentry declaration in kernfs.h
htejun Jan 17, 2014
db4aad2
kernfs: associate a new kernfs_node with its parent on creation
htejun Jan 17, 2014
8f211b6
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
torvalds Jan 18, 2014
48ba620
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 18, 2014
c196403
net: rds: fix per-cpu helper usage
gerald-schaefer Jan 16, 2014
77f99ad
tcp: metrics: Avoid duplicate entries with the same destination-IP
Jan 16, 2014
11ffff7
ipv6: simplify detection of first operational link-local address on i…
strssndktn Jan 16, 2014
75b99db
parisc: fix SO_MAX_PACING_RATE typo
Jan 16, 2014
3af57f7
s390/bpf,jit: fix 32 bit divisions, use unsigned divide instructions
heicarst Jan 17, 2014
7d0d46d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
torvalds Jan 18, 2014
2b844ba
Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs"
rafaeljw Jan 17, 2014
961d9ca
ktest: Add BISECT_TRIES to bisect test
rostedt Jan 19, 2014
56931d7
m68k/mac: Make SCC reset work more reliably
Jan 12, 2014
45e6af0
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux…
Jan 19, 2014
00e2bcd
clocksource: Timer-sun5i: Switch to sched_clock_register()
bebarino Jan 17, 2014
16ec54a
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Jan 19, 2014
4d93540
Merge tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 20, 2014
72de182
drm/nouveau/mxm: fix null deref on load
imirkin Jan 19, 2014
d8ec26d
Linux 3.13
torvalds Jan 20, 2014
f479c01
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 20, 2014
8cf7a16
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 20, 2014
a1a3b3e
Merge tag 'metag-for-v3.14' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 20, 2014
09854dd
Merge tag 'edac_for_3.14' of git://git.kernel.org/pub/scm/linux/kerne…
torvalds Jan 20, 2014
db4fcb4
Merge tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/…
torvalds Jan 20, 2014
561a60f
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jan 20, 2014
edde1fb
Merge tag 'localmodconfig-v3.14' of git://git.kernel.org/pub/scm/linu…
torvalds Jan 20, 2014
9451ee2
Merge tag 'ktest-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Jan 20, 2014
897aea3
Merge branch 'core-debug-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Jan 20, 2014
6ffbe7d
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm…
torvalds Jan 20, 2014
a693c46
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/lin…
torvalds Jan 20, 2014
ad3ab30
Merge branch 'core-stackprotector-for-linus' of git://git.kernel.org/…
torvalds Jan 20, 2014
2cc3f16
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/lin…
torvalds Jan 20, 2014
9326657
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/li…
torvalds Jan 20, 2014
a0fa1dd
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Jan 20, 2014
741e390
x86/intel/mpx: Remove unused LWP structure
Jan 20, 2014
6c64614
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Jan 20, 2014
1a7dbbc
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/lin…
torvalds Jan 20, 2014
4cd4156
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linu…
torvalds Jan 20, 2014
06bc0f4
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/li…
torvalds Jan 20, 2014
2a0fede
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm…
torvalds Jan 20, 2014
5d4863e
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linu…
torvalds Jan 20, 2014
972d5e7
Merge branch 'x86-efi-kexec-for-linus' of git://git.kernel.org/pub/sc…
torvalds Jan 20, 2014
4500cf6
Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/sc…
torvalds Jan 20, 2014
2bb2c5e
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/sc…
torvalds Jan 20, 2014
8bd6964
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux…
torvalds Jan 20, 2014
74e8ee8
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm…
torvalds Jan 20, 2014
fab5669
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linu…
torvalds Jan 20, 2014
7fe67a1
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Jan 20, 2014
f4bcd8c
Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/li…
torvalds Jan 20, 2014
c9cdd9a
Merge branch 'x86/mpx' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Jan 20, 2014
15c8102
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linu…
torvalds Jan 20, 2014
82b5173
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Jan 20, 2014
9f67627
Merge tag 'char-misc-3.14-rc1' of git://git.kernel.org/pub/scm/linux/…
torvalds Jan 20, 2014
d3bad75
Merge tag 'driver-core-3.14-rc1' of git://git.kernel.org/pub/scm/linu…
torvalds Jan 20, 2014
de4fe30
Merge tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Jan 20, 2014
bcee634
Merge tag 'tty-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 21, 2014
ec513b1
Merge tag 'usb-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Jan 21, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Staging: rtl8188eu: Fixed "foo * bar" related coding style issues
This patch fixes all "foo * bar", "foo*bar", "foo* bar" checkpatch.pl errors for
rtl8188eu.

Signed-off-by: Tim Jester-Pfadt <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
timjp87 authored and gregkh committed Jan 13, 2014
commit c7333c114262dda2db28bf93b03a0ce8644b588a
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/include/rtl8188e_hal.h
Original file line number Diff line number Diff line change
@@ -458,7 +458,7 @@ void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo,
bool AutoLoadFail);
void Hal_ReadAntennaDiversity88E(struct adapter *pAdapter, u8 *PROMContent,
bool AutoLoadFail);
void Hal_ReadThermalMeter_88E(struct adapter * dapter, u8 *PROMContent,
void Hal_ReadThermalMeter_88E(struct adapter *dapter, u8 *PROMContent,
bool AutoloadFail);
void Hal_EfuseParseXtal_8188E(struct adapter *pAdapter, u8 *hwinfo,
bool AutoLoadFail);
6 changes: 3 additions & 3 deletions drivers/staging/rtl8188eu/include/rtl8188e_recv.h
Original file line number Diff line number Diff line change
@@ -58,11 +58,11 @@ enum rx_packet_type {
#define INTERRUPT_MSG_FORMAT_LEN 60
void rtl8188eu_init_recvbuf(struct adapter *padapter, struct recv_buf *buf);
s32 rtl8188eu_init_recv_priv(struct adapter *padapter);
void rtl8188eu_free_recv_priv(struct adapter * padapter);
void rtl8188eu_recv_hdl(struct adapter * padapter, struct recv_buf *precvbuf);
void rtl8188eu_free_recv_priv(struct adapter *padapter);
void rtl8188eu_recv_hdl(struct adapter *padapter, struct recv_buf *precvbuf);
void rtl8188eu_recv_tasklet(void *priv);
void rtl8188e_query_rx_phy_status(union recv_frame *fr, struct phy_stat *phy);
void rtl8188e_process_phy_info(struct adapter * padapter, void *prframe);
void rtl8188e_process_phy_info(struct adapter *padapter, void *prframe);
void update_recvframe_phyinfo_88e(union recv_frame *fra, struct phy_stat *phy);
void update_recvframe_attrib_88e(union recv_frame *fra, struct recv_stat *stat);

4 changes: 2 additions & 2 deletions drivers/staging/rtl8188eu/include/rtw_ioctl_set.h
Original file line number Diff line number Diff line change
@@ -28,10 +28,10 @@ typedef u8 NDIS_802_11_PMKID_VALUE[16];
u8 rtw_set_802_11_add_key(struct adapter *adapt, struct ndis_802_11_key *key);
u8 rtw_set_802_11_authentication_mode(struct adapter *adapt,
enum ndis_802_11_auth_mode authmode);
u8 rtw_set_802_11_bssid(struct adapter*adapter, u8 *bssid);
u8 rtw_set_802_11_bssid(struct adapter *adapter, u8 *bssid);
u8 rtw_set_802_11_add_wep(struct adapter *adapter, struct ndis_802_11_wep *wep);
u8 rtw_set_802_11_disassociate(struct adapter *adapter);
u8 rtw_set_802_11_bssid_list_scan(struct adapter*adapter,
u8 rtw_set_802_11_bssid_list_scan(struct adapter *adapter,
struct ndis_802_11_ssid *pssid,
int ssid_max_num);
u8 rtw_set_802_11_infrastructure_mode(struct adapter *adapter,
4 changes: 2 additions & 2 deletions drivers/staging/rtl8188eu/include/rtw_led.h
Original file line number Diff line number Diff line change
@@ -182,15 +182,15 @@ struct led_priv{
void BlinkTimerCallback(void *data);
void BlinkWorkItemCallback(struct work_struct *work);

void ResetLedStatus(struct LED_871x * pLed);
void ResetLedStatus(struct LED_871x *pLed);

void InitLed871x(struct adapter *padapter, struct LED_871x *pLed,
enum LED_PIN_871x LedPin);

void DeInitLed871x(struct LED_871x *pLed);

/* hal... */
void BlinkHandler(struct LED_871x * pLed);
void BlinkHandler(struct LED_871x *pLed);
void SwLedOn(struct adapter *padapter, struct LED_871x *pLed);
void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);

2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/include/rtw_mlme.h
Original file line number Diff line number Diff line change
@@ -614,7 +614,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv,
struct wlan_network *pnetwork);


struct wlan_network* _rtw_find_network(struct __queue *scanned_queue, u8 *addr);
struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr);

void _rtw_free_network_queue(struct adapter *padapter, u8 isfreeall);

12 changes: 6 additions & 6 deletions drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
Original file line number Diff line number Diff line change
@@ -241,7 +241,7 @@ struct mlme_handler {

struct action_handler {
unsigned int num;
char* str;
char *str;
unsigned int (*func)(struct adapter *adapt, union recv_frame *frame);
};

@@ -484,7 +484,7 @@ void write_cam(struct adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key);
void clear_cam_entry(struct adapter *padapter, u8 entry);

void invalidate_cam_all(struct adapter *padapter);
void CAM_empty_entry(struct adapter * Adapter, u8 ucIndex);
void CAM_empty_entry(struct adapter *Adapter, u8 ucIndex);

int allocate_fw_sta_entry(struct adapter *padapter);
void flush_all_cam_entry(struct adapter *padapter);
@@ -548,11 +548,11 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame
void report_surveydone_event(struct adapter *padapter);
void report_del_sta_event(struct adapter *padapter,
unsigned char *addr, unsigned short reason);
void report_add_sta_event(struct adapter *padapter, unsigned char* addr,
void report_add_sta_event(struct adapter *padapter, unsigned char *addr,
int cam_idx);

void beacon_timing_control(struct adapter *padapter);
extern u8 set_tx_beacon_cmd(struct adapter*padapter);
extern u8 set_tx_beacon_cmd(struct adapter *padapter);
unsigned int setup_beacon_frame(struct adapter *padapter,
unsigned char *beacon_frame);
void update_mgnt_tx_rate(struct adapter *padapter, u8 rate);
@@ -574,7 +574,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt,
int wait_ms);
void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr,
u8 dialogToken, u8 success);
void issue_p2p_invitation_request(struct adapter *padapter, u8* raddr);
void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr);
#endif /* CONFIG_88EU_P2P */
void issue_beacon(struct adapter *padapter, int timeout_ms);
void issue_probersp(struct adapter *padapter, unsigned char *da,
@@ -587,7 +587,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta,
void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid,
u8 *da);
s32 issue_probereq_ex(struct adapter *adapter, struct ndis_802_11_ssid *pssid,
u8* da, int try_cnt, int wait_ms);
u8 *da, int try_cnt, int wait_ms);
int issue_nulldata(struct adapter *padapter, unsigned char *da,
unsigned int power_mode, int try_cnt, int wait_ms);
int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,
8 changes: 4 additions & 4 deletions drivers/staging/rtl8188eu/include/rtw_mp.h
Original file line number Diff line number Diff line change
@@ -477,13 +477,13 @@ void Hal_SetChannel(struct adapter *pAdapter);
void Hal_SetAntennaPathPower(struct adapter *pAdapter);
s32 Hal_SetThermalMeter(struct adapter *pAdapter, u8 target_ther);
s32 Hal_SetPowerTracking(struct adapter *padapter, u8 enable);
void Hal_GetPowerTracking(struct adapter *padapter, u8 * enable);
void Hal_GetPowerTracking(struct adapter *padapter, u8 *enable);
void Hal_GetThermalMeter(struct adapter *pAdapter, u8 *value);
void Hal_mpt_SwitchRfSetting(struct adapter *pAdapter);
void Hal_MPT_CCKTxPowerAdjust(struct adapter * Adapter, bool bInCH14);
void Hal_MPT_CCKTxPowerAdjust(struct adapter *Adapter, bool bInCH14);
void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven);
void Hal_SetCCKTxPower(struct adapter *pAdapter, u8 * TxPower);
void Hal_SetOFDMTxPower(struct adapter *pAdapter, u8 * TxPower);
void Hal_SetCCKTxPower(struct adapter *pAdapter, u8 *TxPower);
void Hal_SetOFDMTxPower(struct adapter *pAdapter, u8 *TxPower);
void Hal_TriggerRFThermalMeter(struct adapter *pAdapter);
u8 Hal_ReadRFThermalMeter(struct adapter *pAdapter);
void Hal_SetCCKContinuousTx(struct adapter *pAdapter, u8 bStart);
2 changes: 1 addition & 1 deletion drivers/staging/rtl8188eu/include/rtw_mp_ioctl.h
Original file line number Diff line number Diff line change
@@ -278,7 +278,7 @@ struct eeprom_rw_param {

struct mp_ioctl_handler {
u32 paramsize;
s32 (*handler)(struct oid_par_priv* poid_par_priv);
s32 (*handler)(struct oid_par_priv *poid_par_priv);
u32 oid;
};