Linus Torvalds
aac2b1f574
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking updates from David Miller:
1) UAPI changes for networking from David Howells
2) A netlink dump is an operation we can sleep within, and therefore we
need to make sure the dump provider module doesn't disappear on us
meanwhile. Fix from Gao Feng.
3) Now that tunnels support GRO, we have to be more careful in
skb_gro_reset_offset() otherwise we OOPS, from Eric Dumazet.
4) We can end up processing packets for VLANs we aren't actually
configured to be on, fix from Florian Zumbiehl.
5) Fix routing cache removal regression in redirects and IPVS. The
core issue on the IPVS side is that it wants to rewrite who the
nexthop is and we have to explicitly accomodate that case. From
Julian Anastasov.
6) Error code return fixes all over the networking drivers from Peter
Senna Tschudin.
7) Fix routing cache removal regressions in IPSEC, from Steffen
Klassert.
8) Fix deadlock in RDS during pings, from Jeff Liu.
9) Neighbour packet queue can trigger skb_under_panic() because we do
not reset the network header of the SKB in the right spot. From
Ramesh Nagappa.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
RDS: fix rds-ping spinlock recursion
netdev/phy: Prototype of_mdio_find_bus()
farsync: fix support for over 30 cards
be2net: Remove code that stops further access to BE NIC based on UE bits
pch_gbe: Fix build error by selecting all the possible dependencies.
e1000e: add device IDs for i218
ixgbe/ixgbevf: Limit maximum jumbo frame size to 9.5K to avoid Tx hangs
ixgbevf: Set the netdev number of Tx queues
UAPI: (Scripted) Disintegrate include/linux/tc_ematch
UAPI: (Scripted) Disintegrate include/linux/tc_act
UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv6
UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv4
UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge
UAPI: (Scripted) Disintegrate include/linux/netfilter_arp
UAPI: (Scripted) Disintegrate include/linux/netfilter/ipset
UAPI: (Scripted) Disintegrate include/linux/netfilter
UAPI: (Scripted) Disintegrate include/linux/isdn
UAPI: (Scripted) Disintegrate include/linux/caif
net: fix typo in freescale/ucc_geth.c
vxlan: fix more sparse warnings
...
2012-10-10 11:12:54 +09:00
spi: Updates for v3.7
2012-10-02 17:26:42 -07:00
UAPI Disintegration 2012-10-09
2012-10-09 15:04:25 +01:00
UAPI: (Scripted) Disintegrate include/linux/caif
2012-10-09 09:48:40 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-10-08 06:38:18 +09:00
ARM: bcm2835: add stub clock driver
2012-09-19 19:08:53 -06:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
[media] add LNA support for DVB API
2012-09-27 14:28:09 -03:00
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
iio:inkern: Add function to read the processed value
2012-09-17 21:48:51 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-10-02 17:16:10 -07:00
ARM: bcm2835: add interrupt controller driver
2012-09-19 19:08:37 -06:00
UAPI: (Scripted) Disintegrate include/linux/isdn
2012-10-09 09:48:45 +01:00
Sound updates for 3.7-rc1
2012-10-09 07:07:14 +09:00
mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculations
2012-09-30 20:33:43 -07:00
mmc: core: Fixup broken suspend and eMMC4.5 power off notify
2012-10-07 17:41:45 -04:00
UAPI Disintegration 2012-10-09
2012-10-09 15:04:25 +01:00
UAPI: (Scripted) Disintegrate include/linux/netfilter/ipset
2012-10-09 09:48:55 +01:00
UAPI: (Scripted) Disintegrate include/linux/netfilter_arp
2012-10-09 09:48:56 +01:00
UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge
2012-10-09 09:48:58 +01:00
UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv4
2012-10-09 09:48:59 +01:00
UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv6
2012-10-09 09:49:01 +01:00
Prepared for main script
2012-10-03 13:45:43 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-10 11:10:41 +09:00
1. New drivers:
2012-10-07 17:29:24 +09:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next
2012-09-28 14:45:07 +01:00
UAPI: (Scripted) Disintegrate include/linux/tc_act
2012-10-09 09:49:05 +01:00
UAPI: (Scripted) Disintegrate include/linux/tc_ematch
2012-10-09 09:49:06 +01:00
USB: EHCI: Tegra: Fix wrong register definition
2012-09-18 17:40:56 +01:00
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
2012-09-24 16:36:10 -06:00
atomic: implement generic atomic_dec_if_positive()
2012-10-09 16:22:46 +09:00
audit.h: replace defines with C stubs
2012-10-06 03:04:35 +09:00
ARM: bcm2835: add system timer
2012-09-19 19:08:46 -06:00
coredump: pass siginfo_t* to do_coredump() and below, not merely signr
2012-10-06 03:05:16 +09:00
Merge branch 'for-3.7-hierarchy' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-10-02 10:52:28 -07:00
mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
2012-10-09 16:22:51 +09:00
compat: move compat_siginfo_t definition to asm/compat.h
2012-10-06 03:05:16 +09:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
compiler.h: add __visible
2012-09-17 15:00:38 -07:00
coredump: pass siginfo_t* to do_coredump() and below, not merely signr
2012-10-06 03:05:16 +09:00
vfs: dcache: use DCACHE_DENTRY_KILLED instead of DCACHE_DISCONNECTED in d_kill()
2012-09-18 11:23:51 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
dmaengine: Add flags parameter to dmaengine_prep_dma_cyclic()
2012-09-24 18:35:29 +02:00
UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers
2012-10-02 18:01:25 +01:00
dw_dmac: autoconfigure data_width or get it via platform data
2012-09-27 15:35:23 +05:30
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
efi: Fix the ACPI BGRT driver for images located in EFI boot services memory
2012-09-29 12:21:03 -07:00
coredump: extend core dump note section to contain file names of mapped files
2012-10-06 03:05:17 +09:00
epoll: support for disabling items, and a self-test app
2012-10-06 03:05:00 +09:00
fs: reserve fallocate flag codepoint
2012-09-27 09:29:33 -04:00
new helper: daemonize_descriptors()
2012-09-26 21:10:00 -04:00
switch simple cases of fget_light to fdget
2012-09-26 22:20:08 -04:00
filter: add XOR instruction for use with X/K
2012-09-24 16:49:21 -04:00
firewire: addendum to address handler RCU conversion
2012-09-28 11:47:42 +02:00
frontswap: support exclusive gets if tmem backend is capable
2012-09-21 10:38:12 -04:00
mm: replace vma prio_tree with an interval tree
2012-10-09 16:22:39 +09:00
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
2012-09-24 13:42:45 -07:00
genalloc: make it possible to use a custom allocation algorithm
2012-10-06 03:04:57 +09:00
make GFP_NOTRACK definition unconditional
2012-10-09 16:23:01 +09:00
cputime: Use a proper subsystem naming for vtime related APIs
2012-09-25 15:31:31 +02:00
HID: Allow more fields in the hid report
2012-09-19 19:50:20 +02:00
mm, thp: fix mapped pages avoiding unevictable list on mlock
2012-10-09 16:23:02 +09:00
i2c-mux-gpio: Add support for dynamically allocated GPIO pins
2012-10-05 22:23:54 +02:00
i2c-mux: Add support for device auto-detection
2012-10-05 22:23:51 +02:00
i2c: Correct struct i2c_driver doc about detection
2012-10-05 22:23:54 +02:00
idr: rename MAX_LEVEL to MAX_IDR_LEVEL
2012-10-06 03:04:56 +09:00
vxlan: virtual extensible lan
2012-10-01 18:39:45 -04:00
vlan: don't deliver frames for unknown vlans to protocols
2012-10-08 15:21:55 -04:00
sections: disable const sections for PA-RISC v2
2012-10-06 03:04:37 +09:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
Input: Send events one packet at a time
2012-09-19 19:50:18 +02:00
time: RCU permitted to stop idle entry via softirq
2012-09-23 07:42:52 -07:00
rbtree: add prio tree and interval tree tests
2012-10-09 16:22:39 +09:00
mm: interval tree updates
2012-10-09 16:22:40 +09:00
iommu: static inline iommu group stub functions
2012-09-25 12:14:56 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-10-01 09:06:36 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-10-07 17:49:05 +09:00
kdb: Turn KGDB_KDB=n stubs into static inlines
2012-09-26 13:42:26 -07:00
linux/kernel.h: Fix warning seen with W=1 due to change in DIV_ROUND_CLOSEST
2012-09-19 06:51:25 -07:00
vtime: Consolidate system/idle context detection
2012-09-25 15:42:37 +02:00
tty/serial: Add kgdb_nmi driver
2012-09-26 13:52:36 -07:00
KVM: Add resampling irqfds for level triggered interrupts
2012-09-23 13:50:15 +02:00
KVM updates for the 3.7 merge window
2012-10-04 09:30:33 -07:00
SCSI for-linus on 20121002
2012-10-02 19:01:32 -07:00
Partially revert a1ce39288e (UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers)
2012-10-06 02:48:09 +09:00
userns: Convert loop to use kuid_t instead of uid_t
2012-09-21 03:13:20 -07:00
mm/memblock: cleanup early_node_map[] related comments
2012-10-09 16:22:47 +09:00
mm: memcg: clean up mm_match_cgroup() signature
2012-10-09 16:23:04 +09:00
mm/ia64: fix a memory block size bug
2012-09-17 15:00:37 -07:00
memory-hotplug: update memory block's state and notify userspace
2012-10-09 16:23:02 +09:00
mempolicy: fix a race in shared_policy_replace()
2012-10-09 16:22:22 +09:00
phy/micrel: Add missing header to micrel_phy.h
2012-09-24 15:54:33 -04:00
mm: fix-up zone present pages
2012-10-09 16:22:54 +09:00
mm: replace vma prio_tree with an interval tree
2012-10-09 16:22:39 +09:00
mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
2012-10-09 16:22:18 +09:00
mm: move all mmu notifier invocations to be done outside the PT lock
2012-10-09 16:22:58 +09:00
CMA: migrate mlocked pages
2012-10-09 16:23:00 +09:00
ARM: soc: non-critical bug fixes
2012-10-01 18:02:07 -07:00
nbd: handle discard requests
2012-10-06 03:05:24 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-10-02 20:25:04 -07:00
ipv6: gro: fix PV6_GRO_CB(skb)->proto problem
2012-10-08 15:40:43 -04:00
netlink: add reference of module in netlink_dump_start
2012-10-07 00:30:56 -04:00
NFC: LLCP raw socket support
2012-09-27 10:47:59 +02:00
cfg80211/nl80211: Notify connection request failure in AP mode
2012-09-18 19:54:06 +02:00
MFD bits for the 3.7 merge window.
2012-10-05 12:01:30 +09:00
of/irq: Create stub for of_irq_find_parent when !CONFIG_OF
2012-09-20 12:32:30 +02:00
oom: remove deprecated oom_adj
2012-10-09 16:22:24 +09:00
mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
2012-10-09 16:22:52 +09:00
mm: compaction: cache if a pageblock was scanned and no pages were isolated
2012-10-09 16:22:50 +09:00
PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
2012-09-24 14:51:23 -06:00
i2c-viapro: Add VIA VX900 device ID
2012-10-05 22:23:53 +02:00
sections: fix section conflicts in mm/percpu.c
2012-10-06 03:04:44 +09:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-01 10:28:49 -07:00
Power management updates for 3.7-rc1
2012-10-02 18:32:35 -07:00
pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h
2012-10-03 13:52:52 -07:00
userns: Convert vfs posix_acl support to use kuids and kgids
2012-09-18 01:01:35 -07:00
userns: Pass a userns parameter into posix_acl_to_xattr and posix_acl_from_xattr
2012-09-18 01:01:35 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
ptp: clarify the clock_name sysfs attribute
2012-09-22 15:42:46 -04:00
userns: Convert struct dquot dq_id to be a struct kqid
2012-09-18 01:01:41 -07:00
userns: Modify dqget to take struct kqid
2012-09-18 01:01:40 -07:00
rbtree: move augmented rbtree functionality to rbtree_augmented.h
2012-10-09 16:22:40 +09:00
rbtree: move augmented rbtree functionality to rbtree_augmented.h
2012-10-09 16:22:40 +09:00
rcu: Switch task's syscall hooks on context switch
2012-09-26 15:47:02 +02:00
remtoteproc: maintain max notifyid
2012-09-18 21:55:52 +03:00
rapidio: add destination ID allocation mechanism
2012-10-06 03:05:23 +09:00
rapidio: add inbound memory mapping interface
2012-10-06 03:05:21 +09:00
mm: cma: discard clean pages during contiguous allocation instead of migration
2012-10-09 16:22:43 +09:00
rtc: add Dallas DS2404 driver
2012-10-06 03:05:01 +09:00
rtc_sysfs_show_hctosys(): display 0 if resume failed
2012-10-06 03:05:04 +09:00
oom: remove deprecated oom_adj
2012-10-09 16:22:24 +09:00
efifb: Skip DMI checks if the bootloader knows what it's doing
2012-09-17 13:29:23 +01:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-10-02 21:38:48 -07:00
tty/serial/core: Introduce poll_init callback
2012-09-26 13:47:02 -07:00
net: remove skb recycling
2012-10-07 00:40:54 -04:00
mm, slob: Add support for kmalloc_track_caller()
2012-09-25 10:14:18 +03:00
mm/slab: Fix kmem_cache_alloc_node_trace() declaration
2012-09-29 10:02:27 +03:00
mm, slob: Use NUMA_NO_NODE instead of -1
2012-09-25 10:11:14 +03:00
remoteproc: Add STE modem driver
2012-09-22 16:35:13 +03:00
mm: remove vma arg from page_evictable
2012-10-09 16:22:55 +09:00
ipv4: Don't add TCP-code in inet_sock_destruct
2012-09-20 17:12:27 -04:00
rbtree: empty nodes have no color
2012-10-09 16:22:32 +09:00
userns: Convert taskstats to handle the user and pid namespaces.
2012-09-18 01:01:32 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
uprobes: Introduce arch_uprobe_enable/disable_step()
2012-09-15 17:37:28 +02:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
[media] videodev2.h: split off controls into v4l2-controls.h
2012-09-26 09:25:41 -03:00
[media] Rename V4L2_(IN|OUT)_CAP_CUSTOM_TIMINGS
2012-09-26 09:49:37 -03:00
virtio-ring: move queue_index to vring_virtqueue
2012-09-28 15:05:15 +09:30
virtio: support reserved vqs
2012-09-28 15:05:15 +09:30
virtio-ring: move queue_index to vring_virtqueue
2012-09-28 15:05:15 +09:30
mm: remove unevictable_pgs_mlockfreed
2012-10-09 16:22:59 +09:00
memory-hotplug: fix zone stat mismatch
2012-10-09 16:22:59 +09:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2012-10-02 21:38:48 -07:00
xfrm_user: ensure user supplied esn replay window is valid
2012-09-20 18:08:40 -04:00
