Linus Torvalds
433ab34d26
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Here are some bug fixes that have piled up during ksummit/linuxcon.
1) Fix endian problems in ibmveth, from Anton Blanchard.
2) IPV6 routing code does GFP_KERNEL allocation in atomic, fix from
Benjamin Block.
3) SCTP association fixes from Daniel Borkmann.
4) When multiple VLAN headers are present we have to make sure the
second and subsequent ones are pullable in the SKB otherwise we
blindly dereference garbage. From Jiri Benc.
5) The argument adjustment of the signature of hlist_add_after*()
introduced a regression in the batman-adv code, fix from Sven
Eckelmann.
6) Fix TX hang handling to avoid a panic in i40e, from Anjali Singhai
Jain.
7) PTP flag test is inverted in i40e driver, from Jesse Brandeburg.
8) ATM LEC driver needs to hold RTNL mutex over MTU changes, from
Chas Williams.
9) Truncate packets larger then the TPACKET_V3 format configured
buffers, otherwise we overwrite past the end of said buffers.
From Eric Dumazet.
10) Fix endianness bugs in qlcnic firmware handling, from Rajesh
Borundia and Shahed Shaikh.
11) CXGB4 sometimes doesn't get all of the TX completion events it
should resulting in SKBs getting stuck in the TX queue, from
Hariprasad Shenai.
12) When the FEC chip's PTP clock is disabled, you can't access the
register. Add necessary checks to avoid the resulting hang, from
Fugang Duan"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef
net: sctp: fix suboptimal edge-case on non-active active/retrans path selection
net: sctp: spare unnecessary comparison in sctp_trans_elect_best
net: ethernet: broadcom: bnx2x: Remove redundant #ifdef
ibmveth: Fix endian issues with rx_no_buffer statistic
net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()
openvswitch: fix panic with multiple vlan headers
net: ipv6: fib: don't sleep inside atomic lock
net: fec: ptp: avoid register access when ipg clock is disabled
cxgb4: Free completed tx skbs promptly
cxgb4: Fix race condition in cleanup
sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probe
bnx2x: Revert UNDI flushing mechanism
qlcnic: Fix endianess issue in firmware load from file operation
qlcnic: Fix endianess issue in FW dump template header
qlcnic: Fix flash access interface to application
MAINTAINERS: Add section for MRF24J40 IEEE 802.15.4 radio driver
macvlan: Allow setting multicast filter on all macvlan types
packet: handle too big packets for PACKET_V3
MAINTAINERS: add entry for ec_bhf driver
...
2014-08-22 14:33:18 -07:00
bcma: use NS prefix for names of Northstar specific cores
2014-07-31 13:45:32 -04:00
include/linux/byteorder/generic.h: minor comment fix
2014-08-06 18:01:23 -07:00
clk: Support for clock parents and rates assigned from device tree
2014-07-25 15:16:27 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
extcon: sm5502: Change internal hardware switch according to cable type
2014-07-23 10:22:35 +09:00
fsl /bestcomm
gpio: add missing includes in machine.h
2014-08-07 11:54:51 +02:00
Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-08-09 09:15:07 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:46:42 -07:00
Input: MT - make slot cleanup callable outside mt_sync_frame()
2014-08-07 23:37:07 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:38:45 -07:00
== Changes to existing drivers ==
2014-08-07 17:17:39 -07:00
Main set of InfiniBand/RDMA updates for 3.17 merge window:
2014-08-14 11:09:05 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
mmc: dw_mmc: Slot quirk "disable-wp" is deprecated.
2014-08-11 11:42:39 +02:00
mtd: nand: add ONFI timing mode to nand_timings converter
2014-07-21 19:39:55 -07:00
phy: core: Let node ptr of PHY point to PHY and not of PHY provider
2014-07-22 12:46:11 +05:30
MMC core:
2014-08-14 09:15:53 -06:00
Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/getreg', 'regulator/topic/gpio' and 'regulator/topic/lp872x' into regulator-next
2014-08-05 18:29:21 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
NFS client updates for Linux 3.17
2014-08-13 18:13:19 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
make fs/{namespace,super}.c forget about acct.h
2014-08-07 14:40:09 -04:00
Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-08-09 09:15:07 -07:00
x86/ras: Fix build warnings in <linux/aer.h>
2014-07-30 10:42:55 -07:00
ata: libahci_platform: move port_map parameters into the AHCI structure
2014-07-30 15:39:46 -04:00
lib: bitmap: add missing mask in bitmap_andnot
2014-08-06 18:01:27 -07:00
net: phy: bcm7xxx: remove 28nm wildcard entry
2014-08-16 19:13:33 -07:00
CAPABILITIES: remove undefined caps from all processes
2014-07-24 21:53:47 +10:00
clocksource: Get rid of cycle_last
2014-07-23 15:01:52 -07:00
mm, CMA: change cma_declare_contiguous() to obey coding convention
2014-08-06 18:01:16 -07:00
crypto: Resolve shadow warnings
2014-08-01 22:35:55 +08:00
dcache: d_obtain_alias callers don't all want DISCONNECTED
2014-08-07 14:40:10 -04:00
IOMMU Updates for Linux v3.17
2014-08-05 15:59:35 -07:00
CMA: generalize CMA reserved area management functionality
2014-08-06 18:01:16 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-08-11 07:14:01 -07:00
iommu/vt-d: Simplify include/linux/dmar.h
2014-07-23 16:04:47 +02:00
kexec: support kexec/kdump on EFI systems
2014-08-08 15:57:33 -07:00
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-08-11 11:44:11 -07:00
take fs_pin stuff to fs/*
2014-08-07 14:40:08 -04:00
fanotify: fix double free of pending permission events
2014-08-06 18:01:12 -07:00
ftrace: Rename ftrace_ops field from trampolines to nr_trampolines
2014-07-23 15:03:00 -04:00
Nicolas Pitre added generic tracepoints for tracing IPIs and updated the
2014-08-09 17:33:44 -07:00
mm/page_alloc.c: add __meminit to alloc_pages_exact_nid()
2014-08-06 18:01:15 -07:00
lib: add lib/glob.c
2014-08-06 18:01:24 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-08-08 17:39:48 -07:00
mm: BUG when __kmap_atomic_idx equals KM_TYPE_NR
2014-08-06 18:01:22 -07:00
drm/tegra: Make job submission 64-bit safe
2014-08-04 10:07:36 +02:00
time: Consolidate the time accessor prototypes
2014-07-23 10:17:54 -07:00
mm: make copy_pte_range static again
2014-08-06 18:01:19 -07:00
mm, hugetlb: remove hugetlb_zero and hugetlb_infinity
2014-08-06 18:01:19 -07:00
i2c: rework kernel config I2C_ACPI
2014-08-19 10:19:39 -05:00
net: Always untag vlan-tagged traffic on input.
2014-08-11 12:16:51 -07:00
ima: add support for measuring and appraising firmware
2014-07-25 11:47:46 -07:00
of: Provide a function to request and map memory
2014-07-23 12:02:30 +02:00
resource: provide new functions to walk through resources
2014-08-08 15:57:32 -07:00
iommu/vt-d: Introduce helper function iova_size() to improve code readability
2014-07-23 16:04:47 +02:00
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
This finally applies the stricter sysfs perms checking we pulled out
2014-08-10 21:31:58 -07:00
kexec: verify the signature of signed PE bzImage
2014-08-08 15:57:33 -07:00
KEYS: Allow expiry time to be set when preparsing a key
2014-07-22 21:46:08 +01:00
Merge branch 'keys-fixes' into keys-next
2014-07-22 21:55:45 +01:00
klist: use same naming scheme as hlist for klist_add_after()
2014-08-06 18:01:24 -07:00
kthread_work: remove the unused wait_queue_head
2014-07-28 14:16:30 -04:00
time: Consolidate the time accessor prototypes
2014-07-23 10:17:54 -07:00
KVM: Move more code under CONFIG_HAVE_KVM_IRQFD
2014-08-06 14:24:47 +02:00
libata: introduce ata_host->n_tags to avoid oops on SAS controllers
2014-07-23 10:30:34 -04:00
list: fix order of arguments for hlist_add_after(_rcu)
2014-08-06 18:01:24 -07:00
include/linux/memblock.h: add __init to memblock_set_bottom_up()
2014-08-06 18:01:15 -07:00
mm: memcontrol: use page lists for uncharge batching
2014-08-08 15:57:18 -07:00
memory-hotplug: add zone_for_memory() for selecting zone for new memory
2014-08-06 18:01:21 -07:00
arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area
2014-08-08 15:57:27 -07:00
fork/exec: cleanup mm initialization
2014-08-08 15:57:23 -07:00
include/linux/mmdebug.h: add VM_WARN_ONCE()
2014-08-06 18:01:18 -07:00
mmu_notifier: add call_srcu and sync function for listener to delay call and sync
2014-08-06 18:01:22 -07:00
mm: page_alloc: reduce cost of the fair zone allocation policy
2014-08-06 18:01:20 -07:00
module: return bool from within_module*()
2014-07-27 20:52:44 +09:30
modules: Fix build error in moduleloader.h
2014-07-27 20:52:42 +09:30
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-08-11 11:44:11 -07:00
openvswitch: Enable tunnel GSO for OVS bridge.
2014-07-24 01:15:04 -07:00
net: kernel-doc compliant documentation for net_device
2014-07-31 21:34:20 -07:00
NFS: allow lockless access to access_cache
2014-08-03 17:14:13 -04:00
nfs: fix comment and add warn_on for PG_INODE_REF
2014-08-03 17:05:25 -04:00
acpi, apei, ghes: Make NMI error notification to be GHES architecture extension.
2014-07-22 15:05:06 -07:00
mm, oom: ensure memoryless node zonelist always includes zones
2014-08-06 18:01:21 -07:00
namespaces: Use task_lock and not rcu to protect nsproxy
2014-07-29 18:08:50 -07:00
Merge branch 'devicetree/next-overlay' into devicetree/next
2014-08-11 14:06:23 +01:00
of: Provide a function to request and map memory
2014-07-23 12:02:30 +02:00
dmaengine: of: add common xlate function for matching by channel id
2014-07-26 00:21:41 +05:30
of: Add memory limiting function for flattened devicetrees
2014-07-29 21:26:45 -06:00
drivers: of: add automated assignment of reserved regions to client devices
2014-08-01 12:22:21 -06:00
ARM: OMAP2+: DMA: remove requirement of irq for platform-dma driver
2014-07-21 23:32:51 -07:00
iommu/omap: Remove virtual memory manager
2014-07-29 12:38:07 +02:00
mm, oom: rename zonelist locking functions
2014-08-06 18:01:21 -07:00
mm: page-flags: clean up the page flag test, set, clear macros
2014-08-06 18:01:17 -07:00
memcg: remove lookup_cgroup_page() prototype
2014-08-08 15:57:18 -07:00
mm: describe mmap_sem rules for __lock_page_or_retry() and callers
2014-08-06 18:01:20 -07:00
ACPI / PM: Revork the handling of ACPI device wakeup notifications
2014-07-23 01:00:45 +02:00
Char / Misc driver patches for 3.17-rc1
2014-08-04 17:32:24 -07:00
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-08-04 10:09:27 -07:00
net: libphy: Add phy specific function to access mmd phy registers
2014-07-30 20:00:21 -07:00
proc: Implement /proc/thread-self to point at the directory of the current thread
2014-08-04 10:07:11 -07:00
PM: Create PM workqueue if runtime PM is not configured too
2014-07-23 01:00:36 +02:00
printk: Add function to return log buffer address and size
2014-08-13 15:13:44 +10:00
list: fix order of arguments for hlist_add_after(_rcu)
2014-08-06 18:01:24 -07:00
regmap: Fix return code for stub regmap_get_device()
2014-07-25 19:01:53 +01:00
rhashtable: fix annotations for rht_for_each_entry_rcu()
2014-08-14 15:13:39 -07:00
rapidio: add new RapidIO DMA interface routines
2014-08-08 15:57:24 -07:00
lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig
2014-08-08 15:57:26 -07:00
More ACPI and power management updates for 3.17-rc1
2014-08-14 18:13:46 -06:00
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
2014-07-30 01:31:46 +10:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:46:42 -07:00
ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions.
2014-07-23 01:10:45 +02:00
shm: remove unneeded extern for function
2014-08-08 15:57:26 -07:00
shm: add sealing API
2014-08-08 15:57:31 -07:00
Rip out get_signal_to_deliver()
2014-08-06 13:03:44 +02:00
net: Always untag vlan-tagged traffic on input.
2014-08-11 12:16:51 -07:00
net: stmmac: Support devicetree configs for mcast and ucast filter entries
2014-07-31 14:13:29 -07:00
mm: memcontrol: rewrite uncharge API
2014-08-08 15:57:17 -07:00
kexec: new syscall kexec_file_load() declaration
2014-08-08 15:57:32 -07:00
sysctl: remove typedef ctl_table
2014-08-08 15:57:24 -07:00
thermal: document struct thermal_zone_device and thermal_governor
2014-07-22 10:12:05 +08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-04 16:23:30 -07:00
time: Consolidate the time accessor prototypes
2014-07-23 10:17:54 -07:00
time: More core infrastructure for timespec64
2014-07-23 10:17:53 -07:00
timekeeping: Fixup typo in update_vsyscall_old definition
2014-07-30 09:26:25 +02:00
timekeeping: Provide fast and NMI safe access to CLOCK_MONOTONIC
2014-07-23 15:01:55 -07:00
tpm: Provide a generic means to override the chip returned timeouts
2014-07-29 23:10:56 +02:00
tracehook_signal_handler: Remove sig, info, ka and regs
2014-08-06 13:03:43 +02:00
tracing: Do not do anything special with tracepoint_string when tracing is disabled
2014-08-07 20:39:36 -04:00
switch iov_iter_get_pages() to passing maximal number of pages
2014-08-07 14:40:11 -04:00
proc: constify seq_operations
2014-08-08 15:57:22 -07:00
drivers/vfio: Enable VFIO if EEH is not supported
2014-08-08 10:39:16 -06:00
mm/vmalloc.c: clean up map_vm_area third argument
2014-08-06 18:01:19 -07:00
mm/zbud: change zbud_alloc size type to size_t
2014-08-06 18:01:23 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
mm/zpool: implement common zpool api to zbud/zsmalloc
2014-08-06 18:01:23 -07:00
