Linus Torvalds
98260daa18
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking updates from David Miller:
1) Alexey Kuznetsov noticed we routed TCP resets improperly in the
assymetric routing case, fix this by reverting a change that made us
use the incoming interface in the outgoing route key when we didn't
have a socket context to work with.
2) TCP sysctl kernel memory leakage to userspace fix from Alan Cox.
3) Move UAPI bits from David Howells, WIMAX and CAN this time.
4) Fix TX stalls in e1000e wrt. Byte Queue Limits, from Hiroaki
SHIMODA, Denys Fedoryshchenko, and Jesse Brandeburg.
5) Fix IPV6 crashes in packet generator module, from Amerigo Wang.
6) Tidies and fixes in the new VXLAN driver from Stephen Hemminger.
7) Bridge IP options parse doesn't check first if SKB header has at
least an IP header's worth of content present. Fix from Sarveshwar
Bandi.
8) The kernel now generates compound pages on transmit and the Xen
netback drivers needs some adjustments in order to handle this. Fix
from Ian Campbell.
9) Turn off ASPM in JME driver, from Kevin Bardon and Matthew Garrett.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
mcs7830: Fix link state detection
net: add doc for in4_pton()
net: add doc for in6_pton()
vti: fix sparse bit endian warnings
tcp: resets are misrouted
usbnet: Support devices reporting idleness
Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
net/ethernet/jme: disable ASPM
tcp: sysctl interface leaks 16 bytes of kernel memory
kaweth: print correct debug ptr
e1000e: Change wthresh to 1 to avoid possible Tx stalls
ipv4: fix route mark sparse warning
xen: netback: handle compound page fragments on transmit.
bridge: Pull ip header into skb->data before looking into ip header.
isdn: fix a wrapping bug in isdn_ppp_ioctl()
vxlan: fix oops when give unknown ifindex
vxlan: fix receive checksum handling
vxlan: add additional headroom
vxlan: allow configuring port range
vxlan: associate with tunnel socket on transmit
...
2012-10-13 10:51:48 +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
UAPI: (Scripted) Disintegrate include/linux/can
2012-10-10 22:24:21 +02: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] dvb: LNA implementation changes
2012-10-07 10:27:49 -03:00
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-10-11 10:27:51 +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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-10-12 12:39:17 +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
SUNRPC: Introduce rpc_clone_client_set_auth()
2012-10-01 15:33:33 -07: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
usbnet: Support devices reporting idleness
2012-10-11 15:19:21 -04:00
UAPI: (Scripted) Disintegrate include/linux/wimax
2012-10-09 09:49:08 +01:00
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
2012-09-24 16:36:10 -06:00
alarmtimer: Remove unused helpers & defines
2012-09-24 12:38:02 -04:00
ahci: implement aggressive SATA device sleep support
2012-09-13 01:08:53 -04:00
misc/atmel_tc: make atmel_tc.tcb_config member point to const data
2012-09-11 08:56:37 +02:00
atomic: implement generic atomic_dec_if_positive()
2012-10-09 16:22:46 +09:00
audit: make audit_inode take struct filename
2012-10-12 20:15:09 -04:00
usb/core: use bin2bcd() for bcdDevice in RH
2012-09-10 11:13:16 -07:00
ARM: bcm2835: add system timer
2012-09-19 19:08:46 -06:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-10 12:02:25 +09:00
block: Implement support for WRITE SAME
2012-09-20 14:31:45 +02:00
block: Implement support for WRITE SAME
2012-09-20 14:31:45 +02:00
block: Implement support for WRITE SAME
2012-09-20 14:31:45 +02: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
cgroup: Wrap subsystem selection macro
2012-09-14 09:57:37 -07:00
time: Move update_vsyscall definitions to timekeeper_internal.h
2012-09-24 12:38:06 -04:00
mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
2012-10-09 16:22:51 +09:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-10 12:02:25 +09:00
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2012-10-12 10:27:27 +09: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
etherdevice: introduce help function eth_zero_addr()
2012-09-10 15:49:54 -04: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
vfs: embed struct filename inside of names_cache allocation if possible
2012-10-12 20:15:10 -04:00
powerpc/usb: remove checking PHY_CLK_VALID for UTMI PHY
2012-09-24 13:42:45 -07:00
audit: overhaul __audit_inode_child to accomodate retrying
2012-10-12 00:32:03 -04: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
Tools: hv: Implement the KVP verb - KVP_OP_SET_IP_INFO
2012-09-10 16:42:33 -07:00
i2c: algo: pca: Fix chip reset function for PCA9665
2012-10-06 13:14:36 +02: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
ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
2012-10-06 13:43:38 +02:00
i2c: pnx: Fix read transactions of >= 2 bytes
2012-09-12 17:52:44 +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: allow configuring port range
2012-10-10 22:41:21 -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
resources: Document IORESOURCE_IO
2012-09-11 10:15:02 +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 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-10-12 22:17:48 +09: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
userns: Convert security/keys to the new userns infrastructure
2012-09-13 18:28:02 -07: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
leds-lp5523: add channel name in the platform data
2012-09-11 18:32:41 +08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-10-10 20:14:07 +09:00
lglock: add DEFINE_STATIC_LGLOCK()
2012-10-10 01:15:44 -04: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
memcg, kmem: fix build error when CONFIG_INET is disabled
2012-10-11 08:50:16 +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
mISDN: Fix wrong usage of flush_work_sync while holding locks
2012-09-13 14:58:54 -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
NFSv4: Add ACCESS operation to OPEN compound
2012-10-01 15:20:11 -07:00
NFS: Discover NFSv4 server trunking when mounting
2012-10-01 15:33:33 -07:00
NFSv4: don't put ACCESS in OPEN compound if O_EXCL
2012-10-02 14:56:19 -07: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
of/mdio: Staticise !CONFIG_OF stubs
2012-10-10 22:41:05 -04:00
ARM: OMAP1: move lcd pdata out of arch/arm/*
2012-09-10 16:34:00 -07: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: fix bit ranges in {get,clear,set}_pageblock_skip()
2012-10-11 08:50:14 +09:00
PCI/ACPI: Use DEVICE_ACPI_HANDLE rather than searching acpi_pci_roots
2012-09-24 14:51:23 -06:00
Merge branch 'pci/trivial' into next
2012-09-13 09:08:02 -06:00
i2c-viapro: Add VIA VX900 device ID
2012-10-05 22:23:53 +02:00
blockdev: turn a rw semaphore into a percpu rw semaphore
2012-09-26 07:46:43 +02:00
sections: fix section conflicts in mm/percpu.c
2012-10-06 03:04:44 +09:00
perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
2012-10-05 13:59:06 +02: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
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-10 12:02:25 +09:00
pwm: Fix compilation error when CONFIG_PWM is not defined
2012-09-20 12:52:02 +02: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: fix comment
2012-10-11 08:50:16 +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
scatterlist: add sg_nents
2012-09-27 12:45:28 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
2012-10-10 12:02:25 +09:00
efifb: Skip DMI checks if the bootloader knows what it's doing
2012-09-17 13:29:23 +01:00
consitify do_mount() arguments
2012-10-11 20:02:04 -04: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
infrastructure for saner ret_from_kernel_thread semantics
2012-10-12 13:35:07 -04:00
task_work: task_work_add() should not succeed after exit_task_work()
2012-09-13 16:47:34 +02:00
ipv4: Don't add TCP-code in inet_sock_destruct
2012-09-20 17:12:27 -04:00
time: Introduce new GENERIC_TIME_VSYSCALL
2012-09-24 12:38:08 -04:00
rbtree: empty nodes have no color
2012-10-09 16:22:32 +09:00
trace: Don't declare trace_*_rcuidle functions in modules
2012-09-12 10:20:14 -04: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
usb/acpi: Use ACPI methods to power off ports.
2012-09-10 13:04:01 -07:00
usbfs: Add a new disconnect-and-claim ioctl (v2)
2012-09-10 11:10:37 -07:00
userns: Add kprojid_t and associated infrastructure in projid.h
2012-09-18 01:01:37 -07:00
[media] v4l: Add control definitions for new H264 encoder features
2012-10-05 22:42:17 -03:00
[media] V4L: Add V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8 media bus format
2012-10-05 21:28:02 -03:00
[media] v4l2 core: add the missing pieces to support DVI/HDMI/DisplayPort
2012-09-13 16:05:27 -03:00
[media] v4l: Add fourcc definitions for new formats
2012-10-05 22:39:51 -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
