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

Updates from torvalds/master #5

Merged
merged 865 commits into from
Mar 23, 2014
Merged
Changes from 1 commit
Commits
Show all changes
865 commits
Select commit Hold shift + click to select a range
031365b
MIPS: APRP: Choose the correct VPE loader by fixing the linking
dczhu Feb 28, 2014
e588e2f
inet: frag: make sure forced eviction removes all frags
Mar 6, 2014
0ca4934
firewire: ohci: fix probe failure with Agere/LSI controllers
Mar 6, 2014
4ae6e50
phy: fix compiler array bounds warning on settings[]
bjorn-helgaas Mar 5, 2014
adca476
net: Improve SO_TIMESTAMPING documentation and fix a minor code bug
amluto Mar 5, 2014
0a13404
net: unix socket code abuses csum_partial
antonblanchard Mar 5, 2014
d746ca9
ibmveth: Fix endian issues with MAC addresses
antonblanchard Mar 5, 2014
d2d273f
ipv6: Fix exthdrs offload registration.
Mar 5, 2014
14eedc3
drm/radeon: TTM must be init with cpu-visible VRAM, v2
clbr Feb 28, 2014
bc6a629
drm/radeon: resume old pm late
alexdeucher Feb 25, 2014
0d997b6
drm/radeon: silence GCC warning on 32 bit
pebolle Mar 4, 2014
972c5dd
drm/radeon/cik: fix typo in documentation
alexdeucher Mar 4, 2014
1371432
drm/radeon/dpm: fix typo in EVERGREEN_SMC_FIRMWARE_HEADER_softRegisters
alexdeucher Mar 6, 2014
5bd4e4c
bonding: correctly handle out of range parameters for lp_interval
sashalevin Mar 6, 2014
57352ef
net/mlx4_core: Fix memory access error in mlx4_QUERY_DEV_CAP_wrapper()
amirv Mar 6, 2014
9798935
net/mlx4_core: mlx4_init_slave() shouldn't access comm channel before…
amirv Mar 6, 2014
c88507f
ipv6: don't set DST_NOCOUNT for remotely added routes
qsn Mar 6, 2014
7a4ee32
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/…
airlied Mar 6, 2014
ae69340
Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/li…
airlied Mar 6, 2014
77ac9a0
drm: fix bochs kconfig dependencies
kraxel Mar 6, 2014
f50d714
MAINTAINERS: add maintainer entry for TDA998x driver
Mar 3, 2014
d03874c
drm/radeon/atom: select the proper number of lanes in transmitter setup
alexdeucher Mar 6, 2014
45db98e
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/…
airlied Mar 6, 2014
621b506
powerpc/tm: Fix crash when forking inside a transaction
mikey Mar 3, 2014
a5b2cf5
powerpc: Align p_dyn, p_rela and p_st symbols
antonblanchard Mar 3, 2014
d930acf
Merge remote-tracking branches 'spi/fix/ath79', 'spi/fix/atmel', 'spi…
broonie Mar 7, 2014
16c0ae0
Target/sbc: Fix sbc_copy_prot for offset scatters
Mar 5, 2014
9b745ab
ALSA: hda - Fix loud click noise with IdeaPad 410Y
tiwai Mar 7, 2014
739c3ee
blk-mq: add REQ_SYNC early
Feb 19, 2014
70044d7
firewire: don't use PREPARE_DELAYED_WORK
htejun Mar 7, 2014
cebc2de
dm space map metadata: fix refcount decrement below 0 which caused co…
jthornber Mar 7, 2014
3148140
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-u…
torvalds Mar 7, 2014
ee69350
Merge tag 'stable/for-linus-3.14-rc5-tag' of git://git.kernel.org/pub…
torvalds Mar 7, 2014
8ab47d3
Merge tag 'pinctrl-v3.14-3' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Mar 7, 2014
2a75184
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
torvalds Mar 7, 2014
3bf7706
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Mar 7, 2014
e1aa17c
Merge tag 'sound-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Mar 7, 2014
b053940
ARC: Use correct PTAG register for icache flush
vineetgarc Mar 7, 2014
b28a613
libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus Sp…
mbaldessari Mar 7, 2014
e042936
usb: Add device quirk for Logitech HD Pro Webcams C920 and C930e
jwerner-chromium Mar 4, 2014
d86db25
usb: Make DELAY_INIT quirk wait 100ms between Get Configuration requests
jwerner-chromium Mar 4, 2014
e2ed511
Revert "xhci 1.0: Limit arbitrarily-aligned scatter gather."
matnyman Mar 7, 2014
469d417
Revert "USBNET: ax88179_178a: enable tso if usb host supports sg dma"
matnyman Mar 7, 2014
97bd5f0
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
linvjw Mar 7, 2014
006fa25
ARM: fix noMMU kallsyms symbol filtering
Feb 26, 2014
052450f
ARM: 7991/1: sa1100: fix compile problem on Collie
linusw Feb 25, 2014
38e0b08
ARM: 7992/1: boot: compressed: ignore bswapsdi2.S
Feb 26, 2014
5fa1019
x86: Ignore NMIs that come in during early boot
Mar 7, 2014
2ef176f
Merge tag 'dm-3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Mar 7, 2014
beb0082
Merge branches 'acpi-resources', 'acpi-ec' and 'acpi-sleep'
rafaeljw Mar 8, 2014
19bc45a
Merge branch 'pm-cpufreq'
rafaeljw Mar 8, 2014
2ca310f
SUNRPC: Fix oops when trace sunrpc_task events in nfs client
Chenditang Mar 7, 2014
27ea0f7
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Mar 8, 2014
721f0c1
Merge tag 'trace-fixes-v3.14-rc5' of git://git.kernel.org/pub/scm/lin…
torvalds Mar 8, 2014
9579f10
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…
torvalds Mar 8, 2014
95648c0
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Mar 8, 2014
4d7eaa1
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
torvalds Mar 8, 2014
b01d4e6
x86: fix compile error due to X86_TRAP_NMI use in asm files
torvalds Mar 8, 2014
abfba60
Merge tag 'pm+acpi-3.14-rc6' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Mar 8, 2014
7bffc48
Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.t…
torvalds Mar 8, 2014
85ec688
Merge tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Mar 8, 2014
9f93585
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 8, 2014
15b0485
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 8, 2014
ca62eec
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 8, 2014
d211f17
audit: Update kdoc for audit_send_reply and audit_list_rules_send
ebiederm Mar 8, 2014
7982e90
block: fix q->flush_rq NULL pointer crash on dm-mpath flush
snitm Mar 9, 2014
10beafc
block: change flush sequence list addition back to front add
Mar 9, 2014
614cd4a
Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux …
olofj Mar 9, 2014
4058f76
Merge tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/b…
olofj Mar 9, 2014
1055464
Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/s…
olofj Mar 9, 2014
4c7b704
Revert "ACPI / sleep: pm_power_off needs more sanity checks to be ins…
rafaeljw Mar 9, 2014
66a523d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
torvalds Mar 9, 2014
4aa41ba
Merge tag 'spi-v3.14-rc5' of git://git.kernel.org/pub/scm/linux/kerne…
torvalds Mar 9, 2014
1dc3217
Merge branch 'for-rc6' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Mar 9, 2014
a8d9bc2
bnx2: Fix shutdown sequence
Mar 9, 2014
979e0d7
KEYS: Make the keyring cycle detector ignore other keyrings of the sa…
dhowells Mar 9, 2014
a491ce7
Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Mar 10, 2014
cf8bf7c
Merge tag 'usb-3.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Mar 10, 2014
fe9ea91
Merge tag 'nfs-for-3.14-5' of git://git.linux-nfs.org/projects/trondm…
torvalds Mar 10, 2014
79e6154
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Mar 10, 2014
fa389e2
Linux 3.14-rc6
torvalds Mar 10, 2014
f324777
[SCSI] qla2xxx: Fix multiqueue MSI-X registration.
Feb 26, 2014
126e964
[SCSI] be2iscsi: fix bad if expression
Dec 19, 2013
ddfadd7
[SCSI] isci: fix reset timeout handling
djbw Feb 6, 2014
c59053a
[SCSI] isci: correct erroneous for_each_isci_host macro
ldorau Feb 6, 2014
b77ed25
[SCSI] qla2xxx: Poll during initialization for ISP25xx and ISP83xx
Feb 26, 2014
58d4d3c
ASoC: si476x: Fix IO setup
larsclausen Mar 4, 2014
8eeb5c1
ASoC: 88pm860: Fix IO setup
larsclausen Mar 4, 2014
b25b1b6
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
broonie Mar 10, 2014
7f35afd
Merge remote-tracking branches 'asoc/fix/88pm860', 'asoc/fix/omap' an…
broonie Mar 10, 2014
02c5bb4
perf trace: Decode architecture-specific signal numbers
bwhacks Feb 6, 2014
155b3a1
perf symbols: Fix crash in elf_section_by_name
Mar 2, 2014
fdf57dd
perf machine: Use map as success in ip__resolve_ams
dzickusrh Feb 26, 2014
83493d7
libata: use wider match for blacklisting Crucial M500
htejun Mar 10, 2014
1b56e98
ocfs2 syncs the wrong range...
Feb 10, 2014
9c225f2
vfs: atomic f_pos accesses as per POSIX
torvalds Mar 3, 2014
00e188e
sockfd_lookup_light(): switch to fdget^W^Waway from fget_light
Mar 4, 2014
bd2a31d
get rid of fget_light()
Mar 4, 2014
92f092d
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel…
davem330 Mar 10, 2014
3731436
pkt_sched: move the sanity test in qdisc_list_add()
Mar 8, 2014
2b64c54
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 10, 2014
bc48bc8
bna: Replace large udelay() with mdelay()
bwhacks Mar 9, 2014
e6a4b6f
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Mar 10, 2014
2818fa0
pkt_sched: fq: do not hold qdisc lock while allocating memory
Mar 7, 2014
7f32890
mtip32xx: fix bad use of smp_processor_id()
axboe Mar 10, 2014
e97ca8e
mm: fix GFP_THISNODE callers and clarify
hnaz Mar 10, 2014
2af120b
mm/compaction: break out of loop on !PageBuddy in isolate_freepages_b…
labbott Mar 10, 2014
70335ab
fs/proc/base.c: fix GPF in /proc/$PID/map_files
Mar 10, 2014
2216ee8
mm/Kconfig: fix URL for zsmalloc benchmark
bwhacks Mar 10, 2014
2930ffc
revert "kallsyms: fix absolute addresses for kASLR"
akpm00 Mar 10, 2014
1443176
MAINTAINERS: blackfin: add git repository
Mar 10, 2014
5394223
tools/testing/selftests/ipc/msgque.c: handle msgget failure return co…
Mar 10, 2014
d7d673a
hfsplus: add HFSX subfolder count support
saproj Mar 10, 2014
0eb808e
cris: convert ffs from an object-like macro to a function-like macro
geertu Mar 10, 2014
8712a00
Merge branch 'akpm' (patches from Andrew Morton)
torvalds Mar 11, 2014
5bd0767
Xen-netback: Fix issue caused by using gso_type wrongly
annie-li Mar 10, 2014
dd38743
vlan: Set correct source MAC address with TX VLAN offload enabled
Mar 10, 2014
5e3a227
Merge tag 'asoc-v3.14-rc6' of git://git.kernel.org/pub/scm/linux/kern…
tiwai Mar 11, 2014
b8ad0f9
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…
Mar 11, 2014
d44753b
sched/deadline: Deny unprivileged users to set/change SCHED_DEADLINE …
jlelli Mar 3, 2014
177c53d
stop_machine: Fix^2 race between stop_two_cpus() and stop_cpus()
Feb 28, 2014
96b3d28
sched/clock: Prevent tracing recursion in sched_clock_cpu()
Mar 6, 2014
b7b4839
perf/x86: Fix leak in uncore_type_init failure paths
Mar 6, 2014
09df7c4
x86: Remove CONFIG_X86_OOSTORE
Mar 10, 2014
adf961d
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Mar 11, 2014
33807f4
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
torvalds Mar 11, 2014
731bd6a
x86, fpu: Check tsk_used_math() in kernel_fpu_end() for eager FPU
vsv13 Feb 3, 2014
f1c1283
MAINTAINERS: update IMX kernel git tree
shawnguo2 Mar 11, 2014
f656d46
ARM: at91: fix network interface ordering for sama5d36
Mar 10, 2014
d25f06e
vmxnet3: fix netpoll race condition
nhorman Mar 10, 2014
83bf79b
stmmac: disable at run-time the EEE if not supported
cavagiu Mar 10, 2014
d916701
stmmac: fix and better tune the default buffer sizes
cavagiu Mar 10, 2014
29896a6
stmmac: fix chained mode
cavagiu Mar 10, 2014
c5e9103
stmmac: dwmac-sti: fix broken STiD127 compatibility
cavagiu Mar 10, 2014
9d79b3c
Merge branch 'stmmac'
davem330 Mar 11, 2014
8993531
PNP / ACPI: proper handling of ACPI IO/Memory resource parsing failures
zhang-rui Mar 11, 2014
8cb1990
skbuff: skb_segment: s/frag/nskb_frag/
mstsirkin Mar 10, 2014
4e1beba
skbuff: skb_segment: s/skb_frag/frag/
mstsirkin Mar 10, 2014
df5771f
skbuff: skb_segment: s/skb/head_skb/
mstsirkin Mar 10, 2014
1a4ceda
skbuff: skb_segment: s/fskb/list_skb/
mstsirkin Mar 10, 2014
1fd819e
skbuff: skb_segment: orphan frags before copying
mstsirkin Mar 10, 2014
c7b76f8
Merge branch 'skb_frags'
davem330 Mar 11, 2014
c3f9b01
tcp: tcp_release_cb() should release socket ownership
Mar 10, 2014
51061b8
MIPS: math-emu: Fix prefx detection and COP1X function field definition
dczhu Mar 7, 2014
9ed973c
bridge: multicast: add sanity check for general query destination
T-X Mar 10, 2014
20a599b
bridge: multicast: enable snooping on general queries only
T-X Mar 10, 2014
fdfaf64
x86: bpf_jit: support negative offsets
Mar 10, 2014
4067646
tools/net/Makefile: Define PACKAGE to fix build problems
Mar 11, 2014
f75761b
r8169: fix the incorrect tx descriptor version
hayesorz Mar 11, 2014
b12bb60
[SCSI] storvsc: NULL pointer dereference fix
alesax Feb 27, 2014
0e6d6ec
drm/ttm: Work around performance regression with VM_PFNMAP
thomashvmw Mar 12, 2014
fcb8182
drm/i915: Add a workaround for HSW scanline counter weirdness
vsyrjala Mar 11, 2014
2430262
drm/i915: Fix scanline counter fixup on BDW
vsyrjala Mar 11, 2014
5c673b6
drm/i915: Don't enable display error interrupts from the start
danvet Mar 7, 2014
3cdeb71
PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not ena…
bjorn-helgaas Mar 11, 2014
ac93ac7
PCI: Don't check resource_size() in pci_bus_alloc_resource()
bjorn-helgaas Mar 11, 2014
596f314
KVM: SVM: fix cr8 intercept window
rkrcmar Mar 11, 2014
8b9d966
dm cache: fix truncation bug when copying a block to/from >2TB fast d…
mauelsha Mar 11, 2014
e893fba
dm cache: fix access beyond end of origin device
mauelsha Mar 12, 2014
9ef7506
drm/ttm: don't oops if no invalidate_caches()
Mar 12, 2014
836fbaf
xen-netback: use skb_is_gso in xenvif_start_xmit
Mar 11, 2014
7848865
drm/radeon: fix runpm disabling on non-PX harder
alexdeucher Mar 11, 2014
7b1bbe8
drm/radeon/cik: properly set sdma ring status on disable
alexdeucher Mar 12, 2014
07ae78c
drm/radeon/cik: stop the sdma engines in the enable() function
alexdeucher Mar 12, 2014
56cb456
net/mlx4_core: Fix wrong dump of the vxlan offloads device capability
ogerlitz Mar 12, 2014
2a2083f
net/mlx4_en: Handle vxlan steering rules for mac address changes
ogerlitz Mar 12, 2014
7855bff
net/mlx4_core: Load the IB driver when the device supports IBoE
ogerlitz Mar 12, 2014
598f2e2
Merge branch 'mlx4'
davem330 Mar 12, 2014
a93c125
packet: doc: Spelling s/than/that/
Mar 11, 2014
7e814a6
MAINTAINERS: Add tools/net to NETWORKING [GENERAL]
tklauser Mar 11, 2014
b2b3d8d
drm/radeon/cik: properly set compute ring status on disable
alexdeucher Mar 12, 2014
dbb490b
net: socket: error on a negative msg_namelen
Mar 11, 2014
2f727f5
Merge tag 'sound-3.14-rc7' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Mar 12, 2014
2ed99e3
cpufreq: Skip current frequency initialization for ->setpolicy drivers
rafaeljw Mar 12, 2014
c4e1acb
ACPI / init: Invoke early ACPI initialization later
rafaeljw Mar 12, 2014
18f2af2
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
torvalds Mar 13, 2014
ac9dc67
Merge tag 'pci-v3.14-fixes-2' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 13, 2014
4b0c825
drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode
thomashvmw Mar 12, 2014
7aa4a06
Merge tag 'vmwgfx-fixes-3.14-2014-03-13' of git://people.freedesktop.…
airlied Mar 13, 2014
bf21d60
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/…
airlied Mar 13, 2014
f042cc4
Merge tag 'ttm-fixes-3.14-2014-03-12' of git://people.freedesktop.org…
airlied Mar 13, 2014
a5b0ccb
KVM: PPC: Book3S HV: Remove bogus duplicate code
paulusmack Mar 13, 2014
e724f08
KVM: PPC: Book3S HV: Fix register usage when loading/saving VRSAVE
paulusmack Mar 13, 2014
f4e53f9
MAINTAINERS: add networking selftests to NETWORKING
Mar 13, 2014
0a8d8c4
vmxnet3: fix building without CONFIG_PCI_MSI
arndb Mar 13, 2014
de12326
net/mlx4_en: Deregister multicast vxlan steering rules when going down
ogerlitz Mar 13, 2014
6e07a1e
at86rf230: fix lockdep splats
alexaring Mar 12, 2014
fb00bc2
bonding: set correct vlan id for alb xmit path
dingtianhong Mar 12, 2014
84fe618
eth: fec: Fix lost promiscuous mode after reconnecting cable
lategoodbye Mar 12, 2014
ecab670
ipv6: Avoid unnecessary temporary addresses being generated
hkallweit Mar 12, 2014
a4e90be
ACPI / sleep: Add extra checks for HW Reduced ACPI mode sleep states
rafaeljw Mar 13, 2014
d5af40d
Merge branches 'pnp', 'acpi-init', 'acpi-sleep' and 'pm-cpufreq'
rafaeljw Mar 13, 2014
62c19c9
i2c: Remove usage of orphaned symbol OF_I2C
richardweinberger Feb 9, 2014
53611c0
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
torvalds Mar 14, 2014
c14c06b
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/…
torvalds Mar 14, 2014
c60f7d5
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Mar 14, 2014
847d797
x86/amd/numa: Fix northbridge quirk to assign correct NUMA node
dblueman Mar 13, 2014
0fae799
perf bench numa: Make no args mean 'run all tests'
acmel Mar 13, 2014
6b5625b
HID: hid-lg4ff: Support new version of G27
mungewell Mar 13, 2014
6eeefcc
perf bench: Fix NULL pointer dereference in "perf bench all"
Mar 12, 2014
f5868f0
MIPS: Replace CONFIG_MIPS64 and CONFIG_MIPS32_R2
pebolle Feb 9, 2014
b616365
MIPS: FPU: Fix conflict of register usage
chenhuacai Feb 7, 2014
7f02c46
MIPS: Octeon: Fix fall through on bar type OCTEON_DMA_BAR_TYPE_SMALL
Feb 10, 2014
0c01b45
Merge tag 'dm-3.14-fixes-4' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Mar 15, 2014
cee152f
Merge tag 'pm+acpi-3.14-rc7' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Mar 15, 2014
a4ecdf8
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/l…
torvalds Mar 15, 2014
3b4df68
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Mar 15, 2014
4f87dac
ipc: Fix 2 bugs in msgrcv() MSG_COPY implementation
mkerrisk Mar 10, 2014
b44eeb4
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Mar 16, 2014
59bf6c3
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm…
torvalds Mar 16, 2014
dcb99fd
Linux 3.14-rc7
torvalds Mar 17, 2014
a8031d2
MIPS: asm: syscall: Fix copying system call arguments
Jan 22, 2014
86ca57b
MIPS: Fix syscall tracing interface
larperaxis Mar 17, 2014
a467109
MIPS: ftrace: Fix icache flush range error
vh21 Feb 22, 2014
9f8b483
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Mar 17, 2014
06e2e88
MIPS: mark O32+FP64 experimental for now
paulburton Feb 14, 2014
8a21d9f
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upst…
torvalds Mar 17, 2014
9a15c94
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
torvalds Mar 17, 2014
2182127
Merge tag 'drm-intel-fixes-2014-03-17' of git://anongit.freedesktop.o…
airlied Mar 18, 2014
27410e8
drm: Fix use-after-free in the shadow-attache exit code
danvet Jan 30, 2014
e4362d1
MIPS: Fix possible build error with transparent hugepages enabled
Jan 21, 2014
7c144bf
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/lin…
Mar 18, 2014
3055644
ALSA: oxygen: Xonar DG(X): fix Stereo Upmixing regression
cladisch Mar 18, 2014
4907cdc
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
torvalds Mar 18, 2014
707d4ee
Revert "[PATCH] Insert GART region into resource map"
bjorn-helgaas Mar 18, 2014
3eb59ec
cgroup: fix a failure path in create_css()
lizf-os Mar 18, 2014
8259383
Revert "drm/i915: don't touch the VDD when disabling the panel"
jnikula Mar 17, 2014
0f4706d
drm/i915: Disable stolen memory when DMAR is active
ickle Mar 18, 2014
4fe2169
MIPS: BCM47XX: Check all (32) GPIOs when looking for a pin
rmilecki Feb 13, 2014
749d322
ALSA: compress: Pass through return value of open ops callback
charleskeepax Mar 19, 2014
ea1cd65
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…
torvalds Mar 19, 2014
55ae26b
Merge tag 'drm-intel-fixes-2014-03-19' of git://anongit.freedesktop.o…
airlied Mar 19, 2014
b08ac66
MIPS: ftrace: Tweak safe_load()/safe_store() macros
vh21 Mar 18, 2014
2eddb70
MIPS: Octeon: Fix warning in of_device_alloc on cn3xxx
Mar 19, 2014
7c38953
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 19, 2014
7c1cfac
Merge tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/k…
torvalds Mar 19, 2014
8878439
mm: fix bad rss-counter if remap_file_pages raced migration
Mar 19, 2014
85d898b
drm/exynos: Fix (more) freeing issues in exynos_drm_drv.c
djkurtz Mar 17, 2014
004e5cf
Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux…
airlied Mar 20, 2014
71ca758
MIPS: Make local_irq_disable macro safe for non-Mipsr2
jim2101024 Nov 27, 2013
8729134
tracing: Fix array size mismatch in format string
vnagarnaik Feb 14, 2014
92f9973
Merge tag 'sound-3.14' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Mar 20, 2014
3fb725c
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upst…
torvalds Mar 20, 2014
7e09e73
mm: fix swapops.h:131 bug if remap_file_pages raced migration
Mar 21, 2014
477cc48
Merge tag 'trace-fixes-v3.14-rc7' of git://git.kernel.org/pub/scm/lin…
torvalds Mar 21, 2014
11d4616
futex: revert back to the explicit waiter counting code
torvalds Mar 21, 2014
708f04d
block: free q->flush_rq in blk_init_allocated_queue error paths
Mar 20, 2014
08edb33
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
torvalds Mar 21, 2014
084c6c5
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Mar 22, 2014
774868c
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/…
torvalds Mar 22, 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
packet: doc: Spelling s/than/that/
Signed-off-by: Geert Uytterhoeven <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: [email protected]
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Geert Uytterhoeven authored and davem330 committed Mar 12, 2014

Verified

This commit was signed with the committer’s verified signature.
targos Michaël Zasso
commit a93c12560498066765c58b032530798a26bd8f70
2 changes: 1 addition & 1 deletion Documentation/networking/packet_mmap.txt
Original file line number Diff line number Diff line change
@@ -453,7 +453,7 @@ TP_STATUS_COPY : This flag indicates that the frame (and associated
enabled previously with setsockopt() and
the PACKET_COPY_THRESH option.

The number of frames than can be buffered to
The number of frames that can be buffered to
be read with recvfrom is limited like a normal socket.
See the SO_RCVBUF option in the socket (7) man page.