Linus Torvalds
8a84e01e14
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Fix BUG when decrypting empty packets in mac80211, from Ronald Wahl.
2) nf_nat_range is not fully initialized and this is copied back to
userspace, from Daniel Borkmann.
3) Fix read past end of b uffer in netfilter ipset, also from Dan
Carpenter.
4) Signed integer overflow in ipv4 address mask creation helper
inet_make_mask(), from Vincent BENAYOUN.
5) VXLAN, be2net, mlx4_en, and qlcnic need ->ndo_gso_check() methods to
properly describe the device's capabilities, from Joe Stringer.
6) Fix memory leaks and checksum miscalculations in openvswitch, from
Pravin B SHelar and Jesse Gross.
7) FIB rules passes back ambiguous error code for unreachable routes,
making behavior confusing for userspace. Fix from Panu Matilainen.
8) ieee802154fake_probe() doesn't release resources properly on error,
from Alexey Khoroshilov.
9) Fix skb_over_panic in add_grhead(), from Daniel Borkmann.
10) Fix access of stale slave pointers in bonding code, from Nikolay
Aleksandrov.
11) Fix stack info leak in PPP pptp code, from Mathias Krause.
12) Cure locking bug in IPX stack, from Jiri Bohac.
13) Revert SKB fclone memory freeing optimization that is racey and can
allow accesses to freed up memory, from Eric Dumazet.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (71 commits)
tcp: Restore RFC5961-compliant behavior for SYN packets
net: Revert "net: avoid one atomic operation in skb_clone()"
virtio-net: validate features during probe
cxgb4 : Fix DCB priority groups being returned in wrong order
ipx: fix locking regression in ipx_sendmsg and ipx_recvmsg
openvswitch: Don't validate IPv6 label masks.
pptp: fix stack info leak in pptp_getname()
brcmfmac: don't include linux/unaligned/access_ok.h
cxgb4i : Don't block unload/cxgb4 unload when remote closes TCP connection
ipv6: delete protocol and unregister rtnetlink when cleanup
net/mlx4_en: Add VXLAN ndo calls to the PF net device ops too
bonding: fix curr_active_slave/carrier with loadbalance arp monitoring
mac80211: minstrel_ht: fix a crash in rate sorting
vxlan: Inline vxlan_gso_check().
can: m_can: update to support CAN FD features
can: m_can: fix incorrect error messages
can: m_can: add missing delay after setting CCCR_INIT bit
can: m_can: fix not set can_dlc for remote frame
can: m_can: fix possible sleep in napi poll
can: m_can: add missing message RAM initialization
...
2014-11-21 17:20:36 -08:00
spi: pl022: Add support for chip select extension
2014-09-24 10:25:52 +01:00
bcma: register bcma as device tree driver
2014-09-30 13:17:14 -04:00
can: dev: add can_is_canfd_skb() API
2014-11-18 13:23:31 +01:00
libceph: sync osd op definitions in rados.h
2014-10-14 12:57:02 -07:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
dmaengine: dw: export probe()/remove() and Co to users
2014-10-15 20:31:05 +05:30
extcon: gpio: Fix code cleanup
2014-09-22 16:48:47 +09:00
fsl /bestcomm
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-09 06:42:04 -04:00
lockd: rip out deferred lock handling from testlock codepath
2014-09-09 16:01:09 -04:00
mfd: max77693: Fix always masked MUIC interrupts
2014-11-10 15:22:02 +00:00
net/mlx4_en: Code cleanups in tx path
2014-10-06 01:04:15 -04:00
Main set of InfiniBand/RDMA updates for 3.18 merge window:
2014-10-19 12:29:23 -07:00
mmc: sdhci: Add quirk for always getting TC with stop cmd
2014-10-03 14:18:17 +02:00
mtd: m25p80,spi-nor: Fix module aliases for m25p80
2014-10-21 13:46:03 -07:00
netfilter: ipset: send nonzero skbinfo extensions only
2014-09-15 22:20:21 +02:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-10-19 12:50:44 -07:00
power: charger-manager: Fix accessing invalidated power supply after charger unbind
2014-10-28 03:30:21 +01:00
regulator: Include err.h from consumer.h to fix build failure
2014-10-13 13:05:58 +02:00
soc /ti
drivers/soc: ti: fix build break with modules
2014-09-24 11:53:39 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
2014-10-08 12:51:44 -04:00
usbnet: add a callback for set_rx_mode
2014-10-28 17:26:19 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-10-24 11:21:43 -07:00
PCI/AER: Make <linux/aer.h> standalone includable
2014-09-16 16:28:34 -06:00
mmc: include linux/types.h for bool definition in atmel-mci.h
2014-09-09 13:58:58 +02:00
ARM: at91/tclib: mask interruptions at shutdown and probe
2014-09-08 10:54:03 +02:00
audit: Remove "weak" from audit_classify_compat_syscall() declaration
2014-10-22 16:14:03 -06:00
bdi: reimplement bdev_inode_switch_bdi()
2014-09-08 10:00:43 -06:00
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
block: add bioset_create_nobvec()
2014-10-03 15:28:18 -06:00
bitops: Fix shift overflow in GENMASK macros
2014-11-16 09:55:39 +01:00
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
2014-10-18 11:53:51 -07:00
block: Remove REQ_KERNEL
2014-10-14 09:00:44 -06:00
SCSI for-linus on 20141102
2014-11-02 14:39:35 -08:00
mem-hotplug: reset node managed pages when hot-adding a new pgdat
2014-11-13 16:17:06 -08:00
bpf: verifier (add verifier core)
2014-09-26 15:05:15 -04:00
net: phy: add BCM7425 and BCM7429 PHYs
2014-10-01 22:12:48 -04:00
fs/buffer.c: support buffer cache allocations with gfp modifiers
2014-09-04 22:04:42 -04:00
crypto: ccp - Check for CCP before registering crypto algs
2014-09-24 14:23:34 +08:00
cgroup: remove CGRP_RELEASABLE flag
2014-09-19 09:29:32 -04:00
Allwinner Clocks Additions for 3.18
2014-09-27 12:52:33 -07:00
Allwinner Clocks Additions for 3.18
2014-09-27 12:52:33 -07:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
clocksource: Remove "weak" from clocksource_default_clock() declaration
2014-10-22 16:14:03 -06:00
mm, cma: make parameters order consistent in func declaration and definition
2014-10-27 13:00:55 +01:00
ARCNET: add support for multi interfaces on com20020
2014-09-29 14:36:26 -04:00
mm, compaction: khugepaged should not give up due to need_resched()
2014-10-09 22:25:54 -04:00
compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
2014-10-28 11:03:40 +01:00
compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
2014-10-28 11:03:40 +01:00
rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
2014-09-18 16:22:27 -07:00
cpufreq: cpufreq-dt: extend with platform_data
2014-10-21 00:51:01 +02:00
cpufreq: allow driver-specific data
2014-10-21 00:51:01 +02:00
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-10-10 07:24:40 -04:00
vmcore: Remove "weak" from function declarations
2014-10-22 16:14:04 -06:00
block: Add T10 Protection Information functions
2014-09-27 09:14:59 -06:00
don't need that forward declaration of struct nameidata in dcache.h anymore
2014-10-12 17:09:06 -04:00
device coredump: add new device coredump class
2014-09-23 22:53:15 -07:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
iommu/vt-d: Store bus information in RMRR PCI device path
2014-10-02 12:12:25 +02:00
dynamic_debug: change __dynamic_<foo>_dbg return types to void
2014-10-03 14:55:48 -07:00
dql: dql_queued() should write first to reduce bus transactions
2014-09-29 00:04:55 -04:00
efi: Provide a non-blocking SetVariable() operation
2014-10-03 18:41:03 +01:00
net: Add function for parsing the header length out of linear ethernet frames
2014-09-05 17:47:02 -07:00
ethtool: Add generic options for tunables
2014-09-05 12:12:20 -07:00
f2fs: support large sector size
2014-09-23 11:10:20 -07:00
bpf: handle pseudo BPF_LD_IMM64 insn
2014-09-26 15:05:15 -04:00
proportions: add @gfp to init functions
2014-09-08 09:51:30 +09:00
fonts: Add 6x10 font
2014-10-09 11:35:48 +03:00
Return short read or 0 at end of a raw device, not EIO
2014-10-31 06:33:26 -04:00
net: fs_enet: Remove non NAPI RX
2014-10-08 16:01:41 -04:00
dmaengine: freescale: add and export fsl_dma_external_start()
2014-10-15 21:31:27 +05:30
ftrace: Replace tramp_hash with old_*_hash to save space
2014-09-10 10:48:45 -04:00
lib/genalloc.c: add genpool range check function
2014-10-09 22:25:52 -04:00
genl_magic: Resolve logical-op warnings
2014-10-14 17:03:53 -04:00
mm: rename allocflags_to_migratetype for clarity
2014-10-09 22:25:55 -04:00
Make hash_64() use a 64-bit multiply when appropriate
2014-09-13 11:24:03 -07:00
Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus
2014-10-06 23:34:40 +02:00
mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA
2014-10-09 22:25:57 -04:00
i2c: move acpi code back into the core
2014-09-25 16:07:15 +02:00
cfg80211: add WMM traffic stream API
2014-09-11 12:21:18 +02:00
macvlan: add source mode
2014-09-29 15:37:01 -04:00
ipv4: implement igmp_qrv sysctl to tune igmp robustness variable
2014-09-04 22:26:14 -07:00
ima: pass 'opened' flag to identify newly created files
2014-09-09 10:28:43 -04:00
inetdevice: fixed signed integer overflow
2014-11-14 17:08:58 -05:00
rcu: Remove local_irq_disable() in rcu_preempt_note_context_switch()
2014-09-07 16:27:34 -07:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
resources: Add device-managed request/release_resource()
2014-09-04 14:41:43 -06:00
ipack: save carrier owner to allow device to get it
2014-09-23 23:13:13 -07:00
irq_work: Force raised irq work to run on irq work interrupt
2014-09-13 18:38:15 +02:00
ACPI and power management updates for 3.18-rc1
2014-10-09 16:07:43 -04:00
jbd2: simplify calling convention around __jbd2_journal_clean_checkpoint_list
2014-09-18 00:58:12 -04:00
jiffies: Fix timeval conversion to jiffies
2014-09-12 13:59:03 -07:00
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-23 14:45:09 -07:00
sched/cputime: Fix cpu_timer_sample_group() double accounting
2014-11-16 10:04:18 +01:00
isdn/capi: correct capi20_manufacturer argument type mismatch
2014-10-14 15:05:34 -04:00
kexec: take the segment adding out of locate_mem_hole functions
2014-10-14 02:18:21 +02:00
KEYS: Make the key matching functions return bool
2014-09-16 17:36:08 +01:00
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
2014-09-09 10:34:56 +02:00
kgdb: Remove "weak" from kgdb_arch_pc() declaration
2014-10-22 16:14:04 -06:00
mm, thp: fix collapsing of hugepages on madvise
2014-10-29 16:33:14 -07:00
kvm: vfio: fix unregister kvm_device_ops of vfio
2014-10-24 13:30:47 +02:00
leds: Improve and export led_update_brightness
2014-09-12 14:01:54 -07:00
libata: change ata_<foo>_printk routines to return void
2014-09-23 10:02:31 -04:00
list: include linux/kernel.h
2014-10-14 02:18:13 +02:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 15:51:40 +02:00
mailbox: Introduce framework for mailbox
2014-10-08 10:39:41 +05:30
mailbox: Introduce framework for mailbox
2014-10-08 10:39:41 +05:30
mei: remove include to pci header from mei module files
2014-09-29 11:56:02 -04:00
mm: memcontrol: fix missed end-writeback page accounting
2014-10-29 16:33:15 -07:00
memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
2014-10-22 16:14:04 -06:00
memory-hotplug: add sysfs valid_zones attribute
2014-10-09 22:25:52 -04:00
mempolicy: unexport get_vma_policy() and remove its "task" arg
2014-10-09 22:25:56 -04:00
net/phy: micrel: Add clock support for KSZ8021/KSZ8031
2014-10-10 15:35:13 -04:00
mm/balloon_compaction: redesign ballooned pages management
2014-10-09 22:26:01 -04:00
mm: page-writeback: inline account_page_dirtied() into single caller
2014-10-29 16:33:14 -07:00
mm: introduce VM_BUG_ON_MM
2014-10-09 22:25:58 -04:00
kvm: Fix page ageing bugs
2014-09-24 14:07:58 +02:00
mm/page_alloc: fix incorrect isolation behavior by rechecking migratetype
2014-11-13 16:17:05 -08:00
kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>
2014-10-14 02:18:28 +02:00
vfs: introduce clone_private_mount()
2014-10-24 00:14:36 +02:00
PCI/MSI: Remove "pos" from the struct msi_desc msi_attrib
2014-10-01 12:21:23 -06:00
net: Add ndo_gso_check
2014-10-15 12:11:00 -04:00
netfilter: bridge: move br_netfilter out of the core
2014-09-26 18:42:31 +02:00
NFS: Implement SEEK
2014-09-30 16:24:56 -04:00
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
2014-10-18 11:53:51 -07:00
NFS: Implement SEEK
2014-09-30 16:24:56 -04:00
nfs: fix pnfs direct write memory leak
2014-11-12 14:22:51 -05:00
kernel/watchdog.c: control hard lockup detection default
2014-10-14 02:18:27 +02:00
of: Fix overflow bug in string property parsing functions
2014-11-04 10:19:48 +00:00
of/pci: Fix the conversion of IO ranges into IO resources
2014-09-30 17:08:40 -06:00
of/pci: Add support for parsing PCI host bridge resources from DT
2014-09-30 17:08:57 -06:00
drivers: of: add return value to of_reserved_mem_device_init()
2014-10-29 16:33:14 -07:00
ARM: OMAP: Remove unused pieces of legacy DMA API
2014-09-18 09:53:25 -07:00
OOM, PM: OOM killed task shouldn't escape PM suspend
2014-10-21 23:44:21 +02:00
mm/page_alloc: fix incorrect isolation behavior by rechecking migratetype
2014-11-13 16:17:05 -08:00
mm/balloon_compaction: remove balloon mapping and flag AS_BALLOON_MAP
2014-10-09 22:26:01 -04:00
PCI: Don't oops on virtual buses in acpi_pci_get_bridge_handle()
2014-11-05 13:06:16 -07:00
PCI changes for the v3.18 merge window:
2014-10-09 15:03:49 -04:00
PCI: Remove unused pci_configure_slot()
2014-09-12 20:09:52 -06:00
Changes to existing drivers:
2014-10-15 06:58:16 +02:00
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-10 07:26:02 -04:00
percpu_counter: add @gfp to percpu_counter_init()
2014-09-08 09:51:29 +09:00
net: phy: adjust fixed_phy_register() return value
2014-10-07 13:06:45 -04:00
mailbox: rename pl320-ipc specific mailbox.h
2014-10-08 10:39:33 +05:30
Merge branch 'pm-domains'
2014-10-07 01:18:12 +02:00
PM / Domains: Fix initial default state of the need_restore flag
2014-11-11 22:28:44 +01:00
PM / QoS: Add PM_QOS_MEMORY_BANDWIDTH class
2014-09-25 01:18:33 +02:00
Boaz Harrosh - Fix broken email address
2014-10-19 20:22:32 +03:00
power_supply: Add no_thermal property to prevent recursive get_temp calls
2014-10-28 03:30:19 +01:00
lockd: move lockd's grace period handling into its own module
2014-09-17 16:33:11 -04:00
proportions: add @gfp to init functions
2014-09-08 09:51:30 +09:00
rbtree: add comment to rb_insert_augmented()
2014-10-14 02:18:21 +02:00
rcu: Provide counterpart to rcu_dereference() for non-RCU situations
2014-10-28 18:25:17 -04:00
rcu: Per-CPU operation cleanups to rcu_*_qs() functions
2014-09-07 16:27:35 -07:00
kernel: add support for kernel restart handler call chain
2014-09-26 00:00:06 -07:00
tracing: Do not busy wait in buffer splice
2014-11-10 16:45:43 -05:00
mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA
2014-10-09 22:25:57 -04:00
net: sched: RCU cls_tcindex
2014-09-13 12:30:26 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
include/linux/screen_info.h: remove unused ORIG_* macros
2014-10-09 22:26:04 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2014-10-12 10:13:55 -04:00
seqlock: Add irqsave variant of read_seqbegin_or_lock()
2014-09-19 12:35:16 +02:00
tty: serial: 8250: use 32bit variable for rpm_tx_active
2014-09-29 18:20:38 -07:00
tty: serial: 8250_core: allow to set ->throttle / ->unthrottle callbacks
2014-09-26 18:01:56 +02:00
signal: use BUILD_BUG() instead of _NSIG_WORDS_is_unsupported_size()
2014-10-14 02:18:20 +02:00
net: skb_fclone_busy() needs to detect orphaned skb
2014-10-30 19:58:30 -04:00
mm/sl[ao]b: always track caller in kmalloc_(node_)track_caller()
2014-10-09 22:25:50 -04:00
mm/slab: use percpu allocator for cpu cache
2014-10-09 22:25:51 -04:00
smp: Add new wake_up_all_idle_cpus() function
2014-09-19 12:35:15 +02:00
include/linux/socket.h: Fix comment
2014-11-05 15:52:45 -05:00
This adds a memzero_explicit() call which is guaranteed not to be
2014-10-24 12:33:32 -07:00
lib / string_helpers: introduce string_escape_mem()
2014-10-14 02:18:26 +02:00
ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
2014-09-30 21:06:07 +02:00
mm: memcontrol: fix transparent huge page allocations under pressure
2014-10-09 22:25:59 -04:00
bpf: enable bpf syscall on x64 and i386
2014-09-26 15:05:14 -04:00
block: Add T10 Protection Information functions
2014-09-27 09:14:59 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-10-08 21:40:54 -04:00
Thermal: introduce INT3402 thermal driver
2014-10-10 14:02:25 +08:00
misc: st_kim: Increase size of dev_name buffer to incorporate termination
2014-09-26 08:15:29 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-10-14 03:47:00 +02:00
topology: add support for node_to_mem_node() to determine the fallback node
2014-10-09 22:25:51 -04:00
torture: Address race in module cleanup
2014-09-16 13:41:06 -07:00
tracing: generate RCU warnings even when tracepoints are disabled
2014-09-10 10:48:46 -04:00
tty: Fix width of unsigned long bitfield padding
2014-09-25 12:17:25 +02:00
tty: Serialize tty flow control changes with flow_lock
2014-09-23 21:19:35 -07:00
Add copy_to_iter(), copy_from_iter() and iov_iter_zero()
2014-10-09 02:39:03 -04:00
uio: Export definition of struct uio_device
2014-10-02 21:35:54 -07:00
uprobes: Remove "weak" from function declarations
2014-10-22 16:14:04 -06:00
usb: Add LED triggers for USB activity
2014-09-25 17:05:12 +02:00
uas: Add no-report-opcodes quirk
2014-09-23 21:40:48 -07:00
vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
2014-09-18 19:21:20 -04:00
vgaarb: Drop obsolete #ifndef
2014-09-16 15:02:55 -06:00
virtio: defer config changed notifications
2014-10-15 10:24:56 +10:30
virtio: add API to enable VQs early
2014-10-15 10:25:01 +10:30
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
watchdog: simplify definitions of WATCHDOG_NOWAYOUT(_INIT_STATUS)?
2014-10-20 20:46:25 +02:00
workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
2014-09-13 05:13:08 +09:00
zsmalloc: change return value unit of zs_get_total_size_bytes
2014-10-09 22:26:02 -04:00
